Skip to content

Commit 4eb0d98

Browse files
lhotarisrinath-ctds
authored andcommitted
[fix][sec] Remove dependency on out-dated commons-configuration 1.x (apache#24562)
(cherry picked from commit 2e77444) (cherry picked from commit 0510a9f)
1 parent 22e9245 commit 4eb0d98

File tree

6 files changed

+9
-25
lines changed

6 files changed

+9
-25
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,9 @@ The Apache Software License, Version 2.0
285285
- commons-beanutils-commons-beanutils-1.11.0.jar
286286
- commons-cli-commons-cli-1.9.0.jar
287287
- commons-codec-commons-codec-1.18.0.jar
288-
- commons-configuration-commons-configuration-1.10.jar
289288
- commons-io-commons-io-2.19.0.jar
290289
- commons-lang-commons-lang-2.6.jar
291-
- commons-logging-commons-logging-1.1.1.jar
290+
- commons-logging-commons-logging-1.3.5.jar
292291
- commons-collections-commons-collections-3.2.2.jar
293292
- org.apache.commons-commons-collections4-4.4.jar
294293
- org.apache.commons-commons-compress-1.27.1.jar

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ The Apache Software License, Version 2.0
342342
* Apache Commons
343343
- commons-codec-1.18.0.jar
344344
- commons-io-2.19.0.jar
345-
- commons-logging-1.2.jar
345+
- commons-logging-1.3.5.jar
346346
- commons-lang3-3.18.0.jar
347347
- commons-text-1.13.1.jar
348348
- commons-compress-1.27.1.jar

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ flexible messaging model and an intuitive client API.</description>
257257
<aircompressor.version>0.27</aircompressor.version>
258258
<asynchttpclient.version>2.12.4</asynchttpclient.version>
259259
<commons-lang3.version>3.18.0</commons-lang3.version>
260-
<commons-configuration.version>1.10</commons-configuration.version>
261260
<commons-io.version>2.19.0</commons-io.version>
262261
<commons-codec.version>1.18.0</commons-codec.version>
262+
<commons-logging.version>1.3.5</commons-logging.version>
263263
<jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
264264
<hdrHistogram.version>2.1.9</hdrHistogram.version>
265265
<javax.servlet-api>3.1.0</javax.servlet-api>
@@ -831,18 +831,18 @@ flexible messaging model and an intuitive client API.</description>
831831
<version>${commons-compress.version}</version>
832832
</dependency>
833833

834-
<dependency>
835-
<groupId>commons-configuration</groupId>
836-
<artifactId>commons-configuration</artifactId>
837-
<version>${commons-configuration.version}</version>
838-
</dependency>
839-
840834
<dependency>
841835
<groupId>commons-io</groupId>
842836
<artifactId>commons-io</artifactId>
843837
<version>${commons-io.version}</version>
844838
</dependency>
845839

840+
<dependency>
841+
<groupId>commons-logging</groupId>
842+
<artifactId>commons-logging</artifactId>
843+
<version>${commons-logging.version}</version>
844+
</dependency>
845+
846846
<dependency>
847847
<groupId>org.apache.commons</groupId>
848848
<artifactId>commons-text</artifactId>

pulsar-common/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,6 @@
122122
<dependency>
123123
<groupId>com.datastax.oss</groupId>
124124
<artifactId>bookkeeper-common-allocator</artifactId>
125-
<exclusions>
126-
<exclusion>
127-
<groupId>commons-configuration</groupId>
128-
<artifactId>commons-configuration</artifactId>
129-
</exclusion>
130-
</exclusions>
131125
</dependency>
132126

133127
<dependency>

pulsar-functions/localrun-shaded/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,6 @@
229229
<pattern>net.jpountz</pattern>
230230
<shadedPattern>org.apache.pulsar.functions.runtime.shaded.net.jpountz</shadedPattern>
231231
</relocation>
232-
<relocation>
233-
<pattern>commons-configuration</pattern>
234-
<shadedPattern>org.apache.pulsar.functions.runtime.shaded.commons-configuration</shadedPattern>
235-
</relocation>
236232
<relocation>
237233
<pattern>org.tukaani</pattern>
238234
<shadedPattern>org.apache.pulsar.functions.runtime.shaded.org.tukaani</shadedPattern>

pulsar-testclient/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@
9090
<version>${project.version}</version>
9191
</dependency>
9292

93-
<dependency>
94-
<groupId>commons-configuration</groupId>
95-
<artifactId>commons-configuration</artifactId>
96-
</dependency>
97-
9893
<dependency>
9994
<groupId>info.picocli</groupId>
10095
<artifactId>picocli</artifactId>

0 commit comments

Comments
 (0)