diff --git a/LICENSE-binary b/LICENSE-binary
index 980b9c7f2b62a..9dca7a6f6bf85 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.18.3
com.aliyun:aliyun-java-sdk-core:3.4.0
com.aliyun:aliyun-java-sdk-ecs:4.2.0
com.aliyun:aliyun-java-sdk-ram:3.0.0
@@ -279,7 +280,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
net.minidev:json-smart:2.4.7
@@ -472,9 +472,10 @@ 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.slf4j:jcl-over-slf4j:1.7.35
+org.slf4j:jul-to-slf4j:1.7.35
+org.slf4j:slf4j-api:1.7.35
+org.slf4j:slf4j-reload4j:1.7.35
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 b1c00678406d7..224788e7c7edb 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 0e576ac6f0666..40fc34725e230 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 ba593ebd1b42d..f9f06628fdfee 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 06e36837a2098..19a72c969b667 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
@@ -696,7 +700,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 35fbd7665fb26..321e90b03803d 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
@@ -150,8 +150,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 5299c9e8713df..ff0db4789dbcd 100644
--- a/hadoop-client-modules/hadoop-client/pom.xml
+++ b/hadoop-client-modules/hadoop-client/pom.xml
@@ -218,8 +218,8 @@
commons-cli
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
com.sun.jersey
@@ -294,11 +294,6 @@
io.netty
netty
-
-
- org.slf4j
- slf4j-log4j12
-
@@ -327,11 +322,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 4deda432797e0..36b3831a01b8c 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 6eaa4fdfce5b4..cafa60c3be420 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
@@ -185,6 +185,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 d8e2dd3542223..d3a00464b2be9 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -186,8 +186,8 @@
compile
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
compile
@@ -238,7 +238,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 2d35b15bc5900..df81bf1209360 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
@@ -89,7 +89,7 @@ public static boolean isLog4jLogger(Class> clazz) {
}
Logger log = LoggerFactory.getLogger(clazz);
try {
- Class log4jClass = Class.forName("org.slf4j.impl.Log4jLoggerAdapter");
+ Class log4jClass = Class.forName("org.slf4j.impl.Reload4jLoggerAdapter");
return log4jClass.isInstance(log);
} catch (ClassNotFoundException e) {
return 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 96588a22b9419..93ab9e4b11330 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 c292aebbe3656..589a10801800e 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 33d8b3710c528..440d3530c106a 100644
--- a/hadoop-common-project/hadoop-nfs/pom.xml
+++ b/hadoop-common-project/hadoop-nfs/pom.xml
@@ -79,13 +79,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 9bb0932d32867..4e4a6dbe04158 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml
@@ -56,8 +56,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
commons-logging
- 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 a1b3ab1f92397..567b0f8960945 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 24599a2b244a4..7127a3781785d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
@@ -144,8 +144,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
compile
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
compile
@@ -170,7 +170,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 d4d5c1eb33983..a19928b0f0ce0 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
@@ -54,8 +54,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
commons-logging
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
@@ -82,7 +82,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 b51c7154f7b92..8be677de18121 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -128,8 +128,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
compile
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
compile
@@ -172,7 +172,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 d6b453fb3b034..798361d3d06c3 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
@@ -90,7 +90,7 @@
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
org.apache.hadoop
diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml
index 3ce66a10a84f7..228fe55a6d0a6 100644
--- a/hadoop-mapreduce-project/pom.xml
+++ b/hadoop-mapreduce-project/pom.xml
@@ -92,7 +92,7 @@
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
org.apache.hadoop
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index ec07369977b32..5fce14cf0edd5 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -80,8 +80,8 @@
4.4.13
- 1.7.30
- 1.2.17
+ 1.7.36
+ 1.2.18.3
2.17.1
@@ -327,12 +327,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
@@ -409,6 +425,12 @@
org.apache.hadoop
hadoop-mapreduce-client-core
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-reload4j
+
+
@@ -422,6 +444,12 @@
org.apache.hadoop
hadoop-mapreduce-client-jobclient
${hadoop.version}
+
+
+ org.slf4j
+ slf4j-reload4j
+
+
@@ -1026,9 +1054,9 @@
${commons-logging-api.version}
- log4j
- log4j
- ${log4j.version}
+ ch.qos.reload4j
+ reload4j
+ ${reload4j.version}
com.sun.jdmk
@@ -1178,7 +1206,7 @@
org.slf4j
- slf4j-log4j12
+ slf4j-reload4j
${slf4j.version}
@@ -1369,6 +1397,10 @@
org.apache.kerby
kerby-config
+
+ log4j
+ log4j
+
org.slf4j
slf4j-api
@@ -1377,6 +1409,10 @@
org.slf4j
slf4j-log4j12
+
+ org.slf4j
+ slf4j-reload4j
+
@@ -1405,6 +1441,14 @@
io.netty
netty-transport-native-epoll
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
@@ -1549,6 +1593,10 @@
org.slf4j
slf4j-api
+
+ log4j
+ log4j
+
@@ -1657,6 +1705,10 @@
jdk.tools
jdk.tools
+
+ log4j
+ log4j
+
@@ -1665,6 +1717,16 @@
${hbase.version}
test
tests
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
org.apache.hbase
@@ -1682,6 +1744,28 @@
org.apache.hbase
hbase-server
${hbase.version}
+
+
+ log4j
+ log4j
+
+
+
+
+ org.apache.hbase
+ hbase-server
+ ${hbase.version}
+ test
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
org.apache.hbase
@@ -1689,6 +1773,16 @@
${hbase.version}
test
tests
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
org.apache.hbase
@@ -1713,6 +1807,14 @@
jdk.tools
jdk.tools
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
@@ -2237,6 +2339,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 40aeec07026cc..53c4430d398cc 100644
--- a/hadoop-tools/hadoop-azure/pom.xml
+++ b/hadoop-tools/hadoop-azure/pom.xml
@@ -294,8 +294,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 7e468bc75684e..6f06d93ec1ab3 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 4daac9fa235ae..3e0d3bd6bb704 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 dbe4e9048b2df..507f8986dba34 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 c6df7594fcc3f..d66a525889067 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
@@ -178,8 +178,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 025827c42f5f4..1e970e3beff44 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
@@ -174,8 +174,8 @@
hadoop-shaded-guava
- log4j
- log4j
+ ch.qos.reload4j
+ reload4j
org.apache.hadoop