Skip to content

Commit a369fe7

Browse files
authored
Exclude commons-collections from dependencies (#4689)
* [fix] Exclude optional commons-collections dependency from commons-beanutils * Update license files * Upgrade hadoop to 3.4.2 version
1 parent 14c2ffe commit a369fe7

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ Apache Software License, Version 2.
214214
- lib/commons-beanutils-commons-beanutils-1.11.0.jar [62]
215215
- lib/commons-cli-commons-cli-1.9.0.jar [5]
216216
- lib/commons-codec-commons-codec-1.18.0.jar [6]
217-
- lib/commons-collections-commons-collections-3.2.2.jar [62]
218217
- lib/commons-io-commons-io-2.19.0.jar [8]
219218
- lib/commons-logging-commons-logging-1.3.5.jar [10]
220219
- lib/io.netty-netty-buffer-4.1.121.Final.jar [11]
@@ -420,7 +419,6 @@ Apache Software License, Version 2.
420419
[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
421420
[61] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
422421
[62] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
423-
[63] Source available at https://github.com/apache/commons-collections/tree/collections-3.3.2
424422
------------------------------------------------------------------------------------
425423
lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies
426424

bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ Apache Software License, Version 2.
214214
- lib/commons-beanutils-commons-beanutils-1.11.0.jar [57]
215215
- lib/commons-cli-commons-cli-1.9.0.jar [5]
216216
- lib/commons-codec-commons-codec-1.18.0.jar [6]
217-
- lib/commons-collections-commons-collections-3.2.2.jar [58]
218217
- lib/commons-io-commons-io-2.19.0.jar [8]
219218
- lib/commons-logging-commons-logging-1.3.5.jar [10]
220219
- lib/io.netty-netty-buffer-4.1.121.Final.jar [11]
@@ -354,7 +353,6 @@ Apache Software License, Version 2.
354353
[55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
355354
[56] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
356355
[57] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
357-
[58] Source available at https://github.com/apache/commons-collections/tree/collections-3.3.2
358356
------------------------------------------------------------------------------------
359357
lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies
360358

bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ Apache Software License, Version 2.
214214
- lib/commons-beanutils-commons-beanutils-1.11.0.jar [61]
215215
- lib/commons-cli-commons-cli-1.9.0.jar [5]
216216
- lib/commons-codec-commons-codec-1.18.0.jar [6]
217-
- lib/commons-collections-commons-collections-3.2.2.jar [62]
218217
- lib/commons-io-commons-io-2.19.0.jar [8]
219218
- lib/commons-logging-commons-logging-1.3.5.jar [10]
220219
- lib/io.netty-netty-buffer-4.1.121.Final.jar [11]
@@ -415,7 +414,6 @@ Apache Software License, Version 2.
415414
[59] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
416415
[60] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
417416
[61] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
418-
[62] Source available at https://github.com/apache/commons-collections/tree/collections-3.3.2
419417
------------------------------------------------------------------------------------
420418
lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies
421419

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<grpc.version>1.72.0</grpc.version>
142142
<guava.version>32.0.1-jre</guava.version>
143143
<kerby.version>1.1.1</kerby.version>
144-
<hadoop.version>3.3.5</hadoop.version>
144+
<hadoop.version>3.4.2</hadoop.version>
145145
<hdrhistogram.version>2.1.10</hdrhistogram.version>
146146
<jackson.version>2.17.1</jackson.version>
147147
<jcommander.version>1.82</jcommander.version>
@@ -287,6 +287,12 @@
287287
<groupId>commons-beanutils</groupId>
288288
<artifactId>commons-beanutils</artifactId>
289289
<version>${commons-beanutils.version}</version>
290+
<exclusions>
291+
<exclusion>
292+
<groupId>commons-collections</groupId>
293+
<artifactId>commons-collections</artifactId>
294+
</exclusion>
295+
</exclusions>
290296
</dependency>
291297
<dependency>
292298
<groupId>commons-io</groupId>

0 commit comments

Comments
 (0)