Skip to content

Commit 0adc077

Browse files
authored
[improve] Upgrade Apache Commons library versions to compatible versions (#24205)
1 parent 12961ca commit 0adc077

File tree

5 files changed

+24
-19
lines changed

5 files changed

+24
-19
lines changed

buildtools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<log4j2.version>2.23.1</log4j2.version>
5151
<slf4j.version>2.0.13</slf4j.version>
5252
<testng.version>7.7.1</testng.version>
53-
<commons-lang3.version>3.11</commons-lang3.version>
53+
<commons-lang3.version>3.17.0</commons-lang3.version>
5454
<license-maven-plugin.version>4.1</license-maven-plugin.version>
5555
<puppycrawl.checkstyle.version>10.14.2</puppycrawl.checkstyle.version>
5656
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,16 +282,16 @@ The Apache Software License, Version 2.0
282282
- com.yahoo.datasketches-memory-0.8.3.jar
283283
- com.yahoo.datasketches-sketches-core-0.8.3.jar
284284
* Apache Commons
285-
- commons-cli-commons-cli-1.5.0.jar
286-
- commons-codec-commons-codec-1.15.jar
285+
- commons-cli-commons-cli-1.9.0.jar
286+
- commons-codec-commons-codec-1.18.0.jar
287287
- commons-configuration-commons-configuration-1.10.jar
288-
- commons-io-commons-io-2.18.0.jar
288+
- commons-io-commons-io-2.19.0.jar
289289
- commons-lang-commons-lang-2.6.jar
290290
- commons-logging-commons-logging-1.1.1.jar
291291
- org.apache.commons-commons-collections4-4.4.jar
292-
- org.apache.commons-commons-compress-1.26.0.jar
293-
- org.apache.commons-commons-lang3-3.11.jar
294-
- org.apache.commons-commons-text-1.10.0.jar
292+
- org.apache.commons-commons-compress-1.27.0.jar
293+
- org.apache.commons-commons-lang3-3.17.0.jar
294+
- org.apache.commons-commons-text-1.13.1.jar
295295
* Netty
296296
- io.netty-netty-buffer-4.1.119.Final.jar
297297
- io.netty-netty-codec-4.1.119.Final.jar

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,14 +338,14 @@ The Apache Software License, Version 2.0
338338
- memory-0.8.3.jar
339339
- sketches-core-0.8.3.jar
340340
* Apache Commons
341-
- commons-codec-1.15.jar
341+
- commons-codec-1.18.0.jar
342342
- commons-configuration-1.10.jar
343-
- commons-io-2.18.0.jar
343+
- commons-io-2.19.0.jar
344344
- commons-lang-2.6.jar
345345
- commons-logging-1.2.jar
346-
- commons-lang3-3.11.jar
347-
- commons-text-1.10.0.jar
348-
- commons-compress-1.26.0.jar
346+
- commons-lang3-3.17.0.jar
347+
- commons-text-1.13.1.jar
348+
- commons-compress-1.27.0.jar
349349
* Netty
350350
- netty-buffer-4.1.119.Final.jar
351351
- netty-codec-4.1.119.Final.jar

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ flexible messaging model and an intuitive client API.</description>
139139
<narPluginPhase>package</narPluginPhase>
140140

141141
<!-- apache commons -->
142-
<commons-compress.version>1.26.0</commons-compress.version>
142+
<commons-compress.version>1.27.0</commons-compress.version>
143143

144144
<bookkeeper.version>4.17.1</bookkeeper.version>
145145
<zookeeper.version>3.9.3</zookeeper.version>
146-
<commons-cli.version>1.5.0</commons-cli.version>
147-
<commons-text.version>1.10.0</commons-text.version>
146+
<commons-cli.version>1.9.0</commons-cli.version>
147+
<commons-text.version>1.13.1</commons-text.version>
148148
<snappy.version>1.1.10.5</snappy.version> <!-- ZooKeeper server -->
149149
<dropwizardmetrics.version>4.1.12.1</dropwizardmetrics.version> <!-- ZooKeeper server -->
150150
<curator.version>5.7.1</curator.version>
@@ -218,10 +218,10 @@ flexible messaging model and an intuitive client API.</description>
218218
<confluent.version>7.8.2</confluent.version>
219219
<aircompressor.version>0.27</aircompressor.version>
220220
<asynchttpclient.version>2.12.4</asynchttpclient.version>
221-
<commons-lang3.version>3.11</commons-lang3.version>
221+
<commons-lang3.version>3.17.0</commons-lang3.version>
222222
<commons-configuration.version>1.10</commons-configuration.version>
223-
<commons-io.version>2.18.0</commons-io.version>
224-
<commons-codec.version>1.15</commons-codec.version>
223+
<commons-io.version>2.19.0</commons-io.version>
224+
<commons-codec.version>1.18.0</commons-codec.version>
225225
<jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
226226
<hdrHistogram.version>2.1.9</hdrHistogram.version>
227227
<javax.servlet-api>3.1.0</javax.servlet-api>

pulsar-functions/runtime-all/src/test/java/org/apache/pulsar/functions/instance/JavaInstanceDepsTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,17 @@
4848
* 10. Apache Commons Compress (dependency of AVRO)
4949
* 11. Apache Commons Lang (dependency of Apache Commons Compress)
5050
* 12. Apache Commons IO (dependency of Apache Commons Compress)
51+
* 13. Apache Commons Codec
52+
* - this gets included possibly due to a maven-assembly-plugin bug since there is no direct or transitive
53+
* dependency in pulsar-functions/runtime-all to this library for runtime scope. In the test scope, it is
54+
* present.
5155
*/
5256
public class JavaInstanceDepsTest {
5357

5458
@Test
5559
public void testInstanceJarDeps() throws IOException {
5660
File jar = new File("target/java-instance.jar");
57-
61+
5862
@Cleanup
5963
ZipInputStream zip = new ZipInputStream(jar.toURI().toURL().openStream());
6064

@@ -75,6 +79,7 @@ public void testInstanceJarDeps() throws IOException {
7579
&& !name.startsWith("org/apache/commons/compress")
7680
&& !name.startsWith("org/apache/commons/lang3")
7781
&& !name.startsWith("org/apache/commons/io")
82+
&& !name.startsWith("org/apache/commons/codec")
7883
&& !name.startsWith("com/google")
7984
&& !name.startsWith("org/checkerframework")
8085
&& !name.startsWith("javax/annotation")

0 commit comments

Comments
 (0)