This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new a369fe7237 Exclude commons-collections from dependencies (#4689)
a369fe7237 is described below
commit a369fe72379db4521b951a3fe036d4f76679886a
Author: Lari Hotari <[email protected]>
AuthorDate: Fri Nov 28 09:30:55 2025 +0200
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
---
bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt | 2 --
bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 2 --
bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt | 2 --
pom.xml | 8 +++++++-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index d89cc69a40..e622243104 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -214,7 +214,6 @@ Apache Software License, Version 2.
- lib/commons-beanutils-commons-beanutils-1.11.0.jar [62]
- lib/commons-cli-commons-cli-1.9.0.jar [5]
- lib/commons-codec-commons-codec-1.18.0.jar [6]
-- lib/commons-collections-commons-collections-3.2.2.jar [62]
- lib/commons-io-commons-io-2.19.0.jar [8]
- lib/commons-logging-commons-logging-1.3.5.jar [10]
- lib/io.netty-netty-buffer-4.1.121.Final.jar [11]
@@ -420,7 +419,6 @@ Apache Software License, Version 2.
[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
[61] Source available at
https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
[62] Source available at
https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
-[63] Source available at
https://github.com/apache/commons-collections/tree/collections-3.3.2
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index 55670fb58b..26b89e4b23 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -214,7 +214,6 @@ Apache Software License, Version 2.
- lib/commons-beanutils-commons-beanutils-1.11.0.jar [57]
- lib/commons-cli-commons-cli-1.9.0.jar [5]
- lib/commons-codec-commons-codec-1.18.0.jar [6]
-- lib/commons-collections-commons-collections-3.2.2.jar [58]
- lib/commons-io-commons-io-2.19.0.jar [8]
- lib/commons-logging-commons-logging-1.3.5.jar [10]
- lib/io.netty-netty-buffer-4.1.121.Final.jar [11]
@@ -354,7 +353,6 @@ Apache Software License, Version 2.
[55] Source available at
https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
[56] Source available at
https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
[57] Source available at
https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
-[58] Source available at
https://github.com/apache/commons-collections/tree/collections-3.3.2
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index 4afb79c9a8..66ba91e507 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -214,7 +214,6 @@ Apache Software License, Version 2.
- lib/commons-beanutils-commons-beanutils-1.11.0.jar [61]
- lib/commons-cli-commons-cli-1.9.0.jar [5]
- lib/commons-codec-commons-codec-1.18.0.jar [6]
-- lib/commons-collections-commons-collections-3.2.2.jar [62]
- lib/commons-io-commons-io-2.19.0.jar [8]
- lib/commons-logging-commons-logging-1.3.5.jar [10]
- lib/io.netty-netty-buffer-4.1.121.Final.jar [11]
@@ -415,7 +414,6 @@ Apache Software License, Version 2.
[59] Source available at https://github.com/prometheus/client_java/tree/v1.3.4
[60] Source available at
https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
[61] Source available at
https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
-[62] Source available at
https://github.com/apache/commons-collections/tree/collections-3.3.2
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.121.Final.jar bundles some 3rd party dependencies
diff --git a/pom.xml b/pom.xml
index 6ce43d14a1..1ff689df44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
<grpc.version>1.72.0</grpc.version>
<guava.version>32.0.1-jre</guava.version>
<kerby.version>1.1.1</kerby.version>
- <hadoop.version>3.3.5</hadoop.version>
+ <hadoop.version>3.4.2</hadoop.version>
<hdrhistogram.version>2.1.10</hdrhistogram.version>
<jackson.version>2.17.1</jackson.version>
<jcommander.version>1.82</jcommander.version>
@@ -287,6 +287,12 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
