Skip to content

Commit 1378918

Browse files
committed
Fix Apache Commons library compatibility
1 parent 52653af commit 1378918

File tree

4 files changed

+29
-27
lines changed

4 files changed

+29
-27
lines changed

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

+8-7
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.17.0.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.115.Final.jar [11]
@@ -260,7 +260,7 @@ Apache Software License, Version 2.
260260
- lib/org.apache.logging.log4j-log4j-core-2.23.1.jar [17]
261261
- lib/org.apache.logging.log4j-log4j-slf4j2-impl-2.23.1.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]
@@ -361,10 +361,10 @@ Apache Software License, Version 2.
361361
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
362362
[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1
363363
[4] Source available at https://github.com/google/guava/tree/v32.0.1
364-
[5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2
365-
[6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2
364+
[5] Source available at https://github.com/apache/commons-cli/tree/rel/commons-cli-1.9.0
365+
[6] Source available at https://github.com/apache/commons-codec/tree/rel/commons-codec-1.18.0
366366
[7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10
367-
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.17.0
367+
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0
368368
[9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6
369369
[10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1
370370
[11] Source available at https://github.com/netty/netty/tree/netty-4.1.115.Final
@@ -409,6 +409,7 @@ Apache Software License, Version 2.
409409
[55] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.26.0
410410
[56] Source available at https://github.com/JetBrains/kotlin/releases/tag/v1.8.21
411411
[57] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0
412+
[58] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
412413

413414
------------------------------------------------------------------------------------
414415
lib/io.netty-netty-codec-4.1.115.Final.jar bundles some 3rd party dependencies

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

+8-8
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.17.0.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.115.Final.jar [11]
@@ -241,7 +241,7 @@ Apache Software License, Version 2.
241241
- lib/org.apache.logging.log4j-log4j-core-2.23.1.jar [16]
242242
- lib/org.apache.logging.log4j-log4j-slf4j2-impl-2.23.1.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]
@@ -316,10 +316,10 @@ Apache Software License, Version 2.
316316
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
317317
[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1
318318
[4] Source available at https://github.com/google/guava/tree/v32.0.1
319-
[5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2
320-
[6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2
319+
[5] Source available at https://github.com/apache/commons-cli/tree/rel/commons-cli-1.9.0
320+
[6] Source available at https://github.com/apache/commons-codec/tree/rel/commons-codec-1.18.0
321321
[7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10
322-
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.17.0
322+
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0
323323
[9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6
324324
[10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1
325325
[11] Source available at https://github.com/netty/netty/tree/netty-4.1.115.Final
@@ -353,7 +353,7 @@ Apache Software License, Version 2.
353353
[52] Source available at https://github.com/carrotsearch/hppc/tree/0.9.1
354354
[53] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0
355355
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.26.0
356-
356+
[55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
357357
------------------------------------------------------------------------------------
358358
lib/io.netty-netty-codec-4.1.115.Final.jar bundles some 3rd party dependencies
359359

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

+8-7
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.17.0.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.115.Final.jar [11]
@@ -260,7 +260,7 @@ Apache Software License, Version 2.
260260
- lib/org.apache.logging.log4j-log4j-core-2.23.1.jar [17]
261261
- lib/org.apache.logging.log4j-log4j-slf4j2-impl-2.23.1.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]
@@ -357,10 +357,10 @@ Apache Software License, Version 2.
357357
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
358358
[3] Source available at https://github.com/FasterXML/jackson-databind/tree/jackson-databind-2.17.1
359359
[4] Source available at https://github.com/google/guava/tree/v32.0.1
360-
[5] Source available at https://github.com/apache/commons-cli/tree/cli-1.2
361-
[6] Source available at https://github.com/apache/commons-codec/tree/commons-codec-1.6-RC2
360+
[5] Source available at https://github.com/apache/commons-cli/tree/rel/commons-cli-1.9.0
361+
[6] Source available at https://github.com/apache/commons-codec/tree/rel/commons-codec-1.18.0
362362
[7] Source available at https://github.com/apache/commons-configuration/tree/CONFIGURATION_1_10
363-
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.17.0
363+
[8] Source available at https://github.com/apache/commons-io/tree/rel/commons-io-2.19.0
364364
[9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6
365365
[10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1
366366
[11] Source available at https://github.com/netty/netty/tree/netty-4.1.115.Final
@@ -404,6 +404,7 @@ Apache Software License, Version 2.
404404
[54] Source available at https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.26.0
405405
[55] Source available at https://github.com/JetBrains/kotlin/releases/tag/v1.8.21
406406
[56] Source available at https://github.com/LMAX-Exchange/disruptor/releases/tag/4.0.0
407+
[57] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
407408

408409
------------------------------------------------------------------------------------
409410
lib/io.netty-netty-codec-4.1.115.Final.jar bundles some 3rd party dependencies

Diff for: pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@
120120
<arquillian-junit.version>1.8.0.Final</arquillian-junit.version>
121121
<bc-non-fips.version>1.78</bc-non-fips.version>
122122
<codahale.metrics.version>3.0.1</codahale.metrics.version>
123-
<commons-cli.version>1.2</commons-cli.version>
123+
<commons-cli.version>1.9.0</commons-cli.version>
124124
<commons-collections4.version>4.1</commons-collections4.version>
125-
<commons-codec.version>1.6</commons-codec.version>
125+
<commons-codec.version>1.18.0</commons-codec.version>
126126
<commons-configuration.version>1.10</commons-configuration.version>
127-
<commons-compress.version>1.26.0</commons-compress.version>
127+
<commons-compress.version>1.27.1</commons-compress.version>
128128
<commons-lang.version>2.6</commons-lang.version>
129-
<commons-lang3.version>3.6</commons-lang3.version>
130-
<commons-io.version>2.17.0</commons-io.version>
129+
<commons-lang3.version>3.17.0</commons-lang3.version>
130+
<commons-io.version>2.19.0</commons-io.version>
131131
<bouncycastle.version>1.0.2.5</bouncycastle.version>
132132
<curator.version>5.7.1</curator.version>
133133
<disruptor.version>4.0.0</disruptor.version>

0 commit comments

Comments
 (0)