Skip to content

Commit 978dd71

Browse files
adoroszlaiadoroszlai
authored
HDDS-12806. Replace commons-logging with jcl-over-slf4j (apache#8265)
1 parent ef8e0da commit 978dd71

File tree

10 files changed

+65
-45
lines changed

10 files changed

+65
-45
lines changed

‎hadoop-hdds/common/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,10 @@
199199
<groupId>org.reflections</groupId>
200200
<artifactId>reflections</artifactId>
201201
</dependency>
202+
<dependency>
203+
<groupId>org.slf4j</groupId>
204+
<artifactId>jcl-over-slf4j</artifactId>
205+
</dependency>
202206
<dependency>
203207
<groupId>org.slf4j</groupId>
204208
<artifactId>slf4j-api</artifactId>

‎hadoop-hdds/framework/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@
7474
<groupId>commons-io</groupId>
7575
<artifactId>commons-io</artifactId>
7676
</dependency>
77-
<dependency>
78-
<groupId>commons-logging</groupId>
79-
<artifactId>commons-logging</artifactId>
80-
</dependency>
8177
<dependency>
8278
<groupId>commons-validator</groupId>
8379
<artifactId>commons-validator</artifactId>

‎hadoop-hdds/hadoop-dependency-server/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
<groupId>ch.qos.reload4j</groupId>
5353
<artifactId>reload4j</artifactId>
5454
</exclusion>
55+
<exclusion>
56+
<groupId>commons-logging</groupId>
57+
<artifactId>commons-logging</artifactId>
58+
</exclusion>
5559
<exclusion>
5660
<groupId>log4j</groupId>
5761
<artifactId>log4j</artifactId>

‎hadoop-hdds/test-utils/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@
7272
<artifactId>commons-io</artifactId>
7373
<scope>test</scope>
7474
</dependency>
75-
<dependency>
76-
<groupId>commons-logging</groupId>
77-
<artifactId>commons-logging</artifactId>
78-
<scope>test</scope>
79-
</dependency>
8075
<dependency>
8176
<groupId>jakarta.annotation</groupId>
8277
<artifactId>jakarta.annotation-api</artifactId>

‎hadoop-ozone/dist/src/main/license/bin/LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ Apache License 2.0
313313
commons-httpclient:commons-httpclient
314314
commons-io:commons-io
315315
commons-lang:commons-lang
316-
commons-logging:commons-logging
317316
commons-net:commons-net
318317
commons-validator:commons-validator
319318
commons-fileupload:commons-fileupload
@@ -464,6 +463,7 @@ MIT
464463
org.checkerframework:checker-qual
465464
org.codehaus.mojo:animal-sniffer-annotations
466465
org.kohsuke.metainf-services:metainf-services
466+
org.slf4j:jcl-over-slf4j
467467
org.slf4j:slf4j-api
468468
org.slf4j:slf4j-reload4j
469469

‎hadoop-ozone/dist/src/main/license/bin/NOTICE.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,6 @@ benchmarking framework, which can be obtained at:
214214
* HOMEPAGE:
215215
* https://github.com/google/caliper
216216

217-
This product optionally depends on 'Apache Commons Logging', a logging
218-
framework, which can be obtained at:
219-
220-
* LICENSE:
221-
* license/LICENSE.commons-logging.txt (Apache License 2.0)
222-
* HOMEPAGE:
223-
* http://commons.apache.org/logging/
224-
225217
This product optionally depends on 'Apache Log4J', a logging framework, which
226218
can be obtained at:
227219

‎hadoop-ozone/dist/src/main/license/jar-report.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ share/ozone/lib/commons-digester.jar
3232
share/ozone/lib/commons-io.jar
3333
share/ozone/lib/commons-lang3.jar
3434
share/ozone/lib/commons-lang.jar
35-
share/ozone/lib/commons-logging.jar
3635
share/ozone/lib/commons-net.jar
3736
share/ozone/lib/commons-text.jar
3837
share/ozone/lib/commons-validator.jar
@@ -123,6 +122,7 @@ share/ozone/lib/javax.interceptor-api.jar
123122
share/ozone/lib/javax.servlet-api.jar
124123
share/ozone/lib/jaxb-runtime.jar
125124
share/ozone/lib/jcip-annotations.jar
125+
share/ozone/lib/jcl-over-slf4j.jar
126126
share/ozone/lib/jersey-cdi1x.jar
127127
share/ozone/lib/jersey-client.jar
128128
share/ozone/lib/jersey-client.jar

‎hadoop-ozone/ozone-manager/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,11 @@
207207
<groupId>com.sun.jersey</groupId>
208208
<artifactId>jersey-bundle</artifactId>
209209
</exclusion>
210+
<exclusion>
211+
<!-- depend on jcl-over-slf4j instead -->
212+
<groupId>commons-logging</groupId>
213+
<artifactId>commons-logging</artifactId>
214+
</exclusion>
210215
<exclusion>
211216
<groupId>net.minidev</groupId>
212217
<artifactId>json-smart</artifactId>

‎hadoop-ozone/ozonefs-hadoop2/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@
7979
<groupId>com.sun.jersey</groupId>
8080
<artifactId>*</artifactId>
8181
</exclusion>
82+
<exclusion>
83+
<!-- depend on jcl-over-slf4j instead -->
84+
<groupId>commons-logging</groupId>
85+
<artifactId>commons-logging</artifactId>
86+
</exclusion>
8287
<exclusion>
8388
<groupId>org.apache.hadoop</groupId>
8489
<artifactId>hadoop-annotations</artifactId>

‎pom.xml

Lines changed: 45 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
<commons-fileupload.version>1.5</commons-fileupload.version>
5656
<commons-io.version>2.18.0</commons-io.version>
5757
<commons-lang3.version>3.17.0</commons-lang3.version>
58-
<commons-logging-api.version>1.1</commons-logging-api.version>
59-
<commons-logging.version>1.2</commons-logging.version>
6058
<commons-math3.version>3.6.1</commons-math3.version>
6159
<commons-net.version>3.11.1</commons-net.version>
6260
<commons-text.version>1.12.0</commons-text.version>
@@ -309,6 +307,13 @@
309307
<groupId>com.amazonaws</groupId>
310308
<artifactId>aws-java-sdk-core</artifactId>
311309
<version>${aws-java-sdk.version}</version>
310+
<exclusions>
311+
<exclusion>
312+
<!-- depend on jcl-over-slf4j instead -->
313+
<groupId>commons-logging</groupId>
314+
<artifactId>commons-logging</artifactId>
315+
</exclusion>
316+
</exclusions>
312317
</dependency>
313318
<dependency>
314319
<groupId>com.amazonaws</groupId>
@@ -451,6 +456,13 @@
451456
<groupId>commons-beanutils</groupId>
452457
<artifactId>commons-beanutils</artifactId>
453458
<version>${commons-beanutils.version}</version>
459+
<exclusions>
460+
<exclusion>
461+
<!-- depend on jcl-over-slf4j instead -->
462+
<groupId>commons-logging</groupId>
463+
<artifactId>commons-logging</artifactId>
464+
</exclusion>
465+
</exclusions>
454466
</dependency>
455467
<dependency>
456468
<groupId>commons-cli</groupId>
@@ -482,30 +494,6 @@
482494
<artifactId>commons-io</artifactId>
483495
<version>${commons-io.version}</version>
484496
</dependency>
485-
<dependency>
486-
<groupId>commons-logging</groupId>
487-
<artifactId>commons-logging</artifactId>
488-
<version>${commons-logging.version}</version>
489-
<exclusions>
490-
<exclusion>
491-
<groupId>avalon-framework</groupId>
492-
<artifactId>avalon-framework</artifactId>
493-
</exclusion>
494-
<exclusion>
495-
<groupId>javax.servlet</groupId>
496-
<artifactId>javax.servlet-api</artifactId>
497-
</exclusion>
498-
<exclusion>
499-
<groupId>logkit</groupId>
500-
<artifactId>logkit</artifactId>
501-
</exclusion>
502-
</exclusions>
503-
</dependency>
504-
<dependency>
505-
<groupId>commons-logging</groupId>
506-
<artifactId>commons-logging-api</artifactId>
507-
<version>${commons-logging-api.version}</version>
508-
</dependency>
509497
<dependency>
510498
<groupId>commons-net</groupId>
511499
<artifactId>commons-net</artifactId>
@@ -515,6 +503,13 @@
515503
<groupId>commons-validator</groupId>
516504
<artifactId>commons-validator</artifactId>
517505
<version>${commons-validator.version}</version>
506+
<exclusions>
507+
<exclusion>
508+
<!-- depend on jcl-over-slf4j instead -->
509+
<groupId>commons-logging</groupId>
510+
<artifactId>commons-logging</artifactId>
511+
</exclusion>
512+
</exclusions>
518513
</dependency>
519514
<dependency>
520515
<groupId>dnsjava</groupId>
@@ -680,6 +675,11 @@
680675
<artifactId>commons-configuration2</artifactId>
681676
<version>${commons-configuration2.version}</version>
682677
<exclusions>
678+
<exclusion>
679+
<!-- depend on jcl-over-slf4j instead -->
680+
<groupId>commons-logging</groupId>
681+
<artifactId>commons-logging</artifactId>
682+
</exclusion>
683683
<exclusion>
684684
<groupId>org.apache.commons</groupId>
685685
<artifactId>commons-lang3</artifactId>
@@ -757,6 +757,13 @@
757757
<artifactId>hadoop-common</artifactId>
758758
<version>${hadoop.version}</version>
759759
<type>test-jar</type>
760+
<exclusions>
761+
<exclusion>
762+
<!-- depend on jcl-over-slf4j instead -->
763+
<groupId>commons-logging</groupId>
764+
<artifactId>commons-logging</artifactId>
765+
</exclusion>
766+
</exclusions>
760767
</dependency>
761768
<dependency>
762769
<groupId>org.apache.hadoop</groupId>
@@ -825,6 +832,13 @@
825832
<groupId>org.apache.httpcomponents</groupId>
826833
<artifactId>httpclient</artifactId>
827834
<version>${httpclient.version}</version>
835+
<exclusions>
836+
<exclusion>
837+
<!-- depend on jcl-over-slf4j instead -->
838+
<groupId>commons-logging</groupId>
839+
<artifactId>commons-logging</artifactId>
840+
</exclusion>
841+
</exclusions>
828842
</dependency>
829843
<dependency>
830844
<groupId>org.apache.httpcomponents</groupId>
@@ -1212,6 +1226,11 @@
12121226
<artifactId>rocksdbjni</artifactId>
12131227
<version>${rocksdb.version}</version>
12141228
</dependency>
1229+
<dependency>
1230+
<groupId>org.slf4j</groupId>
1231+
<artifactId>jcl-over-slf4j</artifactId>
1232+
<version>${slf4j.version}</version>
1233+
</dependency>
12151234
<dependency>
12161235
<groupId>org.slf4j</groupId>
12171236
<artifactId>jul-to-slf4j</artifactId>

0 commit comments

Comments
 (0)