Skip to content

Commit 3c8dd38

Browse files
committed
HIVE-28417: Bump Log4j2 to 2.23.1 to facilitate compilation of GraalVM Native Image
1 parent 929305f commit 3c8dd38

File tree

7 files changed

+9
-10
lines changed

7 files changed

+9
-10
lines changed

llap-server/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,8 @@
367367
</dependency>
368368
<dependency>
369369
<groupId>org.apache.logging.log4j</groupId>
370-
<artifactId>log4j-core</artifactId>
370+
<artifactId>log4j-core-test</artifactId>
371371
<version>${log4j2.version}</version>
372-
<classifier>tests</classifier>
373372
<scope>test</scope>
374373
</dependency>
375374
<dependency>

llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/QueryTracker.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@
4848
import org.apache.tez.common.security.TokenCache;
4949
import org.slf4j.Logger;
5050
import org.slf4j.LoggerFactory;
51-
import org.slf4j.Marker;
5251
import org.slf4j.MDC;
52+
import org.slf4j.Marker;
53+
import org.slf4j.impl.StaticMarkerBinder;
5354

5455
import java.io.IOException;
5556
import java.util.Collections;
@@ -70,7 +71,7 @@ public class QueryTracker extends AbstractService {
7071

7172
private static final Logger LOG = LoggerFactory.getLogger(QueryTracker.class);
7273
private static final Marker QUERY_COMPLETE_MARKER =
73-
new Log4jMarker(new Log4jQueryCompleteMarker());
74+
new Log4jMarker(StaticMarkerBinder.getSingleton().getMarkerFactory(), new Log4jQueryCompleteMarker());
7475

7576
/// Shared singleton MetricsSource instance for all DAG locks
7677
private static final MetricsSource LOCK_METRICS;

llap-server/src/test/org/apache/hadoop/hive/llap/daemon/impl/TestLlapDaemonLogging.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.apache.hadoop.security.token.Token;
2626
import org.apache.hive.testutils.junit.extensions.DoNothingTCPServer;
2727
import org.apache.hive.testutils.junit.extensions.DoNothingTCPServerExtension;
28-
import org.apache.logging.log4j.junit.LoggerContextSource;
28+
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
2929
import org.apache.tez.common.security.TokenCache;
3030

3131
import org.junit.jupiter.api.Test;

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<!-- 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 -->
176176
<libfb303.version>0.9.3</libfb303.version>
177177
<libthrift.version>0.16.0</libthrift.version>
178-
<log4j2.version>2.18.0</log4j2.version>
178+
<log4j2.version>2.23.1</log4j2.version>
179179
<mariadb.version>2.5.0</mariadb.version>
180180
<mssql.version>6.2.1.jre8</mssql.version>
181181
<mysql.version>8.0.31</mysql.version>

standalone-metastore/metastore-server/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,8 @@
412412
</dependency>
413413
<dependency>
414414
<groupId>org.apache.logging.log4j</groupId>
415-
<artifactId>log4j-core</artifactId>
415+
<artifactId>log4j-core-test</artifactId>
416416
<version>${log4j2.version}</version>
417-
<classifier>tests</classifier>
418417
<scope>test</scope>
419418
</dependency>
420419
</dependencies>

standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestMetaStoreServerUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.apache.logging.log4j.LogManager;
4545
import org.apache.logging.log4j.core.LoggerContext;
4646
import org.apache.logging.log4j.core.config.LoggerConfig;
47-
import org.apache.logging.log4j.test.appender.ListAppender;
47+
import org.apache.logging.log4j.core.test.appender.ListAppender;
4848
import org.apache.thrift.TException;
4949
import org.hamcrest.core.IsNot;
5050
import org.junit.After;

standalone-metastore/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<junit.vintage.version>5.6.3</junit.vintage.version>
9090
<libfb303.version>0.9.3</libfb303.version>
9191
<libthrift.version>0.16.0</libthrift.version>
92-
<log4j2.version>2.18.0</log4j2.version>
92+
<log4j2.version>2.23.1</log4j2.version>
9393
<mockito-core.version>3.4.4</mockito-core.version>
9494
<orc.version>1.8.5</orc.version>
9595
<protobuf.version>3.24.4</protobuf.version>

0 commit comments

Comments
 (0)