From 4056720f1c259d37667386e0edcbe9ae2766c376 Mon Sep 17 00:00:00 2001 From: zymap Date: Tue, 13 Jan 2026 15:04:00 +0800 Subject: [PATCH 1/8] [improve][broker] Upgrade bookkeeper to 4.17.3 --- .../server/src/assemble/LICENSE.bin.txt | 56 +++++++++---------- .../shell/src/assemble/LICENSE.bin.txt | 6 +- pom.xml | 2 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index a2c0cc8fff773..076adb6b58799 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -357,34 +357,34 @@ The Apache Software License, Version 2.0 - net.java.dev.jna-jna-jpms-5.12.1.jar - net.java.dev.jna-jna-platform-jpms-5.12.1.jar * BookKeeper - - org.apache.bookkeeper-bookkeeper-common-4.17.2.jar - - org.apache.bookkeeper-bookkeeper-common-allocator-4.17.2.jar - - org.apache.bookkeeper-bookkeeper-proto-4.17.2.jar - - org.apache.bookkeeper-bookkeeper-server-4.17.2.jar - - org.apache.bookkeeper-bookkeeper-tools-framework-4.17.2.jar - - org.apache.bookkeeper-circe-checksum-4.17.2.jar - - org.apache.bookkeeper-cpu-affinity-4.17.2.jar - - org.apache.bookkeeper-statelib-4.17.2.jar - - org.apache.bookkeeper-stream-storage-api-4.17.2.jar - - org.apache.bookkeeper-stream-storage-common-4.17.2.jar - - org.apache.bookkeeper-stream-storage-java-client-4.17.2.jar - - org.apache.bookkeeper-stream-storage-java-client-base-4.17.2.jar - - org.apache.bookkeeper-stream-storage-proto-4.17.2.jar - - org.apache.bookkeeper-stream-storage-server-4.17.2.jar - - org.apache.bookkeeper-stream-storage-service-api-4.17.2.jar - - org.apache.bookkeeper-stream-storage-service-impl-4.17.2.jar - - org.apache.bookkeeper.http-http-server-4.17.2.jar - - org.apache.bookkeeper.http-vertx-http-server-4.17.2.jar - - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.17.2.jar - - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.17.2.jar - - org.apache.distributedlog-distributedlog-common-4.17.2.jar - - org.apache.distributedlog-distributedlog-core-4.17.2-tests.jar - - org.apache.distributedlog-distributedlog-core-4.17.2.jar - - org.apache.distributedlog-distributedlog-protocol-4.17.2.jar - - org.apache.bookkeeper.stats-codahale-metrics-provider-4.17.2.jar - - org.apache.bookkeeper-bookkeeper-slogger-api-4.17.2.jar - - org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.17.2.jar - - org.apache.bookkeeper-native-io-4.17.2.jar + - org.apache.bookkeeper-bookkeeper-common-4.17.3.jar + - org.apache.bookkeeper-bookkeeper-common-allocator-4.17.3.jar + - org.apache.bookkeeper-bookkeeper-proto-4.17.3.jar + - org.apache.bookkeeper-bookkeeper-server-4.17.3.jar + - org.apache.bookkeeper-bookkeeper-tools-framework-4.17.3.jar + - org.apache.bookkeeper-circe-checksum-4.17.3.jar + - org.apache.bookkeeper-cpu-affinity-4.17.3.jar + - org.apache.bookkeeper-statelib-4.17.3.jar + - org.apache.bookkeeper-stream-storage-api-4.17.3.jar + - org.apache.bookkeeper-stream-storage-common-4.17.3.jar + - org.apache.bookkeeper-stream-storage-java-client-4.17.3.jar + - org.apache.bookkeeper-stream-storage-java-client-base-4.17.3.jar + - org.apache.bookkeeper-stream-storage-proto-4.17.3.jar + - org.apache.bookkeeper-stream-storage-server-4.17.3.jar + - org.apache.bookkeeper-stream-storage-service-api-4.17.3.jar + - org.apache.bookkeeper-stream-storage-service-impl-4.17.3.jar + - org.apache.bookkeeper.http-http-server-4.17.3.jar + - org.apache.bookkeeper.http-vertx-http-server-4.17.3.jar + - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.17.3.jar + - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.17.3.jar + - org.apache.distributedlog-distributedlog-common-4.17.3.jar + - org.apache.distributedlog-distributedlog-core-4.17.3-tests.jar + - org.apache.distributedlog-distributedlog-core-4.17.3.jar + - org.apache.distributedlog-distributedlog-protocol-4.17.3.jar + - org.apache.bookkeeper.stats-codahale-metrics-provider-4.17.3.jar + - org.apache.bookkeeper-bookkeeper-slogger-api-4.17.3.jar + - org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.17.3.jar + - org.apache.bookkeeper-native-io-4.17.3.jar * Apache HTTP Client - org.apache.httpcomponents-httpclient-4.5.13.jar - org.apache.httpcomponents-httpcore-4.4.15.jar diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index 32f2078f9d0a0..e30b63ad8fd54 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -394,9 +394,9 @@ The Apache Software License, Version 2.0 - opentelemetry-context-1.56.0.jar * BookKeeper - - bookkeeper-common-allocator-4.17.2.jar - - cpu-affinity-4.17.2.jar - - circe-checksum-4.17.2.jar + - bookkeeper-common-allocator-4.17.3.jar + - cpu-affinity-4.17.3.jar + - circe-checksum-4.17.3.jar * AirCompressor - aircompressor-0.27.jar * AsyncHttpClient diff --git a/pom.xml b/pom.xml index 3f4587dc2445c..848f63c7b0500 100644 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ flexible messaging model and an intuitive client API. 1.28.0 - 4.17.2 + 4.17.3 3.9.4 1.11.0 1.14.0 From 321f2ad9b213cfef09b20e1528c9ac7a4fe105a5 Mon Sep 17 00:00:00 2001 From: zymap Date: Tue, 13 Jan 2026 16:05:27 +0800 Subject: [PATCH 2/8] Update --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 848f63c7b0500..9e6a3eb9087ad 100644 --- a/pom.xml +++ b/pom.xml @@ -3129,6 +3129,14 @@ flexible messaging model and an intuitive client API. + + bk-staging + bk-staging + https://repository.apache.org/content/repositories/orgapachebookkeeper-1103/ + + false + + central default From fb3be090867e498fa620a917b6bd5d937de5595e Mon Sep 17 00:00:00 2001 From: zymap Date: Tue, 13 Jan 2026 16:21:12 +0800 Subject: [PATCH 3/8] Fix build --- distribution/server/src/assemble/LICENSE.bin.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 076adb6b58799..1cec276b19d05 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -540,7 +540,7 @@ The Apache Software License, Version 2.0 - io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java17-2.21.0-alpha.jar - io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-2.21.0-alpha.jar - io.opentelemetry.semconv-opentelemetry-semconv-1.37.0.jar - - com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar + - com.google.cloud.opentelemetry-detector-resources-support-0.36.0.jar - io.opentelemetry.contrib-opentelemetry-gcp-resources-1.48.0-alpha.jar * Spotify completable-futures - com.spotify-completable-futures-0.3.6.jar From 9ff62314c162a1da5c9d553c7399d0d927a3d0ee Mon Sep 17 00:00:00 2001 From: zymap Date: Tue, 13 Jan 2026 16:48:18 +0800 Subject: [PATCH 4/8] Fix build --- distribution/server/src/assemble/LICENSE.bin.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 1cec276b19d05..e0b5730c02fe7 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -385,6 +385,7 @@ The Apache Software License, Version 2.0 - org.apache.bookkeeper-bookkeeper-slogger-api-4.17.3.jar - org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.17.3.jar - org.apache.bookkeeper-native-io-4.17.3.jar + - at.yawk.lz4-lz4-java-1.10.2.jar * Apache HTTP Client - org.apache.httpcomponents-httpclient-4.5.13.jar - org.apache.httpcomponents-httpcore-4.4.15.jar From c3050d3a89465e960debecc3c4ee81677f1f0f5d Mon Sep 17 00:00:00 2001 From: zymap Date: Tue, 13 Jan 2026 19:05:40 +0800 Subject: [PATCH 5/8] Fix test --- .../org/apache/bookkeeper/client/PulsarMockBookKeeper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockBookKeeper.java b/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockBookKeeper.java index 360d82e079193..c1f53d0adff1e 100644 --- a/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockBookKeeper.java +++ b/testmocks/src/main/java/org/apache/bookkeeper/client/PulsarMockBookKeeper.java @@ -176,7 +176,8 @@ public void asyncCreateLedger(int ensSize, int qSize, DigestType digestType, byt } @Override - public void asyncOpenLedger(long lId, DigestType digestType, byte[] passwd, OpenCallback cb, Object ctx) { + public void asyncOpenLedger(long lId, DigestType digestType, byte[] passwd, OpenCallback cb, Object ctx, + boolean keepUpdateMetadata) { getProgrammedFailure().thenComposeAsync((res) -> { PulsarMockLedgerHandle lh = ledgers.get(lId); if (lh == null) { From 3b93e0245cec35fb396a5c80b5fc8801156f3626 Mon Sep 17 00:00:00 2001 From: zymap Date: Tue, 13 Jan 2026 19:32:42 +0800 Subject: [PATCH 6/8] Fix the license issue --- distribution/shell/src/assemble/LICENSE.bin.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt b/distribution/shell/src/assemble/LICENSE.bin.txt index e30b63ad8fd54..7d546833a34eb 100644 --- a/distribution/shell/src/assemble/LICENSE.bin.txt +++ b/distribution/shell/src/assemble/LICENSE.bin.txt @@ -340,12 +340,9 @@ The Apache Software License, Version 2.0 * Apache Commons - commons-codec-1.20.0.jar - commons-io-2.21.0.jar - - commons-logging-1.3.5.jar - commons-lang3-3.19.0.jar - commons-text-1.14.0.jar - commons-compress-1.28.0.jar - - commons-beanutils-1.11.0.jar - - commons-configuration2-2.12.0.jar * Netty - netty-buffer-4.1.130.Final.jar - netty-codec-4.1.130.Final.jar From a7f80e3746bff13ebdb1e9088e82cea3de3dd698 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Tue, 20 Jan 2026 16:36:44 +0800 Subject: [PATCH 7/8] Apply suggestion from @zymap --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 9e6a3eb9087ad..848f63c7b0500 100644 --- a/pom.xml +++ b/pom.xml @@ -3129,14 +3129,6 @@ flexible messaging model and an intuitive client API. - - bk-staging - bk-staging - https://repository.apache.org/content/repositories/orgapachebookkeeper-1103/ - - false - - central default From 7528944ef739bb29f287619a42494baa709356c7 Mon Sep 17 00:00:00 2001 From: zymap Date: Wed, 21 Jan 2026 09:57:31 +0800 Subject: [PATCH 8/8] Fix license --- distribution/server/src/assemble/LICENSE.bin.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 41665eaf0b240..2681865291330 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -375,12 +375,10 @@ The Apache Software License, Version 2.0 - org.apache.bookkeeper.http-http-server-4.17.3.jar - org.apache.bookkeeper.http-vertx-http-server-4.17.3.jar - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.17.3.jar - - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.17.3.jar - org.apache.distributedlog-distributedlog-common-4.17.3.jar - org.apache.distributedlog-distributedlog-core-4.17.3-tests.jar - org.apache.distributedlog-distributedlog-core-4.17.3.jar - org.apache.distributedlog-distributedlog-protocol-4.17.3.jar - - org.apache.bookkeeper.stats-codahale-metrics-provider-4.17.3.jar - org.apache.bookkeeper-bookkeeper-slogger-api-4.17.3.jar - org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.17.3.jar - org.apache.bookkeeper-native-io-4.17.3.jar