diff --git a/NOTICE.txt b/NOTICE.txt index 06e98dfcb5051..6080c2031a468 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -223,13 +223,13 @@ framework, which can be obtained at: * HOMEPAGE: * http://commons.apache.org/logging/ -This product optionally depends on 'Apache Log4J', a logging framework, which +This product optionally depends on 'reload4j', a logging framework, which can be obtained at: * LICENSE: - * license/LICENSE.log4j.txt (Apache License 2.0) + * license/LICENSE.reload4j.txt (Apache License 2.0) * HOMEPAGE: - * http://logging.apache.org/log4j/ + * https://reload4j.qos.ch/ This product optionally depends on 'Aalto XML', an ultra-high performance non-blocking XML processor, which can be obtained at: @@ -278,7 +278,7 @@ which has the following notices: * This product includes software from the Spring Framework,under the Apache License 2.0 (see: StringUtils.containsWhitespace()) The binary distribution of this product bundles binaries of -Apache Log4j 1.2.17, +reload4j 1.2.18.3, which has the following notices: * ResolverUtil.java Copyright 2005-2006 Tim Fennell diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml index 45d752ecb7404..d9080e46fc25f 100644 --- a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml @@ -87,7 +87,7 @@ 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 11cd13bde80a1..28f2692b6b017 100644 --- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml @@ -91,7 +91,7 @@ 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 3332258f1d112..b94d92f23ed2f 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 ff16cca38e5d3..dce3e0326c9e7 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -187,8 +187,12 @@ slf4j-log4j12 - log4j - log4j + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j com.fasterxml.jackson.core @@ -669,7 +673,7 @@ commons-logging:commons-logging junit:junit com.google.code.findbugs:jsr305 - log4j:log4j + ch.qos.reload4j:reload4j org.bouncycastle:* diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index 535f9641d011c..41d9665590439 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 @@ -153,7 +153,7 @@ 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 43fca46c64799..bb4240f311a46 100644 --- a/hadoop-client-modules/hadoop-client/pom.xml +++ b/hadoop-client-modules/hadoop-client/pom.xml @@ -206,8 +206,8 @@ commons-cli - log4j - log4j + ch.qos.reload4j + reload4j com.sun.jersey @@ -282,11 +282,6 @@ io.netty netty - - - org.slf4j - slf4j-log4j12 - @@ -315,11 +310,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 989fea1863db4..f73870fdb83b5 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 ae78551763b07..43980c0925a8e 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 @@ -176,6 +176,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 d215b43e1abd6..78981c16cda8f 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -151,8 +151,8 @@ compile - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -192,7 +192,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 0aba34845a676..334e370214ef4 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 @@ -85,7 +85,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 5d3f9f6ddffb6..f48a6dd821f98 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 df3cc302129ea..deb301c00093e 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 1381342961385..52740eca02eac 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 380a9d50b6163..058e190607bf4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -48,8 +48,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-logging - log4j - log4j + ch.qos.reload4j + reload4j diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index e951320242b0a..0b7b2e20e5338 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 223390a9fefca..2155688530d66 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -134,8 +134,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> compile - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -160,7 +160,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 55b239b9f0f41..3b4a919e87e62 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml @@ -44,8 +44,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> commons-logging - log4j - log4j + ch.qos.reload4j + reload4j @@ -61,7 +61,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 820879dd34a1d..dc3e3c9463201 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -124,8 +124,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> compile - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -155,7 +155,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 fa276625f01df..08ce032c4695f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -82,7 +82,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 ff909aca02687..b8cf4d44b3432 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -88,7 +88,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j org.apache.hadoop diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 42fa017636f1f..068b77284836d 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -79,8 +79,8 @@ 4.4.13 - 1.7.25 - 1.2.17 + 1.7.35 + 1.2.18.3 1.1 @@ -263,12 +263,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 @@ -339,12 +355,24 @@ org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop hadoop-mapreduce-client-jobclient ${hadoop.version} + + + org.slf4j + slf4j-reload4j + + @@ -910,9 +938,9 @@ ${commons-logging-api.version} - log4j - log4j - ${log4j.version} + ch.qos.reload4j + reload4j + ${reload4j.version} com.sun.jdmk @@ -1015,7 +1043,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j ${slf4j.version} @@ -1194,6 +1222,18 @@ jline jline + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-reload4j + @@ -1210,6 +1250,14 @@ jline jline + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -1320,6 +1368,16 @@ org.apache.curator curator-recipes ${curator.version} + + + org.slf4j + slf4j-api + + + log4j + log4j + + org.apache.curator @@ -1395,6 +1453,10 @@ jdk.tools jdk.tools + + log4j + log4j + @@ -1403,6 +1465,16 @@ ${hbase.version} test tests + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + org.apache.hbase @@ -1420,6 +1492,16 @@ org.apache.hbase hbase-server ${hbase.version} + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + org.apache.hbase @@ -1427,6 +1509,16 @@ ${hbase.version} test tests + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + org.apache.hbase @@ -1451,6 +1543,14 @@ jdk.tools jdk.tools + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -1826,6 +1926,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 34e8351cb3b2f..cc9d670c3c1e9 100644 --- a/hadoop-tools/hadoop-azure/pom.xml +++ b/hadoop-tools/hadoop-azure/pom.xml @@ -245,8 +245,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 a5b063cfbea67..b937339a2cbcd 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 com.google.guava 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 8a3c76982f5ed..9c85c148644bf 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 @@ -107,8 +107,8 @@ - log4j - log4j + ch.qos.reload4j + reload4j runtime diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-submarine/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-submarine/pom.xml index 2bb8fabe8dba4..95c878948af93 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-submarine/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-submarine/pom.xml @@ -46,8 +46,8 @@ - log4j - log4j + ch.qos.reload4j + reload4j com.google.guava 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 a67818207148b..9c9af2ccdd772 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -51,8 +51,8 @@ commons-cli - log4j - log4j + ch.qos.reload4j + reload4j 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 6976743735d94..e39e78feb210f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -167,8 +167,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 10a2e5e9cc9c7..0927f395a26cc 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 @@ -163,8 +163,8 @@ commons-logging - log4j - log4j + ch.qos.reload4j + reload4j org.apache.hadoop