diff --git a/LICENSE-binary b/LICENSE-binary
index c5ba9f938aefa..c2cc745b4da34 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -210,6 +210,7 @@ hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/nvd3-1.8.5.* (css and js
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AbstractFuture.java
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/TimeoutFuture.java
+ch.qos.reload4j:reload4j:1.2.22
com.aliyun:aliyun-java-sdk-core:4.5.10
com.aliyun:aliyun-java-sdk-kms:2.11.0
com.aliyun:aliyun-java-sdk-ram:3.1.0
@@ -294,7 +295,6 @@ io.reactivex:rxjava-string:1.1.1
io.reactivex:rxnetty:0.4.20
io.swagger:swagger-annotations:1.5.4
javax.inject:javax.inject:1
-log4j:log4j:1.2.17
net.java.dev.jna:jna:5.2.0
net.minidev:accessors-smart:1.2
org.apache.avro:avro:1.9.2
@@ -489,11 +489,10 @@ org.checkerframework:checker-qual:2.5.2
org.codehaus.mojo:animal-sniffer-annotations:1.21
org.jruby.jcodings:jcodings:1.0.13
org.jruby.joni:joni:2.1.2
-org.slf4j:jul-to-slf4j:jar:1.7.25
-org.ojalgo:ojalgo:43.0:compile
-org.slf4j:jul-to-slf4j:1.7.25
-org.slf4j:slf4j-api:1.7.25
-org.slf4j:slf4j-log4j12:1.7.25
+org.ojalgo:ojalgo:43.0
+org.slf4j:jul-to-slf4j:1.7.36
+org.slf4j:slf4j-api:1.7.36
+org.slf4j:slf4j-reload4j:1.7.36
CDDL 1.1 + GPLv2 with classpath exception
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer.xml
index 448035262e12d..b2ce562231c5a 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-dynamometer.xml
@@ -66,7 +66,7 @@
org.slf4j:slf4j-api
- org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
index 0edfdeb7b0d52..af5d89d7efe48 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
@@ -40,7 +40,7 @@
org.apache.hadoop:hadoop-hdfs
org.slf4j:slf4j-api
- org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
org.hsqldb:hsqldb
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml
index d698a3005d429..bec2f94b95ea1 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml
@@ -69,7 +69,7 @@
org.apache.hadoop:hadoop-hdfs
org.slf4j:slf4j-api
- org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
org.hsqldb:hsqldb
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-kms-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-kms-dist.xml
index ff6f99080cafd..e5e6834b04206 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-kms-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-kms-dist.xml
@@ -69,7 +69,7 @@
org.apache.hadoop:hadoop-hdfs
org.slf4j:slf4j-api
- org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
org.hsqldb:hsqldb
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
index 06a55d6d06a72..28d5ebe9f605d 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
@@ -179,7 +179,7 @@
org.apache.hadoop:hadoop-hdfs
org.slf4j:slf4j-api
- org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
org.hsqldb:hsqldb
jdiff:jdiff:jar
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
index cb3d9cdf24978..59000c071131c 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
@@ -40,7 +40,7 @@
org.apache.hadoop:hadoop-hdfs
org.slf4j:slf4j-api
- org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
org.hsqldb:hsqldb
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
index db744f511dadb..c01d9c4282089 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
@@ -229,7 +229,7 @@
org.apache.hadoop:hadoop-pipes
org.slf4j:slf4j-api
- org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
index 4da4ac5acb98b..cd86ce4e41766 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
@@ -309,7 +309,7 @@
org.apache.hadoop:*
org.slf4j:slf4j-api
- org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
org.hsqldb:hsqldb
diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
index 24d1aedd2329b..14716995c0828 100644
--- a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
+++ b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
@@ -84,8 +84,8 @@
org.slf4j:slf4j-api
commons-logging:commons-logging
-
- log4j:log4j
+
+ ch.qos.reload4j:reload4j
com.google.code.findbugs:jsr305
diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
index fd866b0657347..d934f753911eb 100644
--- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
+++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
@@ -88,8 +88,8 @@
org.slf4j:slf4j-api
commons-logging:commons-logging
-
- log4j:log4j
+
+ ch.qos.reload4j:reload4j
junit:junit
diff --git a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
index 09b29978e5470..4146acf89dcdb 100644
--- a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
+++ b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
@@ -33,8 +33,8 @@
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
test
@@ -42,11 +42,6 @@
slf4j-api
test
-
- org.slf4j
- slf4j-log4j12
- test
-
junit
junit
diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index c8c191fdc0a45..666df82f48381 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -193,8 +193,12 @@
slf4j-log4j12
- log4j
- log4j
+ org.slf4j
+ slf4j-reload4j
+
+
+ ch.qos.reload4j
+ reload4j
com.fasterxml.jackson.core
@@ -693,7 +697,7 @@
commons-logging:commons-logging
junit:junit
com.google.code.findbugs:jsr305
- log4j:log4j
+ ch.qos.reload4j:reload4j
org.eclipse.jetty.websocket:websocket-common
org.eclipse.jetty.websocket:websocket-api
diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml
index 1ee75a28d43c3..22c8ae00a3a52 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -103,8 +103,8 @@
* one of the three custom log4j appenders we have
-->
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
runtime
true
@@ -143,8 +143,8 @@
org.slf4j:slf4j-api
commons-logging:commons-logging
-
- log4j:log4j
+
+ ch.qos.reload4j:reload4j
com.google.code.findbugs:jsr305
diff --git a/hadoop-client-modules/hadoop-client/pom.xml b/hadoop-client-modules/hadoop-client/pom.xml
index b2a862c8fc3b4..7e6ef037ee2d7 100644
--- a/hadoop-client-modules/hadoop-client/pom.xml
+++ b/hadoop-client-modules/hadoop-client/pom.xml
@@ -214,8 +214,8 @@
commons-cli
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
com.sun.jersey
@@ -298,11 +298,6 @@
io.netty
netty
-
-
- org.slf4j
- slf4j-log4j12
-
@@ -331,11 +326,6 @@
io.netty
netty
-
-
- org.slf4j
- slf4j-log4j12
-
diff --git a/hadoop-common-project/hadoop-auth-examples/pom.xml b/hadoop-common-project/hadoop-auth-examples/pom.xml
index a0e3a36dee710..fab06a3f21b62 100644
--- a/hadoop-common-project/hadoop-auth-examples/pom.xml
+++ b/hadoop-common-project/hadoop-auth-examples/pom.xml
@@ -47,13 +47,13 @@
compile
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
runtime
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
runtime
diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml
index 429041118e329..ed10bae74e1c5 100644
--- a/hadoop-common-project/hadoop-auth/pom.xml
+++ b/hadoop-common-project/hadoop-auth/pom.xml
@@ -82,13 +82,13 @@
compile
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
runtime
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
runtime
@@ -173,6 +173,12 @@
apacheds-server-integ
${apacheds.version}
test
+
+
+ log4j
+ log4j
+
+
org.apache.directory.server
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index 8a08d21eec18b..392a26c2ff9ae 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -193,8 +193,8 @@
compile
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
compile
@@ -240,7 +240,7 @@
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
compile
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java
index 2bf26da4d3ba2..73bf4645a040e 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericsUtil.java
@@ -34,7 +34,7 @@
@InterfaceStability.Unstable
public class GenericsUtil {
- private static final String SLF4J_LOG4J_ADAPTER_CLASS = "org.slf4j.impl.Log4jLoggerAdapter";
+ private static final String SLF4J_LOG4J_ADAPTER_CLASS = "org.slf4j.impl.Reload4jLoggerAdapter";
/**
* Set to false only if log4j adapter class is not found in the classpath. Once set to false,
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
index 98e182236c94c..04337929abd9f 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
@@ -35,6 +35,6 @@ public void testFindContainingJar() {
Assert.assertTrue("Containing jar does not exist on file system ",
jarFile.exists());
Assert.assertTrue("Incorrect jar file " + containingJar,
- jarFile.getName().matches("log4j.*[.]jar"));
+ jarFile.getName().matches("reload4j.*[.]jar"));
}
}
diff --git a/hadoop-common-project/hadoop-kms/pom.xml b/hadoop-common-project/hadoop-kms/pom.xml
index b97318c90cdae..326f2bb787cf2 100644
--- a/hadoop-common-project/hadoop-kms/pom.xml
+++ b/hadoop-common-project/hadoop-kms/pom.xml
@@ -134,8 +134,8 @@
test-jar
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
compile
@@ -145,7 +145,7 @@
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
runtime
diff --git a/hadoop-common-project/hadoop-minikdc/pom.xml b/hadoop-common-project/hadoop-minikdc/pom.xml
index f2def6693354a..96e0f16f49b8c 100644
--- a/hadoop-common-project/hadoop-minikdc/pom.xml
+++ b/hadoop-common-project/hadoop-minikdc/pom.xml
@@ -40,7 +40,7 @@
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
compile
diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml
index b50d389e325b0..bf6589fd6fc46 100644
--- a/hadoop-common-project/hadoop-nfs/pom.xml
+++ b/hadoop-common-project/hadoop-nfs/pom.xml
@@ -74,13 +74,13 @@
compile
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
runtime
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
runtime
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
index 1bc63be270ed8..39038c474912d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
@@ -40,8 +40,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
provided
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
org.slf4j
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 4d799254fa297..b307b2165e79d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -179,8 +179,8 @@
test-jar
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
compile
@@ -190,7 +190,7 @@
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
runtime
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
index fff4eccc5d9a0..a14b86e10b2b4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
@@ -139,8 +139,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
compile
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
compile
@@ -165,7 +165,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
provided
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
index 4fdaf7780e1b4..118bdcf9dd626 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
@@ -50,8 +50,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
provided
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
@@ -78,7 +78,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
provided
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 281b7a4e7e758..ac56754352c20 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -123,8 +123,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
compile
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
compile
@@ -171,7 +171,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
provided
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
index 7d030972ac9cb..5bbb786a016e9 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
@@ -87,7 +87,7 @@
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
org.apache.hadoop
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index c732837dd17fa..a344b562b9519 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -77,8 +77,8 @@
4.4.13
- 1.7.30
- 1.2.17
+ 1.7.36
+ 1.2.22
2.17.1
@@ -310,12 +310,28 @@
org.apache.hadoop
hadoop-common
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-reload4j
+
+
org.apache.hadoop
hadoop-common
${hadoop.version}
test-jar
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
org.apache.hadoop
@@ -402,6 +418,12 @@
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-reload4j
+
+
@@ -415,6 +437,12 @@
org.apache.hadoop
hadoop-mapreduce-client-jobclient
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-reload4j
+
+
@@ -1073,9 +1101,9 @@
- log4j
- log4j
- ${log4j.version}
+ ch.qos.reload4j
+ reload4j
+ ${reload4j.version}
com.sun.jdmk
@@ -1241,7 +1269,7 @@
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
${slf4j.version}
@@ -1293,6 +1321,12 @@
org.mockito
mockito-core
2.28.2
+
+
+ log4j
+ log4j
+
+
org.mockito
@@ -1427,6 +1461,10 @@
org.apache.kerby
kerby-config
+
+ log4j
+ log4j
+
org.slf4j
slf4j-api
@@ -1435,6 +1473,10 @@
org.slf4j
slf4j-log4j12
+
+ org.slf4j
+ slf4j-reload4j
+
org.eclipse.jetty
jetty-client
@@ -1487,6 +1529,14 @@
ch.qos.logback
logback-classic
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
@@ -1646,6 +1696,10 @@
org.slf4j
slf4j-api
+
+ log4j
+ log4j
+
@@ -1755,6 +1809,10 @@
jdk.tools
jdk.tools
+
+ log4j
+ log4j
+
org.apache.yetus
audience-annotations
@@ -1767,6 +1825,16 @@
${hbase.version}
test
tests
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
org.apache.hbase
@@ -1789,6 +1857,10 @@
hbase-server
${hbase.version}
+
+ log4j
+ log4j
+
org.osgi
org.osgi.core
@@ -1817,6 +1889,16 @@
${hbase.version}
test
tests
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
org.apache.hbase
@@ -1841,6 +1923,14 @@
jdk.tools
jdk.tools
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
@@ -2376,6 +2466,9 @@
com.sun.jersey.jersey-test-framework:*
com.google.inject:guice
org.ow2.asm:asm
+
+ org.slf4j:slf4j-log4j12
+ log4j:log4j
diff --git a/hadoop-tools/hadoop-azure/pom.xml b/hadoop-tools/hadoop-azure/pom.xml
index 00f4e852cb241..f1b0a46273a13 100644
--- a/hadoop-tools/hadoop-azure/pom.xml
+++ b/hadoop-tools/hadoop-azure/pom.xml
@@ -307,8 +307,8 @@
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
test
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
index 8c520808c2139..7f616e0c46a4b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
@@ -46,8 +46,8 @@
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
org.apache.hadoop.thirdparty
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml
index 80df27ec1cb05..b70b2a6871165 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml
@@ -118,8 +118,8 @@
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
runtime
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
index 1940c6d2cff7d..fdc2b6c274334 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml
@@ -66,8 +66,8 @@
commons-cli
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
org.eclipse.jetty.websocket
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
index facf393d84b53..0d2dedcc3158f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
@@ -203,8 +203,8 @@
jersey-guice
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
com.fasterxml.jackson.core
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
index f2414980e4576..bb68f06b6535f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
@@ -179,8 +179,8 @@
hadoop-shaded-guava
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
org.apache.hadoop
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml
index d85a89e660d9e..7c68853fb8d7a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-documentstore/pom.xml
@@ -126,6 +126,10 @@
xml-apis
xml-apis
+
+ log4j
+ log4j
+