Skip to content

Commit 9ed6fe0

Browse files
committed
HBASE-29770 Exclude commons-logging from HBase (#7539)
Signed-off-by: Nihal Jain <nihaljain@apache.org> Reviewed-by: Shanmukha Haripriya Kota <skota@cloudera.com> (cherry picked from commit a07d8b5)
1 parent 3464036 commit 9ed6fe0

2 files changed

Lines changed: 38 additions & 10 deletions

File tree

hbase-diagnostics/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@
196196
<artifactId>jul-to-slf4j</artifactId>
197197
<scope>test</scope>
198198
</dependency>
199+
<dependency>
200+
<groupId>org.slf4j</groupId>
201+
<artifactId>jcl-over-slf4j</artifactId>
202+
<scope>test</scope>
203+
</dependency>
199204
<dependency>
200205
<groupId>org.apache.logging.log4j</groupId>
201206
<artifactId>log4j-1.2-api</artifactId>

pom.xml

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,6 +1444,12 @@
14441444
<groupId>org.apache.httpcomponents</groupId>
14451445
<artifactId>httpclient</artifactId>
14461446
<version>${httpclient.version}</version>
1447+
<exclusions>
1448+
<exclusion>
1449+
<groupId>commons-logging</groupId>
1450+
<artifactId>commons-logging</artifactId>
1451+
</exclusion>
1452+
</exclusions>
14471453
</dependency>
14481454
<dependency>
14491455
<groupId>org.apache.httpcomponents</groupId>
@@ -1459,6 +1465,12 @@
14591465
<groupId>commons-validator</groupId>
14601466
<artifactId>commons-validator</artifactId>
14611467
<version>${commons-validator.version}</version>
1468+
<exclusions>
1469+
<exclusion>
1470+
<groupId>commons-logging</groupId>
1471+
<artifactId>commons-logging</artifactId>
1472+
</exclusion>
1473+
</exclusions>
14621474
</dependency>
14631475
<dependency>
14641476
<groupId>commons-io</groupId>
@@ -1480,14 +1492,6 @@
14801492
<artifactId>commons-cli</artifactId>
14811493
<version>${commons-cli.version}</version>
14821494
</dependency>
1483-
<dependency>
1484-
<!-- commons-logging is only used by hbase-http's HttpRequestLog and hbase-server's
1485-
HBaseTestingUtil.
1486-
-->
1487-
<groupId>commons-logging</groupId>
1488-
<artifactId>commons-logging</artifactId>
1489-
<version>1.2</version>
1490-
</dependency>
14911495
<dependency>
14921496
<groupId>org.apache.zookeeper</groupId>
14931497
<artifactId>zookeeper</artifactId>
@@ -2381,8 +2385,7 @@
23812385
<excludes>
23822386
<exclude>commons-logging:commons-logging</exclude>
23832387
</excludes>
2384-
<message>We don't use commons-logging any more, so do not depend on it directly.</message>
2385-
<searchTransitive>false</searchTransitive>
2388+
<message>We don't use commons-logging any more, so do not depend on it directly. We are also using jcl-over-slf4j for libraries so exclude any transitive commons-logging dependencies.</message>
23862389
</bannedDependencies>
23872390
</rules>
23882391
</configuration>
@@ -3723,6 +3726,10 @@
37233726
<groupId>org.openlabtesting.leveldbjni</groupId>
37243727
<artifactId>leveldbjni-all</artifactId>
37253728
</exclusion>
3729+
<exclusion>
3730+
<groupId>commons-logging</groupId>
3731+
<artifactId>commons-logging</artifactId>
3732+
</exclusion>
37263733
</exclusions>
37273734
</dependency>
37283735
<dependency>
@@ -3776,6 +3783,10 @@
37763783
<groupId>org.slf4j</groupId>
37773784
<artifactId>slf4j-reload4j</artifactId>
37783785
</exclusion>
3786+
<exclusion>
3787+
<groupId>commons-logging</groupId>
3788+
<artifactId>commons-logging</artifactId>
3789+
</exclusion>
37793790
</exclusions>
37803791
</dependency>
37813792
<dependency>
@@ -3878,6 +3889,10 @@
38783889
<groupId>org.slf4j</groupId>
38793890
<artifactId>slf4j-reload4j</artifactId>
38803891
</exclusion>
3892+
<exclusion>
3893+
<groupId>commons-logging</groupId>
3894+
<artifactId>commons-logging</artifactId>
3895+
</exclusion>
38813896
<exclusion>
38823897
<groupId>org.bouncycastle</groupId>
38833898
<artifactId>bcprov-jdk15on</artifactId>
@@ -3939,6 +3954,10 @@
39393954
<groupId>javax.ws.rs</groupId>
39403955
<artifactId>jsr311-api</artifactId>
39413956
</exclusion>
3957+
<exclusion>
3958+
<groupId>commons-logging</groupId>
3959+
<artifactId>commons-logging</artifactId>
3960+
</exclusion>
39423961
<exclusion>
39433962
<groupId>org.bouncycastle</groupId>
39443963
<artifactId>bcprov-jdk15on</artifactId>
@@ -4020,6 +4039,10 @@
40204039
<groupId>org.bouncycastle</groupId>
40214040
<artifactId>bcpkix-jdk15on</artifactId>
40224041
</exclusion>
4042+
<exclusion>
4043+
<groupId>commons-logging</groupId>
4044+
<artifactId>commons-logging</artifactId>
4045+
</exclusion>
40234046
</exclusions>
40244047
</dependency>
40254048
<!--

0 commit comments

Comments
 (0)