This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new c6446bd9efb [improve][broker] Upgrade bookkeeper to 4.17.3 (#25166)
c6446bd9efb is described below
commit c6446bd9efb102f4a04ed905bb229444a8979efa
Author: Yong Zhang <[email protected]>
AuthorDate: Wed Jan 21 13:22:59 2026 +0800
[improve][broker] Upgrade bookkeeper to 4.17.3 (#25166)
(cherry picked from commit 45def39b12be0d760b700c2e5da085773e09ba3d)
---
distribution/server/src/assemble/LICENSE.bin.txt | 59 +++++++++++-----------
distribution/shell/src/assemble/LICENSE.bin.txt | 9 ++--
pom.xml | 7 ++-
.../bookkeeper/client/PulsarMockBookKeeper.java | 3 +-
4 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index 777731f6f64..f44793393d7 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -357,34 +357,35 @@ 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
+ - 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
@@ -540,7 +541,7 @@ The Apache Software License, Version 2.0
-
io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java17-1.33.6-alpha.jar
-
io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-1.33.6-alpha.jar
- io.opentelemetry.semconv-opentelemetry-semconv-1.29.0-alpha.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
diff --git a/distribution/shell/src/assemble/LICENSE.bin.txt
b/distribution/shell/src/assemble/LICENSE.bin.txt
index 9afb311d3d0..447f51a0b91 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
@@ -393,9 +390,9 @@ The Apache Software License, Version 2.0
- opentelemetry-context-1.45.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 3dfdc566df9..dcfb52d9fd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@ flexible messaging model and an intuitive client
API.</description>
<!-- apache commons -->
<commons-compress.version>1.28.0</commons-compress.version>
- <bookkeeper.version>4.17.2</bookkeeper.version>
+ <bookkeeper.version>4.17.3</bookkeeper.version>
<zookeeper.version>3.9.4</zookeeper.version>
<commons-cli.version>1.11.0</commons-cli.version>
<commons-text.version>1.14.0</commons-text.version>
@@ -649,6 +649,11 @@ flexible messaging model and an intuitive client
API.</description>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
+ <!-- this can be removed after upgrading OpenTelemetry to version
1.52.0 or higher -->
+ <exclusion>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-common</artifactId>
+ </exclusion>
</exclusions>
</dependency>
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 360d82e0791..c1f53d0adff 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 class PulsarMockBookKeeper extends BookKeeper {
}
@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) {
