This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
commit caf7ac0099645ac8500d824556941447e66e25e3
Author: David Lavati <david.lav...@gmail.com>
AuthorDate: Tue Oct 8 12:54:24 2019 +0000
HIVE-22278: Upgrade log4j to 2.12.1 (David Lavati via Zoltan Haindrich)
Signed-off-by: Zoltan Haindrich <k...@rxd.hu>
---
.../hive/service/cli/operation/TestOperationLoggingLayout.java | 4 ++--
pom.xml | 2 +-
ql/pom.xml | 5 +++++
.../apache/hadoop/hive/ql/log/SlidingFilenameRolloverStrategy.java | 4 ++++
standalone-metastore/metastore-common/pom.xml | 5 +++++
standalone-metastore/pom.xml | 2 +-
testutils/ptest2/pom.xml | 2 +-
7 files changed, 19 insertions(+), 5 deletions(-)
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 d90d590..6972dde 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 @@ public class TestOperationLoggingLayout {
Map<String, Appender> 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 @@ public class TestOperationLoggingLayout {
Map<String, Appender> 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 ba11dcf..1f4cb10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,7 @@
<!-- Leaving libfb303 at 0.9.3 regardless of libthrift: As per THRIFT-4613
The Apache Thrift project does not publish items related to fb303 at this point
-->
<libfb303.version>0.9.3</libfb303.version>
<libthrift.version>0.9.3-1</libthrift.version>
- <log4j2.version>2.10.0</log4j2.version>
+ <log4j2.version>2.12.1</log4j2.version>
<opencsv.version>2.3</opencsv.version>
<orc.version>1.5.6</orc.version>
<mockito-core.version>1.10.19</mockito-core.version>
diff --git a/ql/pom.xml b/ql/pom.xml
index 6e850e7..0d57c25 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -131,6 +131,11 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
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 664734c..67bbd8e 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 class SlidingFilenameRolloverStrategy
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 2aa3950..e252f12 100644
--- a/standalone-metastore/metastore-common/pom.xml
+++ b/standalone-metastore/metastore-common/pom.xml
@@ -186,6 +186,11 @@
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libfb303</artifactId>
</dependency>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index be0add47..9f064a8 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -88,7 +88,7 @@
<junit.version>4.11</junit.version>
<libfb303.version>0.9.3</libfb303.version>
<libthrift.version>0.9.3-1</libthrift.version>
- <log4j2.version>2.8.2</log4j2.version>
+ <log4j2.version>2.12.1</log4j2.version>
<mockito-core.version>1.10.19</mockito-core.version>
<orc.version>1.5.1</orc.version>
<protobuf.version>2.5.0</protobuf.version>
diff --git a/testutils/ptest2/pom.xml b/testutils/ptest2/pom.xml
index e8f964c..32e302e 100644
--- a/testutils/ptest2/pom.xml
+++ b/testutils/ptest2/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
<name>hive-ptest</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <log4j2.version>2.10.0</log4j2.version>
+ <log4j2.version>2.12.1</log4j2.version>
<spring.framework.version>3.2.16.RELEASE</spring.framework.version>
<jclouds.version>2.1.0</jclouds.version>
<checkstyle.conf.dir>${basedir}/../../checkstyle/</checkstyle.conf.dir>
