From 77d08f61d6e1c9d6237bb6a21e83d2ea6add6101 Mon Sep 17 00:00:00 2001 From: InvisibleProgrammer Date: Sun, 2 Feb 2025 22:13:07 +0100 Subject: [PATCH 1/2] HIVE-28733: Upgrade log4j2.version to 2.24.3 --- llap-server/pom.xml | 43 ++++++++++++++++++- .../hive/llap/daemon/impl/QueryTracker.java | 3 +- .../daemon/impl/TestLlapDaemonLogging.java | 2 +- pom.xml | 2 +- standalone-metastore/metastore-server/pom.xml | 18 +++++++- .../utils/TestMetaStoreServerUtils.java | 2 +- standalone-metastore/pom.xml | 2 +- 7 files changed, 65 insertions(+), 7 deletions(-) diff --git a/llap-server/pom.xml b/llap-server/pom.xml index 3c7d32286330..e49ad9d206f4 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -369,7 +369,21 @@ org.apache.logging.log4j log4j-core ${log4j2.version} - tests + + + org.junit-pioneer + junit-pioneer + + + org.junit.platform + junit-platform-commons + + + + + org.apache.logging.log4j + log4j-core-test + ${log4j2.version} test @@ -382,6 +396,33 @@ + + org.apache.logging.log4j + log4j-api-test + ${log4j2.version} + + + + org.junit-pioneer + junit-pioneer + + + org.junit.platform + junit-platform-commons + + + + + + org.apache.logging.log4j + log4j-slf4j2-impl + ${log4j2.version} + + + org.apache.logging.log4j + log4j-to-slf4j + 2.23.1 + org.mockito mockito-core diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java index 6cfa076b9db4..1a2ce3a1cdc5 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java @@ -49,6 +49,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.Marker; +import org.slf4j.MarkerFactory; import org.slf4j.MDC; import java.io.IOException; @@ -70,7 +71,7 @@ public class QueryTracker extends AbstractService { private static final Logger LOG = LoggerFactory.getLogger(QueryTracker.class); private static final Marker QUERY_COMPLETE_MARKER = - new Log4jMarker(new Log4jQueryCompleteMarker()); + new Log4jMarker(MarkerFactory.getIMarkerFactory(), new Log4jQueryCompleteMarker()); /// Shared singleton MetricsSource instance for all DAG locks private static final MetricsSource LOCK_METRICS; diff --git a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestLlapDaemonLogging.java b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestLlapDaemonLogging.java index 9b03f0fb162e..0145da1a51cc 100644 --- a/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestLlapDaemonLogging.java +++ b/llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestLlapDaemonLogging.java @@ -25,7 +25,7 @@ import org.apache.hadoop.security.token.Token; import org.apache.hive.testutils.junit.extensions.DoNothingTCPServer; import org.apache.hive.testutils.junit.extensions.DoNothingTCPServerExtension; -import org.apache.logging.log4j.junit.LoggerContextSource; +import org.apache.logging.log4j.core.test.junit.LoggerContextSource; import org.apache.tez.common.security.TokenCache; import org.junit.jupiter.api.Test; diff --git a/pom.xml b/pom.xml index f16874246174..01bde22814b1 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ 0.9.3 0.16.0 - 2.18.0 + 2.24.3 2.5.0 6.2.1.jre8 8.2.0 diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml index 883c55a48392..4e3bf32f9c14 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -420,9 +420,25 @@ org.apache.logging.log4j log4j-core ${log4j2.version} - tests + + + org.apache.logging.log4j + log4j-core-test + ${log4j2.version} test + + + + + + + + + + + + diff --git a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreServerUtils.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreServerUtils.java index 25bf6ee4111b..c09d98381048 100644 --- a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreServerUtils.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreServerUtils.java @@ -44,7 +44,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.LoggerConfig; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; import org.apache.thrift.TException; import org.hamcrest.core.IsNot; import org.junit.After; diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 81e80833a8bf..cfa46fc94f31 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -89,7 +89,7 @@ 5.11.2 0.9.3 0.16.0 - 2.18.0 + 2.24.3 3.4.4 1.9.4 3.25.5 From bb2a300660bf5be9169d98b7d46da2d695a311a1 Mon Sep 17 00:00:00 2001 From: InvisibleProgrammer Date: Mon, 3 Feb 2025 08:28:34 +0100 Subject: [PATCH 2/2] HIVE-28733: Fix formatting issues --- llap-server/pom.xml | 2 -- standalone-metastore/metastore-server/pom.xml | 12 ------------ 2 files changed, 14 deletions(-) diff --git a/llap-server/pom.xml b/llap-server/pom.xml index e49ad9d206f4..92a0677b9b56 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -400,7 +400,6 @@ org.apache.logging.log4j log4j-api-test ${log4j2.version} - org.junit-pioneer @@ -412,7 +411,6 @@ - org.apache.logging.log4j log4j-slf4j2-impl diff --git a/standalone-metastore/metastore-server/pom.xml b/standalone-metastore/metastore-server/pom.xml index 4e3bf32f9c14..b0cf706cbf59 100644 --- a/standalone-metastore/metastore-server/pom.xml +++ b/standalone-metastore/metastore-server/pom.xml @@ -427,18 +427,6 @@ ${log4j2.version} test - - - - - - - - - - - -