Skip to content

Commit 45def39

Browse files
authored
[improve][broker] Upgrade bookkeeper to 4.17.3 (#25166)
1 parent 7b87a6a commit 45def39

4 files changed

Lines changed: 34 additions & 35 deletions

File tree

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

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -356,32 +356,33 @@ The Apache Software License, Version 2.0
356356
- net.java.dev.jna-jna-jpms-5.18.1.jar
357357
- net.java.dev.jna-jna-platform-jpms-5.18.1.jar
358358
* BookKeeper
359-
- org.apache.bookkeeper-bookkeeper-common-4.17.2.jar
360-
- org.apache.bookkeeper-bookkeeper-common-allocator-4.17.2.jar
361-
- org.apache.bookkeeper-bookkeeper-proto-4.17.2.jar
362-
- org.apache.bookkeeper-bookkeeper-server-4.17.2.jar
363-
- org.apache.bookkeeper-bookkeeper-tools-framework-4.17.2.jar
364-
- org.apache.bookkeeper-circe-checksum-4.17.2.jar
365-
- org.apache.bookkeeper-cpu-affinity-4.17.2.jar
366-
- org.apache.bookkeeper-statelib-4.17.2.jar
367-
- org.apache.bookkeeper-stream-storage-api-4.17.2.jar
368-
- org.apache.bookkeeper-stream-storage-common-4.17.2.jar
369-
- org.apache.bookkeeper-stream-storage-java-client-4.17.2.jar
370-
- org.apache.bookkeeper-stream-storage-java-client-base-4.17.2.jar
371-
- org.apache.bookkeeper-stream-storage-proto-4.17.2.jar
372-
- org.apache.bookkeeper-stream-storage-server-4.17.2.jar
373-
- org.apache.bookkeeper-stream-storage-service-api-4.17.2.jar
374-
- org.apache.bookkeeper-stream-storage-service-impl-4.17.2.jar
375-
- org.apache.bookkeeper.http-http-server-4.17.2.jar
376-
- org.apache.bookkeeper.http-vertx-http-server-4.17.2.jar
377-
- org.apache.bookkeeper.stats-bookkeeper-stats-api-4.17.2.jar
378-
- org.apache.distributedlog-distributedlog-common-4.17.2.jar
379-
- org.apache.distributedlog-distributedlog-core-4.17.2-tests.jar
380-
- org.apache.distributedlog-distributedlog-core-4.17.2.jar
381-
- org.apache.distributedlog-distributedlog-protocol-4.17.2.jar
382-
- org.apache.bookkeeper-bookkeeper-slogger-api-4.17.2.jar
383-
- org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.17.2.jar
384-
- org.apache.bookkeeper-native-io-4.17.2.jar
359+
- org.apache.bookkeeper-bookkeeper-common-4.17.3.jar
360+
- org.apache.bookkeeper-bookkeeper-common-allocator-4.17.3.jar
361+
- org.apache.bookkeeper-bookkeeper-proto-4.17.3.jar
362+
- org.apache.bookkeeper-bookkeeper-server-4.17.3.jar
363+
- org.apache.bookkeeper-bookkeeper-tools-framework-4.17.3.jar
364+
- org.apache.bookkeeper-circe-checksum-4.17.3.jar
365+
- org.apache.bookkeeper-cpu-affinity-4.17.3.jar
366+
- org.apache.bookkeeper-statelib-4.17.3.jar
367+
- org.apache.bookkeeper-stream-storage-api-4.17.3.jar
368+
- org.apache.bookkeeper-stream-storage-common-4.17.3.jar
369+
- org.apache.bookkeeper-stream-storage-java-client-4.17.3.jar
370+
- org.apache.bookkeeper-stream-storage-java-client-base-4.17.3.jar
371+
- org.apache.bookkeeper-stream-storage-proto-4.17.3.jar
372+
- org.apache.bookkeeper-stream-storage-server-4.17.3.jar
373+
- org.apache.bookkeeper-stream-storage-service-api-4.17.3.jar
374+
- org.apache.bookkeeper-stream-storage-service-impl-4.17.3.jar
375+
- org.apache.bookkeeper.http-http-server-4.17.3.jar
376+
- org.apache.bookkeeper.http-vertx-http-server-4.17.3.jar
377+
- org.apache.bookkeeper.stats-bookkeeper-stats-api-4.17.3.jar
378+
- org.apache.distributedlog-distributedlog-common-4.17.3.jar
379+
- org.apache.distributedlog-distributedlog-core-4.17.3-tests.jar
380+
- org.apache.distributedlog-distributedlog-core-4.17.3.jar
381+
- org.apache.distributedlog-distributedlog-protocol-4.17.3.jar
382+
- org.apache.bookkeeper-bookkeeper-slogger-api-4.17.3.jar
383+
- org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.17.3.jar
384+
- org.apache.bookkeeper-native-io-4.17.3.jar
385+
- at.yawk.lz4-lz4-java-1.10.2.jar
385386
* Apache HTTP Client
386387
- org.apache.httpcomponents-httpclient-4.5.13.jar
387388
- org.apache.httpcomponents-httpcore-4.4.15.jar
@@ -552,7 +553,7 @@ The Apache Software License, Version 2.0
552553
- io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java17-2.21.0-alpha.jar
553554
- io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-2.21.0-alpha.jar
554555
- io.opentelemetry.semconv-opentelemetry-semconv-1.37.0.jar
555-
- com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar
556+
- com.google.cloud.opentelemetry-detector-resources-support-0.36.0.jar
556557
- io.opentelemetry.contrib-opentelemetry-gcp-resources-1.48.0-alpha.jar
557558
* Spotify completable-futures
558559
- com.spotify-completable-futures-0.3.6.jar

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,9 @@ The Apache Software License, Version 2.0
340340
* Apache Commons
341341
- commons-codec-1.20.0.jar
342342
- commons-io-2.21.0.jar
343-
- commons-logging-1.3.5.jar
344343
- commons-lang3-3.19.0.jar
345344
- commons-text-1.14.0.jar
346345
- commons-compress-1.28.0.jar
347-
- commons-beanutils-1.11.0.jar
348-
- commons-configuration2-2.12.0.jar
349346
* Netty
350347
- netty-buffer-4.1.130.Final.jar
351348
- netty-codec-4.1.130.Final.jar
@@ -394,9 +391,9 @@ The Apache Software License, Version 2.0
394391
- opentelemetry-context-1.56.0.jar
395392

396393
* BookKeeper
397-
- bookkeeper-common-allocator-4.17.2.jar
398-
- cpu-affinity-4.17.2.jar
399-
- circe-checksum-4.17.2.jar
394+
- bookkeeper-common-allocator-4.17.3.jar
395+
- cpu-affinity-4.17.3.jar
396+
- circe-checksum-4.17.3.jar
400397
* AirCompressor
401398
- aircompressor-0.27.jar
402399
* AsyncHttpClient

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ flexible messaging model and an intuitive client API.</description>
182182
<!-- apache commons -->
183183
<commons-compress.version>1.28.0</commons-compress.version>
184184

185-
<bookkeeper.version>4.17.2</bookkeeper.version>
185+
<bookkeeper.version>4.17.3</bookkeeper.version>
186186
<zookeeper.version>3.9.4</zookeeper.version>
187187
<commons-cli.version>1.11.0</commons-cli.version>
188188
<commons-text.version>1.14.0</commons-text.version>

testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockBookKeeper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ public void asyncCreateLedger(int ensSize, int qSize, DigestType digestType, byt
176176
}
177177

178178
@Override
179-
public void asyncOpenLedger(long lId, DigestType digestType, byte[] passwd, OpenCallback cb, Object ctx) {
179+
public void asyncOpenLedger(long lId, DigestType digestType, byte[] passwd, OpenCallback cb, Object ctx,
180+
boolean keepUpdateMetadata) {
180181
getProgrammedFailure().thenComposeAsync((res) -> {
181182
PulsarMockLedgerHandle lh = ledgers.get(lId);
182183
if (lh == null) {

0 commit comments

Comments
 (0)