Skip to content

Commit b25763b

Browse files
lhotarisrinath-ctds
authored andcommitted
Exclude commons-collections from dependencies (apache#4689)
* [fix] Exclude optional commons-collections dependency from commons-beanutils * Update license files * Upgrade hadoop to 3.4.2 version (cherry picked from commit a369fe7) (cherry picked from commit d95cf46)
1 parent 14c0fdc commit b25763b

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]
@@ -418,7 +417,6 @@ Apache Software License, Version 2.
418417
[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
419418
[61] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
420419
[62] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
421-
[63] Source available at https://github.com/apache/commons-collections/tree/collections-3.3.2
422420
------------------------------------------------------------------------------------
423421
lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies
424422

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]
@@ -352,7 +351,6 @@ Apache Software License, Version 2.
352351
[55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
353352
[56] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
354353
[57] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
355-
[58] Source available at https://github.com/apache/commons-collections/tree/collections-3.3.2
356354
------------------------------------------------------------------------------------
357355
lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies
358356

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]
@@ -413,7 +412,6 @@ Apache Software License, Version 2.
413412
[59] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
414413
[60] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
415414
[61] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
416-
[62] Source available at https://github.com/apache/commons-collections/tree/collections-3.3.2
417415
------------------------------------------------------------------------------------
418416
lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies
419417

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<grpc.version>1.72.0</grpc.version>
139139
<guava.version>32.0.1-jre</guava.version>
140140
<kerby.version>1.1.1</kerby.version>
141-
<hadoop.version>3.3.5</hadoop.version>
141+
<hadoop.version>3.4.2</hadoop.version>
142142
<hdrhistogram.version>2.1.10</hdrhistogram.version>
143143
<jackson.version>2.17.1</jackson.version>
144144
<jcommander.version>1.82</jcommander.version>
@@ -281,6 +281,12 @@
281281
<groupId>commons-beanutils</groupId>
282282
<artifactId>commons-beanutils</artifactId>
283283
<version>${commons-beanutils.version}</version>
284+
<exclusions>
285+
<exclusion>
286+
<groupId>commons-collections</groupId>
287+
<artifactId>commons-collections</artifactId>
288+
</exclusion>
289+
</exclusions>
284290
</dependency>
285291
<dependency>
286292
<groupId>commons-io</groupId>

0 commit comments

Comments
 (0)