Skip to content

Commit 030d6ea

Browse files
committed
[fix][sec] Eliminate commons-collections dependency (#25024)
(cherry picked from commit 081b448)
1 parent 7adf72f commit 030d6ea

7 files changed

Lines changed: 12 additions & 7 deletions

File tree

distribution/server/src/assemble/LICENSE.bin.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ The Apache Software License, Version 2.0
287287
- commons-codec-commons-codec-1.20.0.jar
288288
- commons-io-commons-io-2.21.0.jar
289289
- commons-logging-commons-logging-1.3.5.jar
290-
- commons-collections-commons-collections-3.2.2.jar
291290
- org.apache.commons-commons-collections4-4.5.0.jar
292291
- org.apache.commons-commons-compress-1.28.0.jar
293292
- org.apache.commons-commons-configuration2-2.12.0.jar

distribution/shell/src/assemble/LICENSE.bin.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ The Apache Software License, Version 2.0
345345
- commons-text-1.14.0.jar
346346
- commons-compress-1.28.0.jar
347347
- commons-beanutils-1.11.0.jar
348-
- commons-collections-3.2.2.jar
349348
- commons-configuration2-2.12.0.jar
350349
* Netty
351350
- netty-buffer-4.1.128.Final.jar

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
import org.apache.bookkeeper.mledger.proto.MLDataFormats.PositionInfo;
113113
import org.apache.bookkeeper.mledger.util.ManagedLedgerUtils;
114114
import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
115-
import org.apache.commons.collections.iterators.EmptyIterator;
115+
import org.apache.commons.collections4.iterators.EmptyIterator;
116116
import org.apache.commons.lang3.mutable.MutableBoolean;
117117
import org.apache.pulsar.common.api.proto.CommandSubscribe;
118118
import org.apache.pulsar.common.api.proto.IntRange;

pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ flexible messaging model and an intuitive client API.</description>
249249
<wildfly-elytron.version>1.15.16.Final</wildfly-elytron.version>
250250
<jsonwebtoken.version>0.11.1</jsonwebtoken.version>
251251
<opencensus.version>0.28.0</opencensus.version>
252-
<hadoop3.version>3.4.1</hadoop3.version>
252+
<hadoop3.version>3.4.2</hadoop3.version>
253253
<dnsjava3.version>3.6.2</dnsjava3.version>
254254
<hdfs-offload-version3>${hadoop3.version}</hdfs-offload-version3>
255255
<hbase.version>2.6.3-hadoop3</hbase.version>
@@ -642,6 +642,10 @@ flexible messaging model and an intuitive client API.</description>
642642
<groupId>io.grpc</groupId>
643643
<artifactId>grpc-netty</artifactId>
644644
</exclusion>
645+
<exclusion>
646+
<groupId>commons-collections</groupId>
647+
<artifactId>commons-collections</artifactId>
648+
</exclusion>
645649
</exclusions>
646650
</dependency>
647651

@@ -1735,6 +1739,12 @@ flexible messaging model and an intuitive client API.</description>
17351739
<groupId>commons-beanutils</groupId>
17361740
<artifactId>commons-beanutils</artifactId>
17371741
<version>${commons-beanutils.version}</version>
1742+
<exclusions>
1743+
<exclusion>
1744+
<groupId>commons-collections</groupId>
1745+
<artifactId>commons-collections</artifactId>
1746+
</exclusion>
1747+
</exclusions>
17381748
</dependency>
17391749
<dependency>
17401750
<groupId>org.apache.commons</groupId>

pulsar-client-admin-shaded/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
<include>com.yahoo.datasketches:sketches-core</include>
129129
<include>commons-*:*</include>
130130
<include>commons-codec:commons-codec</include>
131-
<include>commons-collections:commons-collections</include>
132131
<include>io.airlift:*</include>
133132
<include>io.grpc:*</include>
134133
<include>io.netty.incubator:*</include>

pulsar-client-all/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171
<include>com.yahoo.datasketches:sketches-core</include>
172172
<include>commons-*:*</include>
173173
<include>commons-codec:commons-codec</include>
174-
<include>commons-collections:commons-collections</include>
175174
<include>io.airlift:*</include>
176175
<include>io.grpc:*</include>
177176
<include>io.netty.incubator:*</include>

pulsar-client-shaded/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
<include>com.yahoo.datasketches:sketches-core</include>
146146
<include>commons-*:*</include>
147147
<include>commons-codec:commons-codec</include>
148-
<include>commons-collections:commons-collections</include>
149148
<include>io.airlift:*</include>
150149
<include>io.netty.incubator:*</include>
151150
<include>io.netty:*</include>

0 commit comments

Comments
 (0)