diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 72d8c66c42e7b..6829ef9f9d92e 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -287,7 +287,6 @@ The Apache Software License, Version 2.0 - commons-codec-commons-codec-1.20.0.jar - commons-io-commons-io-2.21.0.jar - commons-logging-commons-logging-1.3.5.jar - - commons-collections-commons-collections-3.2.2.jar - org.apache.commons-commons-collections4-4.5.0.jar - org.apache.commons-commons-compress-1.28.0.jar - org.apache.commons-commons-configuration2-2.12.0.jar diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index 4d4684e4a9fec..5cb2a9f5e5c98 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -345,7 +345,6 @@ The Apache Software License, Version 2.0 - commons-text-1.14.0.jar - commons-compress-1.28.0.jar - commons-beanutils-1.11.0.jar - - commons-collections-3.2.2.jar - commons-configuration2-2.12.0.jar * Netty - netty-buffer-4.1.128.Final.jar diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java index e5ce27c488f95..9cd597904fcdb 100644 --- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java +++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java @@ -112,7 +112,7 @@ import org.apache.bookkeeper.mledger.proto.MLDataFormats.PositionInfo; import org.apache.bookkeeper.mledger.util.ManagedLedgerUtils; import org.apache.bookkeeper.test.MockedBookKeeperTestCase; -import org.apache.commons.collections.iterators.EmptyIterator; +import org.apache.commons.collections4.iterators.EmptyIterator; import org.apache.commons.lang3.mutable.MutableBoolean; import org.apache.pulsar.common.api.proto.CommandSubscribe; import org.apache.pulsar.common.api.proto.IntRange; diff --git a/pom.xml b/pom.xml index b5f13e941acfe..9e83031be02b4 100644 --- a/pom.xml +++ b/pom.xml @@ -252,7 +252,7 @@ flexible messaging model and an intuitive client API. 9.4.0 0.11.1 0.28.0 - 3.4.1 + 3.4.2 3.6.2 ${hadoop3.version} 2.6.3-hadoop3 @@ -645,6 +645,10 @@ flexible messaging model and an intuitive client API. io.grpc grpc-netty + + commons-collections + commons-collections + @@ -1744,6 +1748,12 @@ flexible messaging model and an intuitive client API. commons-beanutils commons-beanutils ${commons-beanutils.version} + + + commons-collections + commons-collections + + org.apache.commons diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml index 76def0387771c..3c16d141be280 100644 --- a/pulsar-client-admin-shaded/pom.xml +++ b/pulsar-client-admin-shaded/pom.xml @@ -128,7 +128,6 @@ com.yahoo.datasketches:sketches-core commons-*:* commons-codec:commons-codec - commons-collections:commons-collections io.airlift:* io.grpc:* io.netty.incubator:* diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml index 2b6b9a664b447..d390eb918ebf4 100644 --- a/pulsar-client-all/pom.xml +++ b/pulsar-client-all/pom.xml @@ -171,7 +171,6 @@ com.yahoo.datasketches:sketches-core commons-*:* commons-codec:commons-codec - commons-collections:commons-collections io.airlift:* io.grpc:* io.netty.incubator:* diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index 32bf4f32313bd..79205a5b19128 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -145,7 +145,6 @@ com.yahoo.datasketches:sketches-core commons-*:* commons-codec:commons-codec - commons-collections:commons-collections io.airlift:* io.netty.incubator:* io.netty:*