From 5d81b22323db08c47aec5e25e7f0e6f3629dc75a Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Mon, 7 Mar 2022 16:28:32 +0000 Subject: [PATCH 1/5] HADOOP-18088. Replace log4j 1.x with reload4j. Co-authored-by: Masatake Iwasaki --- LICENSE-binary | 9 +++-- .../hadoop-client-check-invariants/pom.xml | 2 +- .../pom.xml | 2 +- .../hadoop-client-integration-tests/pom.xml | 9 +---- .../hadoop-client-minicluster/pom.xml | 10 +++-- .../hadoop-client-runtime/pom.xml | 6 +-- hadoop-client-modules/hadoop-client/pom.xml | 24 +++++++++-- .../hadoop-auth-examples/pom.xml | 6 +-- hadoop-common-project/hadoop-auth/pom.xml | 18 +++++++-- hadoop-common-project/hadoop-common/pom.xml | 24 +++++++++-- .../org/apache/hadoop/util/GenericsUtil.java | 2 +- .../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-common-project/hadoop-registry/pom.xml | 10 +++++ .../hadoop-hdfs-client/pom.xml | 4 +- .../hadoop-hdfs-httpfs/pom.xml | 6 +-- hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 16 ++++++-- hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 6 +-- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 16 ++++++-- .../hadoop-mapreduce-client/pom.xml | 2 +- hadoop-mapreduce-project/pom.xml | 2 +- hadoop-project/pom.xml | 27 ++++++++++--- hadoop-tools/hadoop-azure/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 8 ++++ .../hadoop-yarn-services-core/pom.xml | 4 +- .../hadoop-yarn/hadoop-yarn-client/pom.xml | 14 ++++++- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 4 +- .../hadoop-yarn-server-common/pom.xml | 10 +++++ .../pom.xml | 24 ++++++++++- .../pom.xml | 40 +++++++++++++++++++ .../pom.xml | 8 ++++ .../pom.xml | 4 ++ .../pom.xml | 8 ++++ .../pom.xml | 12 ++++++ 37 files changed, 286 insertions(+), 75 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index e9b64aa3f5857..faeab9a50b20b 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-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml index 9d1deb6364215..04b207ac3db69 100644 --- a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml @@ -85,7 +85,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 b96210dde7df3..87f3a6d90d2dd 100644 --- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml @@ -89,7 +89,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 5121021020432..d74c9c19cebf0 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 d5ca75cbb4f8d..aa64544e7d179 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 @@ -682,7 +686,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 cf9b95286eb63..151af4315f6ce 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 @@ -151,7 +151,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 9670a8a39a6ec..a2eabee63ad42 100644 --- a/hadoop-client-modules/hadoop-client/pom.xml +++ b/hadoop-client-modules/hadoop-client/pom.xml @@ -98,6 +98,14 @@ org.slf4j slf4j-log4j12 + + org.slf4j + slf4j-reload4j + + + org.slf4j + slf4j-reload4j + @@ -206,8 +214,8 @@ commons-cli - log4j - log4j + ch.qos.reload4j + reload4j com.sun.jersey @@ -285,7 +293,11 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + org.slf4j + slf4j-reload4j @@ -318,7 +330,11 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j + + + org.slf4j + slf4j-reload4j diff --git a/hadoop-common-project/hadoop-auth-examples/pom.xml b/hadoop-common-project/hadoop-auth-examples/pom.xml index 27580e50c8a18..ce5130d49a0e5 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 923be91e903f2..f66801f0e3019 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 @@ -127,6 +127,12 @@ org.apache.zookeeper zookeeper + + + log4j + log4j + + org.apache.curator @@ -176,6 +182,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 086a77f26d92c..17a6b8ceab367 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -159,8 +159,8 @@ compile - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -205,7 +205,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j compile @@ -307,6 +307,14 @@ com.sun.jmx jmxri + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + @@ -314,6 +322,16 @@ zookeeper test-jar test + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + org.apache.commons 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 71be87347a978..986cfe4a00dab 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 746d72c429ca8..441ac244f3969 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 baddec82727c9..06af6768118ae 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-common-project/hadoop-registry/pom.xml b/hadoop-common-project/hadoop-registry/pom.xml index 5cfc2fe6735d8..d9b6818c432d5 100644 --- a/hadoop-common-project/hadoop-registry/pom.xml +++ b/hadoop-common-project/hadoop-registry/pom.xml @@ -73,6 +73,16 @@ org.apache.zookeeper zookeeper + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index f85db539eba97..e468a2e1547a3 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 e571d744e5418..6470e3aa7573c 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 0d8ef6c4c0dfe..ae97e2c8276e5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -82,6 +82,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> zookeeper test-jar test + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + org.apache.hadoop.thirdparty @@ -134,8 +144,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> compile - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -160,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 b37a1de11e150..02d5bfae3b643 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 @@ -71,7 +71,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 1523fc402120b..65114e1bc2a0e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -61,6 +61,16 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> zookeeper test-jar test + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + org.apache.hadoop.thirdparty @@ -118,8 +128,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> compile - log4j - log4j + ch.qos.reload4j + reload4j compile @@ -162,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 df6f081a8da50..f862ecd683122 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -86,7 +86,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 cba6031809b2e..b09511764426c 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 c8411a5f58775..85149ff00eefc 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -81,8 +81,8 @@ 4.4.13 - 1.7.30 - 1.2.17 + 1.7.35 + 1.2.18.3 1.1 @@ -960,9 +960,9 @@ ${commons-logging-api.version} - log4j - log4j - ${log4j.version} + ch.qos.reload4j + reload4j + ${reload4j.version} com.sun.jdmk @@ -1106,7 +1106,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j ${slf4j.version} @@ -1312,6 +1312,10 @@ org.apache.kerby kerby-config + + log4j + log4j + org.slf4j slf4j-api @@ -1320,6 +1324,14 @@ org.slf4j slf4j-log4j12 + + org.slf4j + slf4j-reload4j + + + org.slf4j + slf4j-reload4j + @@ -2167,6 +2179,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 40a401bb7c0b4..cf7540c36a715 100644 --- a/hadoop-tools/hadoop-azure/pom.xml +++ b/hadoop-tools/hadoop-azure/pom.xml @@ -306,8 +306,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 387d4a974177b..cb2a32d70bfff 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-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml index 570727cfcafaf..4a876cb0c1ba7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml @@ -101,6 +101,14 @@ org.jboss.netty netty + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + 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 02b6b7124dc71..fb8cc764f9895 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 368a0251aedc4..135fb959461a7 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 @@ commons-cli - log4j - log4j + ch.qos.reload4j + reload4j org.eclipse.jetty.websocket @@ -88,6 +88,16 @@ zookeeper test-jar test + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + junit 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 661b54cd91d3e..ec32bbd6e2ec5 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 @@ 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-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml index 46d3d0840748c..e645fd61602b6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml @@ -108,6 +108,16 @@ org.apache.zookeeper zookeeper + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + ${leveldbjni.group} 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 68574b457036e..133f637984ac8 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 @@ hadoop-shaded-guava - log4j - log4j + ch.qos.reload4j + reload4j org.apache.hadoop @@ -202,6 +202,16 @@ org.apache.zookeeper zookeeper + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + ${leveldbjni.group} @@ -213,6 +223,16 @@ zookeeper test test-jar + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + 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 ea415601b9edf..5b398ccc2ec11 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 @@ -192,6 +192,14 @@ org.apache.hadoop hadoop-mapreduce-client-core + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -248,6 +256,14 @@ org.apache.hadoop hadoop-distcp + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -285,6 +301,14 @@ org.apache.hadoop hadoop-distcp + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -301,6 +325,14 @@ org.apache.hadoop hadoop-auth + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -362,6 +394,14 @@ org.apache.hadoop hadoop-mapreduce-client-core + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml index e34c4091cbe45..a252e61159e83 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml @@ -128,6 +128,10 @@ org.mortbay.jetty jetty-util + + log4j + log4j + @@ -187,6 +191,10 @@ org.eclipse.jetty jetty-http + + log4j + log4j + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml index 22a3cf17253e2..94a18044e9954 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml @@ -81,6 +81,10 @@ org.mortbay.jetty jetty-util + + log4j + log4j + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml index d4f8c1858764e..a3a1261ca4d24 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml @@ -89,6 +89,10 @@ org.mortbay.jetty jetty-util + + log4j + log4j + @@ -136,6 +140,10 @@ org.mortbay.jetty jetty-sslengine + + log4j + log4j + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml index 991ff40998d05..488f6634af335 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml @@ -89,6 +89,10 @@ org.mortbay.jetty jetty-util + + log4j + log4j + @@ -155,6 +159,14 @@ org.eclipse.jetty jetty-http + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + From 1fe6b400530821fad291f02ed91d4dc599eb0d80 Mon Sep 17 00:00:00 2001 From: Wei-Chiu Chuang Date: Wed, 9 Mar 2022 15:31:58 +0000 Subject: [PATCH 2/5] moved exclusions of transitive dependencies to dependencyManagement of hadoop-project POM. Co-authored-by: Masatake Iwasaki --- hadoop-client-modules/hadoop-client/pom.xml | 26 ----- hadoop-common-project/hadoop-auth/pom.xml | 6 -- hadoop-common-project/hadoop-common/pom.xml | 18 ---- hadoop-common-project/hadoop-registry/pom.xml | 10 -- hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 10 -- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 10 -- hadoop-project/pom.xml | 98 ++++++++++++++++++- .../pom.xml | 8 -- .../hadoop-yarn/hadoop-yarn-client/pom.xml | 10 -- .../hadoop-yarn-server-common/pom.xml | 10 -- .../pom.xml | 20 ---- .../pom.xml | 40 -------- .../pom.xml | 8 -- .../pom.xml | 4 - .../pom.xml | 8 -- .../pom.xml | 12 --- 16 files changed, 94 insertions(+), 204 deletions(-) diff --git a/hadoop-client-modules/hadoop-client/pom.xml b/hadoop-client-modules/hadoop-client/pom.xml index a2eabee63ad42..1741121724025 100644 --- a/hadoop-client-modules/hadoop-client/pom.xml +++ b/hadoop-client-modules/hadoop-client/pom.xml @@ -98,14 +98,6 @@ org.slf4j slf4j-log4j12 - - org.slf4j - slf4j-reload4j - - - org.slf4j - slf4j-reload4j - @@ -290,15 +282,6 @@ io.netty netty - - - org.slf4j - slf4j-reload4j - - - org.slf4j - slf4j-reload4j - @@ -327,15 +310,6 @@ io.netty netty - - - org.slf4j - slf4j-reload4j - - - org.slf4j - slf4j-reload4j - diff --git a/hadoop-common-project/hadoop-auth/pom.xml b/hadoop-common-project/hadoop-auth/pom.xml index f66801f0e3019..c28128696381c 100644 --- a/hadoop-common-project/hadoop-auth/pom.xml +++ b/hadoop-common-project/hadoop-auth/pom.xml @@ -127,12 +127,6 @@ org.apache.zookeeper zookeeper - - - log4j - log4j - - org.apache.curator diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 17a6b8ceab367..791429c8fff7d 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -307,14 +307,6 @@ com.sun.jmx jmxri - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - @@ -322,16 +314,6 @@ zookeeper test-jar test - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - org.apache.commons diff --git a/hadoop-common-project/hadoop-registry/pom.xml b/hadoop-common-project/hadoop-registry/pom.xml index d9b6818c432d5..5cfc2fe6735d8 100644 --- a/hadoop-common-project/hadoop-registry/pom.xml +++ b/hadoop-common-project/hadoop-registry/pom.xml @@ -73,16 +73,6 @@ org.apache.zookeeper zookeeper - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml index ae97e2c8276e5..442a3601295f8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -82,16 +82,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> zookeeper test-jar test - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - org.apache.hadoop.thirdparty diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 65114e1bc2a0e..ad0041defd60a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -61,16 +61,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> zookeeper test-jar test - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - org.apache.hadoop.thirdparty diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 85149ff00eefc..5bca26d6ba808 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -298,12 +298,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 @@ -374,6 +390,12 @@ org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} + + + org.slf4j + slf4j-reload4j + + @@ -387,6 +409,12 @@ org.apache.hadoop hadoop-mapreduce-client-jobclient ${hadoop.version} + + + org.slf4j + slf4j-reload4j + + @@ -1328,10 +1356,6 @@ org.slf4j slf4j-reload4j - - org.slf4j - slf4j-reload4j - @@ -1360,6 +1384,14 @@ io.netty netty-transport-native-epoll + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + @@ -1499,6 +1531,10 @@ org.slf4j slf4j-api + + log4j + log4j + @@ -1613,6 +1649,10 @@ jdk.tools jdk.tools + + log4j + log4j + @@ -1621,6 +1661,16 @@ ${hbase.version} test tests + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + org.apache.hbase @@ -1638,6 +1688,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 @@ -1645,6 +1717,16 @@ ${hbase.version} test tests + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + org.apache.hbase @@ -1669,6 +1751,14 @@ jdk.tools jdk.tools + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml index 4a876cb0c1ba7..570727cfcafaf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml @@ -101,14 +101,6 @@ org.jboss.netty netty - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - 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 135fb959461a7..6977afde460db 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -88,16 +88,6 @@ zookeeper test-jar test - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - junit diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml index e645fd61602b6..46d3d0840748c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml @@ -108,16 +108,6 @@ org.apache.zookeeper zookeeper - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - ${leveldbjni.group} 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 133f637984ac8..40e5b7a0f04a0 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 @@ -202,16 +202,6 @@ org.apache.zookeeper zookeeper - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - ${leveldbjni.group} @@ -223,16 +213,6 @@ zookeeper test test-jar - - - org.slf4j - slf4j-log4j12 - - - log4j - log4j - - 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 5b398ccc2ec11..ea415601b9edf 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 @@ -192,14 +192,6 @@ org.apache.hadoop hadoop-mapreduce-client-core - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - @@ -256,14 +248,6 @@ org.apache.hadoop hadoop-distcp - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - @@ -301,14 +285,6 @@ org.apache.hadoop hadoop-distcp - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - @@ -325,14 +301,6 @@ org.apache.hadoop hadoop-auth - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - @@ -394,14 +362,6 @@ org.apache.hadoop hadoop-mapreduce-client-core - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml index a252e61159e83..e34c4091cbe45 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml @@ -128,10 +128,6 @@ org.mortbay.jetty jetty-util - - log4j - log4j - @@ -191,10 +187,6 @@ org.eclipse.jetty jetty-http - - log4j - log4j - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml index 94a18044e9954..22a3cf17253e2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-common/pom.xml @@ -81,10 +81,6 @@ org.mortbay.jetty jetty-util - - log4j - log4j - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml index a3a1261ca4d24..d4f8c1858764e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml @@ -89,10 +89,6 @@ org.mortbay.jetty jetty-util - - log4j - log4j - @@ -140,10 +136,6 @@ org.mortbay.jetty jetty-sslengine - - log4j - log4j - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml index 488f6634af335..991ff40998d05 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml @@ -89,10 +89,6 @@ org.mortbay.jetty jetty-util - - log4j - log4j - @@ -159,14 +155,6 @@ org.eclipse.jetty jetty-http - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - From a375ff4d0260ec524d32ba63cfb25c9cc09838fa Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Mon, 4 Apr 2022 10:54:59 +0000 Subject: [PATCH 3/5] updated comments referring to log4j. --- hadoop-client-modules/hadoop-client-check-invariants/pom.xml | 2 +- hadoop-client-modules/hadoop-client-runtime/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml index 04b207ac3db69..c58353c3ddd70 100644 --- a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml @@ -84,7 +84,7 @@ org.slf4j:slf4j-api commons-logging:commons-logging - + ch.qos.reload4j:reload4j com.google.code.findbugs:jsr305 diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index 151af4315f6ce..d4f636de712df 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -150,7 +150,7 @@ org.slf4j:slf4j-api commons-logging:commons-logging - + ch.qos.reload4j:reload4j From 9d465f9b2307ccffba7cb6c614027526571fb4d6 Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Mon, 4 Apr 2022 17:00:15 +0000 Subject: [PATCH 4/5] We need to updpate assembly definitions too. --- .../src/main/resources/assemblies/hadoop-dynamometer.xml | 2 +- .../src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml | 2 +- .../src/main/resources/assemblies/hadoop-httpfs-dist.xml | 2 +- .../src/main/resources/assemblies/hadoop-kms-dist.xml | 2 +- .../src/main/resources/assemblies/hadoop-mapreduce-dist.xml | 2 +- .../src/main/resources/assemblies/hadoop-nfs-dist.xml | 2 +- .../src/main/resources/assemblies/hadoop-tools.xml | 2 +- .../src/main/resources/assemblies/hadoop-yarn-dist.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 054d8c0ace2bd..1b9140f419b4b 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 @@ 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 From 2a64c7ef9691a8b14bba2635800804e25431d127 Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Tue, 5 Apr 2022 01:17:54 +0000 Subject: [PATCH 5/5] addressed review comments about comment in the popm and slf4j version. --- .../hadoop-client-check-test-invariants/pom.xml | 2 +- hadoop-project/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 87f3a6d90d2dd..c7d7a8ee7496e 100644 --- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml +++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml @@ -88,7 +88,7 @@ org.slf4j:slf4j-api commons-logging:commons-logging - + ch.qos.reload4j:reload4j junit:junit diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 5bca26d6ba808..75df4c5888525 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -81,7 +81,7 @@ 4.4.13 - 1.7.35 + 1.7.36 1.2.18.3