This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new c2bb2e59e9e [improve][broker][branch-3.0] Upgrade BookKeeper to 4.16.7
c2bb2e59e9e is described below
commit c2bb2e59e9ea04d3fc1e00cd82ec3dea8048c24e
Author: Lari Hotari <[email protected]>
AuthorDate: Thu Jul 17 18:20:29 2025 +0300
[improve][broker][branch-3.0] Upgrade BookKeeper to 4.16.7
---
distribution/server/src/assemble/LICENSE.bin.txt | 56 +++++++++++-----------
distribution/shell/src/assemble/LICENSE.bin.txt | 6 +--
pom.xml | 2 +-
.../metadata/impl/PulsarZooKeeperClient.java | 5 +-
pulsar-sql/presto-distribution/LICENSE | 30 ++++++------
5 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index f331f1f11eb..f95893b810c 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -345,34 +345,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.16.6.jar
- - org.apache.bookkeeper-bookkeeper-common-allocator-4.16.6.jar
- - org.apache.bookkeeper-bookkeeper-proto-4.16.6.jar
- - org.apache.bookkeeper-bookkeeper-server-4.16.6.jar
- - org.apache.bookkeeper-bookkeeper-tools-framework-4.16.6.jar
- - org.apache.bookkeeper-circe-checksum-4.16.6.jar
- - org.apache.bookkeeper-cpu-affinity-4.16.6.jar
- - org.apache.bookkeeper-statelib-4.16.6.jar
- - org.apache.bookkeeper-stream-storage-api-4.16.6.jar
- - org.apache.bookkeeper-stream-storage-common-4.16.6.jar
- - org.apache.bookkeeper-stream-storage-java-client-4.16.6.jar
- - org.apache.bookkeeper-stream-storage-java-client-base-4.16.6.jar
- - org.apache.bookkeeper-stream-storage-proto-4.16.6.jar
- - org.apache.bookkeeper-stream-storage-server-4.16.6.jar
- - org.apache.bookkeeper-stream-storage-service-api-4.16.6.jar
- - org.apache.bookkeeper-stream-storage-service-impl-4.16.6.jar
- - org.apache.bookkeeper.http-http-server-4.16.6.jar
- - org.apache.bookkeeper.http-vertx-http-server-4.16.6.jar
- - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.16.6.jar
- - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.16.6.jar
- - org.apache.distributedlog-distributedlog-common-4.16.6.jar
- - org.apache.distributedlog-distributedlog-core-4.16.6-tests.jar
- - org.apache.distributedlog-distributedlog-core-4.16.6.jar
- - org.apache.distributedlog-distributedlog-protocol-4.16.6.jar
- - org.apache.bookkeeper.stats-codahale-metrics-provider-4.16.6.jar
- - org.apache.bookkeeper-bookkeeper-slogger-api-4.16.6.jar
- - org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.16.6.jar
- - org.apache.bookkeeper-native-io-4.16.6.jar
+ - org.apache.bookkeeper-bookkeeper-common-4.16.7.jar
+ - org.apache.bookkeeper-bookkeeper-common-allocator-4.16.7.jar
+ - org.apache.bookkeeper-bookkeeper-proto-4.16.7.jar
+ - org.apache.bookkeeper-bookkeeper-server-4.16.7.jar
+ - org.apache.bookkeeper-bookkeeper-tools-framework-4.16.7.jar
+ - org.apache.bookkeeper-circe-checksum-4.16.7.jar
+ - org.apache.bookkeeper-cpu-affinity-4.16.7.jar
+ - org.apache.bookkeeper-statelib-4.16.7.jar
+ - org.apache.bookkeeper-stream-storage-api-4.16.7.jar
+ - org.apache.bookkeeper-stream-storage-common-4.16.7.jar
+ - org.apache.bookkeeper-stream-storage-java-client-4.16.7.jar
+ - org.apache.bookkeeper-stream-storage-java-client-base-4.16.7.jar
+ - org.apache.bookkeeper-stream-storage-proto-4.16.7.jar
+ - org.apache.bookkeeper-stream-storage-server-4.16.7.jar
+ - org.apache.bookkeeper-stream-storage-service-api-4.16.7.jar
+ - org.apache.bookkeeper-stream-storage-service-impl-4.16.7.jar
+ - org.apache.bookkeeper.http-http-server-4.16.7.jar
+ - org.apache.bookkeeper.http-vertx-http-server-4.16.7.jar
+ - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.16.7.jar
+ - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.16.7.jar
+ - org.apache.distributedlog-distributedlog-common-4.16.7.jar
+ - org.apache.distributedlog-distributedlog-core-4.16.7-tests.jar
+ - org.apache.distributedlog-distributedlog-core-4.16.7.jar
+ - org.apache.distributedlog-distributedlog-protocol-4.16.7.jar
+ - org.apache.bookkeeper.stats-codahale-metrics-provider-4.16.7.jar
+ - org.apache.bookkeeper-bookkeeper-slogger-api-4.16.7.jar
+ - org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.16.7.jar
+ - org.apache.bookkeeper-native-io-4.16.7.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 f3cff534aea..c951a4901cb 100644
--- a/distribution/shell/src/assemble/LICENSE.bin.txt
+++ b/distribution/shell/src/assemble/LICENSE.bin.txt
@@ -390,9 +390,9 @@ The Apache Software License, Version 2.0
- log4j-web-2.18.0.jar
* BookKeeper
- - bookkeeper-common-allocator-4.16.6.jar
- - cpu-affinity-4.16.6.jar
- - circe-checksum-4.16.6.jar
+ - bookkeeper-common-allocator-4.16.7.jar
+ - cpu-affinity-4.16.7.jar
+ - circe-checksum-4.16.7.jar
* AirCompressor
- aircompressor-0.27.jar
* AsyncHttpClient
diff --git a/pom.xml b/pom.xml
index 1bab19edf08..48535a0bfc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@ flexible messaging model and an intuitive client
API.</description>
<!-- apache commons -->
<commons-compress.version>1.26.0</commons-compress.version>
- <bookkeeper.version>4.16.6</bookkeeper.version>
+ <bookkeeper.version>4.16.7</bookkeeper.version>
<zookeeper.version>3.9.3</zookeeper.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-text.version>1.10.0</commons-text.version>
diff --git
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
index cc29b615c11..0df1856fae7 100644
---
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
+++
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
@@ -240,8 +240,9 @@ public class PulsarZooKeeperClient extends ZooKeeper
implements Watcher, AutoClo
// Create a watcher manager
StatsLogger watcherStatsLogger = statsLogger.scope("watcher");
ZooKeeperWatcherBase watcherManager =
- null == watchers ? new
ZooKeeperWatcherBase(sessionTimeoutMs, watcherStatsLogger) :
- new ZooKeeperWatcherBase(sessionTimeoutMs,
watchers, watcherStatsLogger);
+ null == watchers
+ ? new ZooKeeperWatcherBase(sessionTimeoutMs,
allowReadOnlyMode, watcherStatsLogger) :
+ new ZooKeeperWatcherBase(sessionTimeoutMs,
allowReadOnlyMode, watchers, watcherStatsLogger);
PulsarZooKeeperClient client = new PulsarZooKeeperClient(
connectString,
sessionTimeoutMs,
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index bafe0943d8e..dc7433f2df1 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -423,21 +423,21 @@ The Apache Software License, Version 2.0
- async-http-client-2.12.4.jar
- async-http-client-netty-utils-2.12.4.jar
* Apache Bookkeeper
- - bookkeeper-common-4.16.6.jar
- - bookkeeper-common-allocator-4.16.6.jar
- - bookkeeper-proto-4.16.6.jar
- - bookkeeper-server-4.16.6.jar
- - bookkeeper-stats-api-4.16.6.jar
- - bookkeeper-tools-framework-4.16.6.jar
- - circe-checksum-4.16.6.jar
- - codahale-metrics-provider-4.16.6.jar
- - cpu-affinity-4.16.6.jar
- - http-server-4.16.6.jar
- - prometheus-metrics-provider-4.16.6.jar
- - codahale-metrics-provider-4.16.6.jar
- - bookkeeper-slogger-api-4.16.6.jar
- - bookkeeper-slogger-slf4j-4.16.6.jar
- - native-io-4.16.6.jar
+ - bookkeeper-common-4.16.7.jar
+ - bookkeeper-common-allocator-4.16.7.jar
+ - bookkeeper-proto-4.16.7.jar
+ - bookkeeper-server-4.16.7.jar
+ - bookkeeper-stats-api-4.16.7.jar
+ - bookkeeper-tools-framework-4.16.7.jar
+ - circe-checksum-4.16.7.jar
+ - codahale-metrics-provider-4.16.7.jar
+ - cpu-affinity-4.16.7.jar
+ - http-server-4.16.7.jar
+ - prometheus-metrics-provider-4.16.7.jar
+ - codahale-metrics-provider-4.16.7.jar
+ - bookkeeper-slogger-api-4.16.7.jar
+ - bookkeeper-slogger-slf4j-4.16.7.jar
+ - native-io-4.16.7.jar
* Apache Commons
- commons-cli-1.5.0.jar
- commons-codec-1.15.jar
