diff --git a/NOTICE.txt b/NOTICE.txt index 3b0784a7832c5..e1992282314ab 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: @@ -271,7 +271,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-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml index 89e8771d80989..1b7f0a8b73068 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 @@ -38,7 +38,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 0cb01ea1a1f00..1dc7e87a9cfc9 100644 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml @@ -181,7 +181,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-nfs-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml index 927123985ed88..d2009862e6f63 100644 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml @@ -38,7 +38,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 e6a9a763e3f75..df880d35168fa 100644 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml @@ -145,7 +145,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 3c179ed8a48e1..90602f2001a79 100644 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml @@ -276,7 +276,7 @@ com.fasterxml.jackson.core:* org.slf4j:slf4j-api - org.slf4j:slf4j-log4j12 + org.slf4j:slf4j-reload4j org.hsqldb:hsqldb diff --git a/hadoop-common-project/hadoop-auth-examples/pom.xml b/hadoop-common-project/hadoop-auth-examples/pom.xml index 678bbe4fc8700..4c4de1abcbd75 100644 --- a/hadoop-common-project/hadoop-auth-examples/pom.xml +++ b/hadoop-common-project/hadoop-auth-examples/pom.xml @@ -48,13 +48,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 ca082f252139a..838237df69482 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -88,13 +88,13 @@ compile - log4j - log4j + ch.qos.reload4j + reload4j runtime org.slf4j - slf4j-log4j12 + slf4j-reload4j runtime @@ -164,6 +164,10 @@ org.apache.directory.api api-ldap-schema-data + + log4j + log4j + diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 664fe39e187ef..ecb42b53ca514 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -138,8 +138,8 @@ compile - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -200,7 +200,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 a53096a9577d2..2345c78a27d4c 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 @@ -25,7 +25,7 @@ import org.apache.hadoop.classification.InterfaceStability; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.impl.Log4jLoggerAdapter; +import org.slf4j.impl.Reload4jLoggerAdapter; /** * Contains utility methods for dealing with Java Generics. @@ -85,6 +85,6 @@ public static boolean isLog4jLogger(Class clazz) { return false; } Logger log = LoggerFactory.getLogger(clazz); - return log instanceof Log4jLoggerAdapter; + return log instanceof Reload4jLoggerAdapter; } } 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 45bc8d36982ad..cca83013cf7c9 100644 --- a/hadoop-common-project/hadoop-kms/pom.xml +++ b/hadoop-common-project/hadoop-kms/pom.xml @@ -158,8 +158,8 @@ test-jar - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -169,7 +169,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 b26955279e965..f1566c9a7ab8a 100644 --- a/hadoop-common-project/hadoop-minikdc/pom.xml +++ b/hadoop-common-project/hadoop-minikdc/pom.xml @@ -95,6 +95,14 @@ org.apache.directory.api api-ldap-schema-data + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -143,7 +151,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 56f6ddb550668..2ef92770dff76 100644 --- a/hadoop-common-project/hadoop-nfs/pom.xml +++ b/hadoop-common-project/hadoop-nfs/pom.xml @@ -78,13 +78,13 @@ compile - log4j - log4j + ch.qos.reload4j + reload4j runtime org.slf4j - slf4j-log4j12 + slf4j-reload4j runtime diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index 2797ad3988de8..59041d7cdd44b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -194,8 +194,8 @@ test-jar - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -205,7 +205,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 f41c28378011c..c546e2296cc80 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -135,8 +135,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> compile - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -161,7 +161,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 3944308f8b209..110a6523ada9b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml @@ -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 97c7cec599824..0862ae8dafa96 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 f4a7c99fb734e..ccde003f543e6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -83,7 +83,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 706048ff0c70e..3ba723fcd04ab 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -89,7 +89,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j org.apache.hadoop diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 2cf53ae3a8ede..deb28d6cfe580 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -84,7 +84,8 @@ 4.4.13 - 1.7.25 + 1.7.36 + 1.2.18.3 @@ -762,9 +763,9 @@ 1.1 - log4j - log4j - 1.2.17 + ch.qos.reload4j + reload4j + ${reload4j.version} com.sun.jdmk @@ -873,7 +874,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j ${slf4j.version} @@ -1040,6 +1041,14 @@ org.jboss.netty netty + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -1056,6 +1065,14 @@ jline jline + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -1063,6 +1080,16 @@ bookkeeper-server 4.2.3 compile + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + org.hsqldb @@ -1258,6 +1285,10 @@ jdk.tools jdk.tools + + log4j + log4j + @@ -1266,6 +1297,16 @@ ${hbase.version} test tests + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + org.apache.hbase @@ -1283,6 +1324,12 @@ org.apache.hbase hbase-server ${hbase.version} + + + log4j + log4j + + org.apache.hbase @@ -1290,7 +1337,13 @@ ${hbase.version} test tests - + + + log4j + log4j + + + org.apache.hbase hbase-testing-util @@ -1314,6 +1367,14 @@ jdk.tools jdk.tools + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -1603,6 +1664,12 @@ true + + + org.slf4j:slf4j-log4j12 + log4j:log4j + + diff --git a/hadoop-tools/hadoop-azure/pom.xml b/hadoop-tools/hadoop-azure/pom.xml index a80f50289a118..4b1ffa8f74626 100644 --- a/hadoop-tools/hadoop-azure/pom.xml +++ b/hadoop-tools/hadoop-azure/pom.xml @@ -232,8 +232,8 @@ - log4j - log4j + ch.qos.reload4j + reload4j test 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 afeffe0000f85..f8f88df766353 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -175,8 +175,8 @@ jersey-guice - log4j - log4j + ch.qos.reload4j + reload4j 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 5b0f7ab943e6e..7aa33bf5f705b 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 @@ -159,8 +159,8 @@ commons-logging - log4j - log4j + ch.qos.reload4j + reload4j org.apache.hadoop diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml index a9e790f1dc385..f5e30545b4f91 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml @@ -105,6 +105,14 @@ org.apache.hadoop hadoop-auth + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -115,6 +123,16 @@ hadoop-auth ${hbase-compatible-hadoop.version} test + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + @@ -289,6 +307,14 @@ org.apache.hadoop hadoop-auth + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -299,6 +325,12 @@ hadoop-hdfs ${hbase-compatible-hadoop.version} test + + + log4j + log4j + +