Skip to content

Commit a01aa11

Browse files
committed
Upgrade Apache Commons libraries to compatible versions (#4582)
While working on #4580, I noticed that the Commons Compress version and the Commons Codec library version aren't compatible. It causes a ClassDefNotFoundError in running tests which were using some specific methods of docker-java. While exploring this, I noticed that Apache Commons library versions haven't been kept up-to-date for a long time and it's better to handle that for 4.18.0 release. - upgrade commons-cli from 1.2 to 1.9.0 - upgrade commons-codec from 1.6 to 1.18.0 - upgrade commons-io from 2.17.0 to 2.19.0 - upgrade commons-lang3 from 3.6 to 3.17.0 - upgrade commons-compress from 1.26.0 to 1.27.0 (cherry picked from commit bcd6b52)
1 parent 2182932 commit a01aa11

File tree

4 files changed

+29
-27
lines changed

4 files changed

+29
-27
lines changed

bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ Apache Software License, Version 2.
211211
- lib/com.google.guava-guava-32.0.1-jre.jar [4]
212212
- lib/com.google.guava-failureaccess-1.0.1.jar [4]
213213
- lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4]
214-
- lib/commons-cli-commons-cli-1.2.jar [5]
215-
- lib/commons-codec-commons-codec-1.6.jar [6]
214+
- lib/commons-cli-commons-cli-1.9.0.jar [5]
215+
- lib/commons-codec-commons-codec-1.18.0.jar [6]
216216
- lib/commons-configuration-commons-configuration-1.10.jar [7]
217-
- lib/commons-io-commons-io-2.7.jar [8]
217+
- lib/commons-io-commons-io-2.19.0.jar [8]
218218
- lib/commons-lang-commons-lang-2.6.jar [9]
219219
- lib/commons-logging-commons-logging-1.1.1.jar [10]
220220
- lib/io.netty-netty-buffer-4.1.119.Final.jar [11]
@@ -260,7 +260,7 @@ Apache Software License, Version 2.
260260
- lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17]
261261
- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17]
262262
- lib/org.apache.commons-commons-collections4-4.1.jar [19]
263-
- lib/org.apache.commons-commons-lang3-3.6.jar [20]
263+
- lib/org.apache.commons-commons-lang3-3.17.0.jar [58]
264264
- lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21]
265265
- lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21]
266266
- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21]
@@ -326,10 +326,10 @@ Apache Software License, Version 2.
326326
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
327327
[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1
328328
[4] Source available at https://github.com/google/guava/tree/v32.0.1
329-
[5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2
330-
[6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2
329+
[5] Source available at https://github.com/apache/commons-cli/tree/rel/commons-cli-1.9.0
330+
[6] Source available at https://github.com/apache/commons-codec/tree/rel/commons-codec-1.18.0
331331
[7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10
332-
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.7
332+
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0
333333
[9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6
334334
[10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1
335335
[11] Source available at https://github.com/netty/netty/tree/netty-4.1.119.Final
@@ -370,6 +370,7 @@ Apache Software License, Version 2.
370370
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
371371
[52] Source available at https://github.com/HdrHistogram/HdrHistogram/tree/HdrHistogram-2.1.10
372372
[53] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
373+
[58] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
373374

374375
------------------------------------------------------------------------------------
375376
lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies

bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ Apache Software License, Version 2.
211211
- lib/com.google.guava-guava-32.0.1-jre.jar [4]
212212
- lib/com.google.guava-failureaccess-1.0.1.jar [4]
213213
- lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4]
214-
- lib/commons-cli-commons-cli-1.2.jar [5]
215-
- lib/commons-codec-commons-codec-1.6.jar [6]
214+
- lib/commons-cli-commons-cli-1.9.0.jar [5]
215+
- lib/commons-codec-commons-codec-1.18.0.jar [6]
216216
- lib/commons-configuration-commons-configuration-1.10.jar [7]
217-
- lib/commons-io-commons-io-2.7.jar [8]
217+
- lib/commons-io-commons-io-2.19.0.jar [8]
218218
- lib/commons-lang-commons-lang-2.6.jar [9]
219219
- lib/commons-logging-commons-logging-1.1.1.jar [10]
220220
- lib/io.netty-netty-buffer-4.1.119.Final.jar [11]
@@ -241,7 +241,7 @@ Apache Software License, Version 2.
241241
- lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16]
242242
- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16]
243243
- lib/org.apache.commons-commons-collections4-4.1.jar [18]
244-
- lib/org.apache.commons-commons-lang3-3.6.jar [19]
244+
- lib/org.apache.commons-commons-lang3-3.17.0.jar [55]
245245
- lib/org.apache.zookeeper-zookeeper-3.9.3.jar [20]
246246
- lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [20]
247247
- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [20]
@@ -293,10 +293,10 @@ Apache Software License, Version 2.
293293
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
294294
[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1
295295
[4] Source available at https://github.com/google/guava/tree/v32.0.1
296-
[5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2
297-
[6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2
296+
[5] Source available at https://github.com/apache/commons-cli/tree/rel/commons-cli-1.9.0
297+
[6] Source available at https://github.com/apache/commons-codec/tree/rel/commons-codec-1.18.0
298298
[7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10
299-
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.7
299+
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0
300300
[9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6
301301
[10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1
302302
[11] Source available at https://github.com/netty/netty/tree/netty-4.1.119.Final
@@ -328,7 +328,7 @@ Apache Software License, Version 2.
328328
[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5
329329
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
330330
[52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
331-
331+
[55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
332332
------------------------------------------------------------------------------------
333333
lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies
334334

bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ Apache Software License, Version 2.
211211
- lib/com.google.guava-guava-32.0.1-jre.jar [4]
212212
- lib/com.google.guava-failureaccess-1.0.1.jar [4]
213213
- lib/com.google.guava-listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar [4]
214-
- lib/commons-cli-commons-cli-1.2.jar [5]
215-
- lib/commons-codec-commons-codec-1.6.jar [6]
214+
- lib/commons-cli-commons-cli-1.9.0.jar [5]
215+
- lib/commons-codec-commons-codec-1.18.0.jar [6]
216216
- lib/commons-configuration-commons-configuration-1.10.jar [7]
217-
- lib/commons-io-commons-io-2.7.jar [8]
217+
- lib/commons-io-commons-io-2.19.0.jar [8]
218218
- lib/commons-lang-commons-lang-2.6.jar [9]
219219
- lib/commons-logging-commons-logging-1.1.1.jar [10]
220220
- lib/io.netty-netty-buffer-4.1.119.Final.jar [11]
@@ -260,7 +260,7 @@ Apache Software License, Version 2.
260260
- lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17]
261261
- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17]
262262
- lib/org.apache.commons-commons-collections4-4.1.jar [19]
263-
- lib/org.apache.commons-commons-lang3-3.6.jar [20]
263+
- lib/org.apache.commons-commons-lang3-3.17.0.jar [57]
264264
- lib/org.apache.zookeeper-zookeeper-3.9.3.jar [21]
265265
- lib/org.apache.zookeeper-zookeeper-jute-3.9.3.jar [21]
266266
- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [21]
@@ -322,10 +322,10 @@ Apache Software License, Version 2.
322322
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
323323
[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1
324324
[4] Source available at https://github.com/google/guava/tree/v32.0.1
325-
[5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2
326-
[6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2
325+
[5] Source available at https://github.com/apache/commons-cli/tree/rel/commons-cli-1.9.0
326+
[6] Source available at https://github.com/apache/commons-codec/tree/rel/commons-codec-1.18.0
327327
[7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10
328-
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.7
328+
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0
329329
[9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6
330330
[10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1
331331
[11] Source available at https://github.com/netty/netty/tree/netty-4.1.119.Final
@@ -365,6 +365,7 @@ Apache Software License, Version 2.
365365
[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5
366366
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
367367
[52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
368+
[57] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
368369

369370
------------------------------------------------------------------------------------
370371
lib/io.netty-netty-codec-4.1.119.Final.jar bundles some 3rd party dependencies

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@
118118
<arquillian-cube.version>1.18.2</arquillian-cube.version>
119119
<arquillian-junit.version>1.8.0.Final</arquillian-junit.version>
120120
<codahale.metrics.version>3.0.1</codahale.metrics.version>
121-
<commons-cli.version>1.2</commons-cli.version>
121+
<commons-cli.version>1.9.0</commons-cli.version>
122122
<commons-collections4.version>4.1</commons-collections4.version>
123-
<commons-codec.version>1.6</commons-codec.version>
123+
<commons-codec.version>1.18.0</commons-codec.version>
124124
<commons-configuration.version>1.10</commons-configuration.version>
125-
<commons-compress.version>1.26.0</commons-compress.version>
125+
<commons-compress.version>1.27.1</commons-compress.version>
126126
<commons-lang.version>2.6</commons-lang.version>
127-
<commons-lang3.version>3.6</commons-lang3.version>
128-
<commons-io.version>2.7</commons-io.version>
127+
<commons-lang3.version>3.17.0</commons-lang3.version>
128+
<commons-io.version>2.19.0</commons-io.version>
129129
<bouncycastle.version>1.0.2.4</bouncycastle.version>
130130
<curator.version>5.7.1</curator.version>
131131
<dropwizard.version>4.1.12.1</dropwizard.version>

0 commit comments

Comments
 (0)