commit e158c6f7eef757dfe43b6fc0c323b9af94328705 Author: David Lavati Date: Tue Oct 1 17:07:21 2019 +0200 HIVE-22278: Upgrade log4j to 2.12.1 Change-Id: Ieced853bd4b2dd3e46291abec17bb73cba0536f4 diff --git a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java index d90d590e29..6972ddef9b 100644 --- a/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java +++ b/itests/hive-unit/src/test/java/org/apache/hive/service/cli/operation/TestOperationLoggingLayout.java @@ -188,7 +188,7 @@ private void checkAppenderState(String msg, String routingAppenderName, String q Map appendersMap = loggerConfig.getAppenders(); RoutingAppender routingAppender = (RoutingAppender) appendersMap.get(routingAppenderName); Assert.assertNotNull(msg + "could not find routingAppender " + routingAppenderName, routingAppender); - Field defaultsField = RoutingAppender.class.getDeclaredField("appenders"); + Field defaultsField = RoutingAppender.class.getDeclaredField("createdAppenders"); defaultsField.setAccessible(true); ConcurrentHashMap appenders = (ConcurrentHashMap) defaultsField.get(routingAppender); AppenderControl appenderControl = (AppenderControl) appenders.get(queryId); @@ -219,7 +219,7 @@ private Appender getAppender(String routingAppenderName, String queryId) Map appendersMap = loggerConfig.getAppenders(); RoutingAppender routingAppender = (RoutingAppender) appendersMap.get(routingAppenderName); Assert.assertNotNull("could not find routingAppender " + routingAppenderName, routingAppender); - Field defaultsField = RoutingAppender.class.getDeclaredField("appenders"); + Field defaultsField = RoutingAppender.class.getDeclaredField("createdAppenders"); defaultsField.setAccessible(true); ConcurrentHashMap appenders = (ConcurrentHashMap) defaultsField.get(routingAppender); AppenderControl appenderControl = (AppenderControl) appenders.get(queryId); diff --git a/pom.xml b/pom.xml index 351df449d6..9673f90c4e 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ 0.9.3 0.9.3-1 - 2.10.0 + 2.12.1 2.3 1.5.6 1.10.19 diff --git a/ql/pom.xml b/ql/pom.xml index 4459113164..c763fcb9e4 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -134,6 +134,11 @@ log4j-1.2-api ${log4j2.version} + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + org.apache.logging.log4j log4j-slf4j-impl diff --git a/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java b/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java index 664734c7bc..67bbd8eb07 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java @@ -73,6 +73,10 @@ public String getCurrentFileName(RollingFileManager rollingFileManager) { return getLogFileName(pattern); } + @Override public void clearCurrentFileName() { + // no rename is needed + } + /** * @return Mangled file name formed by appending the current timestamp */ diff --git a/standalone-metastore/metastore-common/pom.xml b/standalone-metastore/metastore-common/pom.xml index 95e53b9502..bf9ce1ccda 100644 --- a/standalone-metastore/metastore-common/pom.xml +++ b/standalone-metastore/metastore-common/pom.xml @@ -181,6 +181,11 @@ org.apache.logging.log4j log4j-1.2-api + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + org.apache.thrift libfb303 diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index fbcafc7848..f9c0787594 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -87,7 +87,7 @@ 4.11 0.9.3 0.9.3-1 - 2.8.2 + 2.12.1 1.10.19 1.5.1 2.5.0 diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml index e8f964c914..32e302e329 100644 --- a/testutils/ptest2/pom.xml +++ b/testutils/ptest2/pom.xml @@ -26,7 +26,7 @@ limitations under the License. hive-ptest UTF-8 - 2.10.0 + 2.12.1 3.2.16.RELEASE 2.1.0 ${basedir}/../../checkstyle/