From e383986d6c943c74cb5440047734eecd984a70db Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 11 Apr 2025 12:17:10 +0200 Subject: [PATCH 1/2] HDDS-12806. Depend on commons-logging-api instead of commons-logging --- hadoop-hdds/framework/pom.xml | 4 -- hadoop-hdds/hadoop-dependency-client/pom.xml | 4 ++ hadoop-hdds/hadoop-dependency-server/pom.xml | 8 +++ hadoop-hdds/test-utils/pom.xml | 5 -- .../dist/src/main/license/bin/LICENSE.txt | 2 +- .../dist/src/main/license/jar-report.txt | 2 +- hadoop-ozone/ozone-manager/pom.xml | 5 ++ hadoop-ozone/ozonefs-hadoop2/pom.xml | 5 ++ pom.xml | 60 ++++++++++++------- 9 files changed, 64 insertions(+), 31 deletions(-) diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml index 0d0fccdaad82..c26e63c8f754 100644 --- a/hadoop-hdds/framework/pom.xml +++ b/hadoop-hdds/framework/pom.xml @@ -74,10 +74,6 @@ commons-io commons-io - - commons-logging - commons-logging - commons-validator commons-validator diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index b06954fe8a70..ee41b81897d4 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -35,6 +35,10 @@ com.nimbusds nimbus-jose-jwt + + commons-logging + commons-logging-api + org.apache.hadoop hadoop-annotations diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index 2cf03bc643a0..aa74387085de 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -40,6 +40,10 @@ commons-cli commons-cli + + commons-logging + commons-logging-api + org.apache.hadoop hadoop-annotations @@ -52,6 +56,10 @@ ch.qos.reload4j reload4j + + commons-logging + commons-logging + log4j log4j diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml index 24348924d1d7..10899b0558a1 100644 --- a/hadoop-hdds/test-utils/pom.xml +++ b/hadoop-hdds/test-utils/pom.xml @@ -72,11 +72,6 @@ commons-io test - - commons-logging - commons-logging - test - jakarta.annotation jakarta.annotation-api diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 90553612188f..4601edb19ae2 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -313,7 +313,7 @@ Apache License 2.0 commons-httpclient:commons-httpclient commons-io:commons-io commons-lang:commons-lang - commons-logging:commons-logging + commons-logging:commons-logging-api commons-net:commons-net commons-validator:commons-validator commons-fileupload:commons-fileupload diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index 6df609bc2099..37ab89b03453 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -32,7 +32,7 @@ share/ozone/lib/commons-digester.jar share/ozone/lib/commons-io.jar share/ozone/lib/commons-lang3.jar share/ozone/lib/commons-lang.jar -share/ozone/lib/commons-logging.jar +share/ozone/lib/commons-logging-api.jar share/ozone/lib/commons-net.jar share/ozone/lib/commons-text.jar share/ozone/lib/commons-validator.jar diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 31e4cddd02dd..72af3558bcc4 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -207,6 +207,11 @@ com.sun.jersey jersey-bundle + + + commons-logging + commons-logging + net.minidev json-smart diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml index cc29cea5eefb..ad1b21c58c01 100644 --- a/hadoop-ozone/ozonefs-hadoop2/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml @@ -79,6 +79,11 @@ com.sun.jersey * + + + commons-logging + commons-logging + org.apache.hadoop hadoop-annotations diff --git a/pom.xml b/pom.xml index 3a1e7b649b5e..4ba70dae640e 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,6 @@ 2.18.0 3.17.0 1.1 - 1.2 3.6.1 3.11.1 1.12.0 @@ -309,6 +308,13 @@ com.amazonaws aws-java-sdk-core ${aws-java-sdk.version} + + + + commons-logging + commons-logging + + com.amazonaws @@ -451,6 +457,13 @@ commons-beanutils commons-beanutils ${commons-beanutils.version} + + + + commons-logging + commons-logging + + commons-cli @@ -482,25 +495,6 @@ commons-io ${commons-io.version} - - commons-logging - commons-logging - ${commons-logging.version} - - - avalon-framework - avalon-framework - - - javax.servlet - javax.servlet-api - - - logkit - logkit - - - commons-logging commons-logging-api @@ -515,6 +509,13 @@ commons-validator commons-validator ${commons-validator.version} + + + + commons-logging + commons-logging + + dnsjava @@ -680,6 +681,11 @@ commons-configuration2 ${commons-configuration2.version} + + + commons-logging + commons-logging + org.apache.commons commons-lang3 @@ -757,6 +763,13 @@ hadoop-common ${hadoop.version} test-jar + + + + commons-logging + commons-logging + + org.apache.hadoop @@ -825,6 +838,13 @@ org.apache.httpcomponents httpclient ${httpclient.version} + + + + commons-logging + commons-logging + + org.apache.httpcomponents From ece4d892ad9b2bb94533d0361a9040479e07b015 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Fri, 11 Apr 2025 12:35:07 +0200 Subject: [PATCH 2/2] replace commons-logging-api with jcl-over-slf4j --- hadoop-hdds/common/pom.xml | 4 ++++ hadoop-hdds/hadoop-dependency-client/pom.xml | 4 ---- hadoop-hdds/hadoop-dependency-server/pom.xml | 4 ---- .../dist/src/main/license/bin/LICENSE.txt | 2 +- .../dist/src/main/license/bin/NOTICE.txt | 8 ------- .../dist/src/main/license/jar-report.txt | 2 +- hadoop-ozone/ozone-manager/pom.xml | 2 +- hadoop-ozone/ozonefs-hadoop2/pom.xml | 2 +- pom.xml | 23 +++++++++---------- 9 files changed, 19 insertions(+), 32 deletions(-) diff --git a/hadoop-hdds/common/pom.xml b/hadoop-hdds/common/pom.xml index ba2726afeef8..9cb91412bf15 100644 --- a/hadoop-hdds/common/pom.xml +++ b/hadoop-hdds/common/pom.xml @@ -199,6 +199,10 @@ org.reflections reflections + + org.slf4j + jcl-over-slf4j + org.slf4j slf4j-api diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml index ee41b81897d4..b06954fe8a70 100644 --- a/hadoop-hdds/hadoop-dependency-client/pom.xml +++ b/hadoop-hdds/hadoop-dependency-client/pom.xml @@ -35,10 +35,6 @@ com.nimbusds nimbus-jose-jwt - - commons-logging - commons-logging-api - org.apache.hadoop hadoop-annotations diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml index aa74387085de..972241d2d7c3 100644 --- a/hadoop-hdds/hadoop-dependency-server/pom.xml +++ b/hadoop-hdds/hadoop-dependency-server/pom.xml @@ -40,10 +40,6 @@ commons-cli commons-cli - - commons-logging - commons-logging-api - org.apache.hadoop hadoop-annotations diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 4601edb19ae2..63010a1b61bc 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -313,7 +313,6 @@ Apache License 2.0 commons-httpclient:commons-httpclient commons-io:commons-io commons-lang:commons-lang - commons-logging:commons-logging-api commons-net:commons-net commons-validator:commons-validator commons-fileupload:commons-fileupload @@ -464,6 +463,7 @@ MIT org.checkerframework:checker-qual org.codehaus.mojo:animal-sniffer-annotations org.kohsuke.metainf-services:metainf-services + org.slf4j:jcl-over-slf4j org.slf4j:slf4j-api org.slf4j:slf4j-reload4j diff --git a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt index 976926f9e2ad..1e498469caa4 100644 --- a/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/NOTICE.txt @@ -214,14 +214,6 @@ benchmarking framework, which can be obtained at: * HOMEPAGE: * https://github.com/google/caliper -This product optionally depends on 'Apache Commons Logging', a logging -framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index 37ab89b03453..12019399d9b2 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -32,7 +32,6 @@ share/ozone/lib/commons-digester.jar share/ozone/lib/commons-io.jar share/ozone/lib/commons-lang3.jar share/ozone/lib/commons-lang.jar -share/ozone/lib/commons-logging-api.jar share/ozone/lib/commons-net.jar share/ozone/lib/commons-text.jar share/ozone/lib/commons-validator.jar @@ -123,6 +122,7 @@ share/ozone/lib/javax.interceptor-api.jar share/ozone/lib/javax.servlet-api.jar share/ozone/lib/jaxb-runtime.jar share/ozone/lib/jcip-annotations.jar +share/ozone/lib/jcl-over-slf4j.jar share/ozone/lib/jersey-cdi1x.jar share/ozone/lib/jersey-client.jar share/ozone/lib/jersey-client.jar diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml index 72af3558bcc4..2572bab71aee 100644 --- a/hadoop-ozone/ozone-manager/pom.xml +++ b/hadoop-ozone/ozone-manager/pom.xml @@ -208,7 +208,7 @@ jersey-bundle - + commons-logging commons-logging diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml index ad1b21c58c01..f7aba1ab4388 100644 --- a/hadoop-ozone/ozonefs-hadoop2/pom.xml +++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml @@ -80,7 +80,7 @@ * - + commons-logging commons-logging diff --git a/pom.xml b/pom.xml index 4ba70dae640e..675b2733d34c 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,6 @@ 1.5 2.18.0 3.17.0 - 1.1 3.6.1 3.11.1 1.12.0 @@ -310,7 +309,7 @@ ${aws-java-sdk.version} - + commons-logging commons-logging @@ -459,7 +458,7 @@ ${commons-beanutils.version} - + commons-logging commons-logging @@ -495,11 +494,6 @@ commons-io ${commons-io.version} - - commons-logging - commons-logging-api - ${commons-logging-api.version} - commons-net commons-net @@ -511,7 +505,7 @@ ${commons-validator.version} - + commons-logging commons-logging @@ -682,7 +676,7 @@ ${commons-configuration2.version} - + commons-logging commons-logging @@ -765,7 +759,7 @@ test-jar - + commons-logging commons-logging @@ -840,7 +834,7 @@ ${httpclient.version} - + commons-logging commons-logging @@ -1232,6 +1226,11 @@ rocksdbjni ${rocksdb.version} + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + org.slf4j jul-to-slf4j