This is an automated email from the ASF dual-hosted git repository. stevel pushed a commit to branch branch-3.3.3 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 877ef944f96eb986d0816f8a0491981f31858289 Author: Masatake Iwasaki <[email protected]> AuthorDate: Thu Apr 7 08:33:13 2022 +0900 HADOOP-18088. Replace log4j 1.x with reload4j. (#4052) Co-authored-by: Wei-Chiu Chuang <[email protected]> --- LICENSE-binary | 9 +- .../resources/assemblies/hadoop-dynamometer.xml | 2 +- .../resources/assemblies/hadoop-hdfs-nfs-dist.xml | 2 +- .../resources/assemblies/hadoop-httpfs-dist.xml | 2 +- .../main/resources/assemblies/hadoop-kms-dist.xml | 2 +- .../resources/assemblies/hadoop-mapreduce-dist.xml | 2 +- .../main/resources/assemblies/hadoop-nfs-dist.xml | 2 +- .../src/main/resources/assemblies/hadoop-tools.xml | 2 +- .../main/resources/assemblies/hadoop-yarn-dist.xml | 2 +- .../hadoop-client-check-invariants/pom.xml | 4 +- .../hadoop-client-check-test-invariants/pom.xml | 4 +- .../hadoop-client-integration-tests/pom.xml | 9 +- .../hadoop-client-minicluster/pom.xml | 10 +- .../hadoop-client-runtime/pom.xml | 8 +- hadoop-client-modules/hadoop-client/pom.xml | 14 +-- hadoop-common-project/hadoop-auth-examples/pom.xml | 6 +- hadoop-common-project/hadoop-auth/pom.xml | 12 ++- hadoop-common-project/hadoop-common/pom.xml | 6 +- .../java/org/apache/hadoop/util/GenericsUtil.java | 2 +- .../java/org/apache/hadoop/util/TestClassUtil.java | 2 +- hadoop-common-project/hadoop-kms/pom.xml | 6 +- hadoop-common-project/hadoop-minikdc/pom.xml | 2 +- hadoop-common-project/hadoop-nfs/pom.xml | 6 +- hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 4 +- hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 6 +- hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 6 +- hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 6 +- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 6 +- .../hadoop-mapreduce-client/pom.xml | 2 +- hadoop-mapreduce-project/pom.xml | 2 +- hadoop-project/pom.xml | 117 +++++++++++++++++++-- hadoop-tools/hadoop-azure/pom.xml | 4 +- .../pom.xml | 4 +- .../hadoop-yarn-services-core/pom.xml | 4 +- .../hadoop-yarn/hadoop-yarn-client/pom.xml | 4 +- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 4 +- .../hadoop-yarn-server-resourcemanager/pom.xml | 4 +- 37 files changed, 195 insertions(+), 94 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 7a712a5ac98..0e93a3aba9f 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -208,6 +208,7 @@ License Version 2.0: 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 @@ -273,7 +274,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:2.4.7 net.minidev:json-smart:2.4.7 @@ -436,9 +436,10 @@ org.codehaus.mojo:animal-sniffer-annotations:1.17 org.jruby.jcodings:jcodings:1.0.13 org.jruby.joni:joni:2.1.2 org.ojalgo:ojalgo:43.0 -org.slf4j:jul-to-slf4j:1.7.30 -org.slf4j:slf4j-api:1.7.30 -org.slf4j:slf4j-log4j12:1.7.30 +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 448035262e1..b2ce562231c 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 @@ <excludes> <!-- use slf4j from common to avoid multiple binding warnings --> <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.slf4j:slf4j-reload4j</exclude> </excludes> </dependencySet> </dependencySets> 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 0edfdeb7b0d..af5d89d7efe 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 @@ <exclude>org.apache.hadoop:hadoop-hdfs</exclude> <!-- use slf4j from common to avoid multiple binding warnings --> <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.slf4j:slf4j-reload4j</exclude> <exclude>org.hsqldb:hsqldb</exclude> </excludes> </dependencySet> 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 d698a3005d4..bec2f94b95e 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 @@ <exclude>org.apache.hadoop:hadoop-hdfs</exclude> <!-- use slf4j from common to avoid multiple binding warnings --> <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.slf4j:slf4j-reload4j</exclude> <exclude>org.hsqldb:hsqldb</exclude> </excludes> </dependencySet> 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 ff6f99080ca..e5e6834b042 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 @@ <exclude>org.apache.hadoop:hadoop-hdfs</exclude> <!-- use slf4j from common to avoid multiple binding warnings --> <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.slf4j:slf4j-reload4j</exclude> <exclude>org.hsqldb:hsqldb</exclude> </excludes> </dependencySet> 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 06a55d6d06a..28d5ebe9f60 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 @@ <exclude>org.apache.hadoop:hadoop-hdfs</exclude> <!-- use slf4j from common to avoid multiple binding warnings --> <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.slf4j:slf4j-reload4j</exclude> <exclude>org.hsqldb:hsqldb</exclude> <exclude>jdiff:jdiff:jar</exclude> </excludes> 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 cb3d9cdf249..59000c07113 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 @@ <exclude>org.apache.hadoop:hadoop-hdfs</exclude> <!-- use slf4j from common to avoid multiple binding warnings --> <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.slf4j:slf4j-reload4j</exclude> <exclude>org.hsqldb:hsqldb</exclude> </excludes> </dependencySet> diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml index 054d8c0ace2..1b9140f419b 100644 --- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml +++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml @@ -214,7 +214,7 @@ <exclude>org.apache.hadoop:hadoop-pipes</exclude> <!-- use slf4j from common to avoid multiple binding warnings --> <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.slf4j:slf4j-reload4j</exclude> </excludes> </dependencySet> </dependencySets> 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 4da4ac5acb9..cd86ce4e417 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 @@ <exclude>org.apache.hadoop:*</exclude> <!-- use slf4j from common to avoid multiple binding warnings --> <exclude>org.slf4j:slf4j-api</exclude> - <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>org.slf4j:slf4j-reload4j</exclude> <exclude>org.hsqldb:hsqldb</exclude> </excludes> </dependencySet> diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml index 9d1deb63642..c58353c3ddd 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 @@ <exclude>org.slf4j:slf4j-api</exclude> <!-- Leave commons-logging unshaded so downstream users can configure logging. --> <exclude>commons-logging:commons-logging</exclude> - <!-- Leave log4j unshaded so downstream users can configure logging. --> - <exclude>log4j:log4j</exclude> + <!-- Leave reload4j unshaded so downstream users can configure logging. --> + <exclude>ch.qos.reload4j:reload4j</exclude> <!-- Leave javax annotations we need exposed --> <exclude>com.google.code.findbugs:jsr305</exclude> <!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider --> 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 b96210dde7d..c7d7a8ee749 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 @@ <exclude>org.slf4j:slf4j-api</exclude> <!-- Leave commons-logging unshaded so downstream users can configure logging. --> <exclude>commons-logging:commons-logging</exclude> - <!-- Leave log4j unshaded so downstream users can configure logging. --> - <exclude>log4j:log4j</exclude> + <!-- Leave reload4j unshaded so downstream users can configure logging. --> + <exclude>ch.qos.reload4j:reload4j</exclude> <!-- Leave JUnit unshaded so downstream can use our test helper classes --> <exclude>junit:junit</exclude> <!-- JUnit brings in hamcrest --> diff --git a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml index 51210210204..d74c9c19ceb 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 @@ <dependencies> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>test</scope> </dependency> <dependency> @@ -42,11 +42,6 @@ <artifactId>slf4j-api</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index d5ca75cbb4f..aa64544e7d1 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -193,8 +193,12 @@ <artifactId>slf4j-log4j12</artifactId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <exclusion> <groupId>com.fasterxml.jackson.core</groupId> @@ -682,7 +686,7 @@ <exclude>commons-logging:commons-logging</exclude> <exclude>junit:junit</exclude> <exclude>com.google.code.findbugs:jsr305</exclude> - <exclude>log4j:log4j</exclude> + <exclude>ch.qos.reload4j:reload4j</exclude> <exclude>org.eclipse.jetty.websocket:websocket-common</exclude> <exclude>org.eclipse.jetty.websocket:websocket-api</exclude> <!-- We need a filter that matches just those things that are included in the above artiacts --> diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index cf9b95286eb..d4f636de712 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 --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>runtime</scope> <optional>true</optional> </dependency> @@ -150,8 +150,8 @@ <exclude>org.slf4j:slf4j-api</exclude> <!-- Leave commons-logging unshaded so downstream users can configure logging. --> <exclude>commons-logging:commons-logging</exclude> - <!-- Leave log4j unshaded so downstream users can configure logging. --> - <exclude>log4j:log4j</exclude> + <!-- Leave reload4j unshaded so downstream users can configure logging. --> + <exclude>ch.qos.reload4j:reload4j</exclude> <!-- Leave javax APIs that are stable --> <!-- the jdk ships part of the javax.annotation namespace, so if we want to relocate this we'll have to care it out by class :( --> <exclude>com.google.code.findbugs:jsr305</exclude> diff --git a/hadoop-client-modules/hadoop-client/pom.xml b/hadoop-client-modules/hadoop-client/pom.xml index 9670a8a39a6..17411217240 100644 --- a/hadoop-client-modules/hadoop-client/pom.xml +++ b/hadoop-client-modules/hadoop-client/pom.xml @@ -206,8 +206,8 @@ <artifactId>commons-cli</artifactId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> <exclusion> <groupId>com.sun.jersey</groupId> @@ -282,11 +282,6 @@ <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> - <!-- No slf4j backends for downstream clients --> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> </exclusions> </dependency> @@ -315,11 +310,6 @@ <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> - <!-- No slf4j backends for downstream clients --> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> </exclusions> </dependency> diff --git a/hadoop-common-project/hadoop-auth-examples/pom.xml b/hadoop-common-project/hadoop-auth-examples/pom.xml index 27580e50c8a..ce5130d49a0 100644 --- a/hadoop-common-project/hadoop-auth-examples/pom.xml +++ b/hadoop-common-project/hadoop-auth-examples/pom.xml @@ -47,13 +47,13 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>runtime</scope> </dependency> </dependencies> diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml index 923be91e903..c2812869638 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -82,13 +82,13 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>runtime</scope> </dependency> <dependency> @@ -176,6 +176,12 @@ <artifactId>apacheds-server-integ</artifactId> <version>${apacheds.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.directory.server</groupId> diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 086a77f26d9..791429c8fff 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -159,8 +159,8 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>compile</scope> </dependency> <dependency> @@ -205,7 +205,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>compile</scope> </dependency> <dependency> 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 0aba34845a6..334e370214e 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 class GenericsUtil { } 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 98e182236c9..04337929abd 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 class TestClassUtil { 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 71be87347a9..986cfe4a00d 100644 --- a/hadoop-common-project/hadoop-kms/pom.xml +++ b/hadoop-common-project/hadoop-kms/pom.xml @@ -134,8 +134,8 @@ <type>test-jar</type> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>compile</scope> </dependency> <dependency> @@ -145,7 +145,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>runtime</scope> </dependency> <dependency> diff --git a/hadoop-common-project/hadoop-minikdc/pom.xml b/hadoop-common-project/hadoop-minikdc/pom.xml index 746d72c429c..441ac244f39 100644 --- a/hadoop-common-project/hadoop-minikdc/pom.xml +++ b/hadoop-common-project/hadoop-minikdc/pom.xml @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>compile</scope> </dependency> <dependency> diff --git a/hadoop-common-project/hadoop-nfs/pom.xml b/hadoop-common-project/hadoop-nfs/pom.xml index baddec82727..06af6768118 100644 --- a/hadoop-common-project/hadoop-nfs/pom.xml +++ b/hadoop-common-project/hadoop-nfs/pom.xml @@ -79,13 +79,13 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>runtime</scope> </dependency> <dependency> diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index f85db539eba..e468a2e1547 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";> <artifactId>commons-logging</artifactId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml index e571d744e54..6470e3aa757 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml @@ -179,8 +179,8 @@ <type>test-jar</type> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>compile</scope> </dependency> <dependency> @@ -190,7 +190,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>runtime</scope> </dependency> <!-- 'mvn dependency:analyze' fails to detect use of this dependency --> diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml index 0d8ef6c4c0d..442a3601295 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";> <scope>compile</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>compile</scope> </dependency> <dependency> @@ -160,7 +160,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml index b37a1de11e1..02d5bfae3b6 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";> <artifactId>commons-logging</artifactId> </exclusion> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </exclusion> </exclusions> </dependency> @@ -71,7 +71,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index df5d2cce9a6..8aa86dd3b0e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -118,8 +118,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";> <scope>compile</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>compile</scope> </dependency> <dependency> @@ -162,7 +162,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index df6f081a8da..f862ecd6831 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -86,7 +86,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml index cba6031809b..b0951176442 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml @@ -88,7 +88,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 66dd3fe6ac6..93ec9dcd84d 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -81,8 +81,8 @@ <httpcore.version>4.4.13</httpcore.version> <!-- SLF4J/LOG4J version --> - <slf4j.version>1.7.30</slf4j.version> - <log4j.version>1.2.17</log4j.version> + <slf4j.version>1.7.36</slf4j.version> + <reload4j.version>1.2.18.3</reload4j.version> <!-- com.google.re2j version --> <re2j.version>1.1</re2j.version> @@ -298,12 +298,28 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -374,12 +390,24 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -953,9 +981,9 @@ <version>${commons-logging-api.version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> + <version>${reload4j.version}</version> <exclusions> <exclusion> <groupId>com.sun.jdmk</groupId> @@ -1099,7 +1127,7 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <artifactId>slf4j-reload4j</artifactId> <version>${slf4j.version}</version> </dependency> <dependency> @@ -1305,6 +1333,10 @@ <groupId>org.apache.kerby</groupId> <artifactId>kerby-config</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -1313,6 +1345,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-reload4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1341,6 +1377,14 @@ <groupId>io.netty</groupId> <artifactId>netty-transport-native-epoll</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1480,6 +1524,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1594,6 +1642,10 @@ <artifactId>jdk.tools</artifactId> <groupId>jdk.tools</groupId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -1602,6 +1654,16 @@ <version>${hbase.version}</version> <scope>test</scope> <classifier>tests</classifier> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> @@ -1619,6 +1681,28 @@ <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> @@ -1626,6 +1710,16 @@ <version>${hbase.version}</version> <scope>test</scope> <classifier>tests</classifier> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> @@ -1650,6 +1744,14 @@ <artifactId>jdk.tools</artifactId> <groupId>jdk.tools</groupId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -2160,6 +2262,9 @@ <exclude>com.sun.jersey.jersey-test-framework:*</exclude> <exclude>com.google.inject:guice</exclude> <exclude>org.ow2.asm:asm</exclude> + + <exclude>org.slf4j:slf4j-log4j12</exclude> + <exclude>log4j:log4j</exclude> </excludes> <includes> <!-- for JDK 8 support --> diff --git a/hadoop-tools/hadoop-azure/pom.xml b/hadoop-tools/hadoop-azure/pom.xml index c8c5cc37742..6eb7f98c4d6 100644 --- a/hadoop-tools/hadoop-azure/pom.xml +++ b/hadoop-tools/hadoop-azure/pom.xml @@ -245,8 +245,8 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>test</scope> </dependency> 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 387d4a97417..cb2a32d70bf 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 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop.thirdparty</groupId> 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 02b6b7124dc..fb8cc764f98 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 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> <scope>runtime</scope> </dependency> 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 368a0251aed..6977afde460 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -47,8 +47,8 @@ <artifactId>commons-cli</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> 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 63ed238ed27..77c493d3ca6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -164,8 +164,8 @@ <artifactId>jersey-guice</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> 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 68574b45703..40e5b7a0f04 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 @@ -160,8 +160,8 @@ <artifactId>hadoop-shaded-guava</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>ch.qos.reload4j</groupId> + <artifactId>reload4j</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
