diff --git a/build/run_unit_group.sh b/build/run_unit_group.sh
index de6f40407ccf6..e81deb4b6ad45 100755
--- a/build/run_unit_group.sh
+++ b/build/run_unit_group.sh
@@ -163,7 +163,7 @@ function test_group_proxy() {
function test_group_other() {
mvn_test --clean --install \
- -pl '!org.apache.pulsar:distribution,!org.apache.pulsar:pulsar-offloader-distribution,!org.apache.pulsar:pulsar-server-distribution,!org.apache.pulsar:pulsar-io-distribution,!org.apache.pulsar:pulsar-all-docker-image' \
+ -pl '!com.ascentstream.pulsar:distribution,!com.ascentstream.pulsar:pulsar-offloader-distribution,!com.ascentstream.pulsar:pulsar-server-distribution,!com.ascentstream.pulsar:pulsar-io-distribution,!com.ascentstream.pulsar:pulsar-all-docker-image' \
-PskipTestsForUnitGroupOther -DdisableIoMainProfile=true -DdisableSqlMainProfile=true -DskipIntegrationTests \
-Dexclude='**/ManagedLedgerTest.java,
**/OffloadersCacheTest.java
diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
index e33ff17b00abc..4127e0b6afc4d 100644
--- a/distribution/server/pom.xml
+++ b/distribution/server/pom.xml
@@ -185,7 +185,7 @@
- org.apache.bookkeeper.stats
+ ${bookkeeper.groupId}.stats
prometheus-metrics-provider
@@ -275,7 +275,7 @@
- org.apache.bookkeeper.http
+ ${bookkeeper.groupId}.http
vertx-http-server
${bookkeeper.version}
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index e3749a10a9160..fb3862a8a1bb5 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -408,34 +408,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
+ - com.ascentstream.bookkeeper-bookkeeper-common-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-bookkeeper-common-allocator-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-bookkeeper-proto-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-bookkeeper-server-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-bookkeeper-tools-framework-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-circe-checksum-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-cpu-affinity-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-statelib-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-stream-storage-api-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-stream-storage-common-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-stream-storage-java-client-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-stream-storage-java-client-base-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-stream-storage-proto-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-stream-storage-server-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-stream-storage-service-api-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-stream-storage-service-impl-4.16.8.0.jar
+ - com.ascentstream.bookkeeper.http-http-server-4.16.8.0.jar
+ - com.ascentstream.bookkeeper.http-vertx-http-server-4.16.8.0.jar
+ - com.ascentstream.bookkeeper.stats-bookkeeper-stats-api-4.16.8.0.jar
+ - com.ascentstream.bookkeeper.stats-prometheus-metrics-provider-4.16.8.0.jar
+ - com.ascentstream.distributedlog-distributedlog-common-4.16.8.0.jar
+ - com.ascentstream.distributedlog-distributedlog-core-4.16.8.0-tests.jar
+ - com.ascentstream.distributedlog-distributedlog-core-4.16.8.0.jar
+ - com.ascentstream.distributedlog-distributedlog-protocol-4.16.8.0.jar
+ - com.ascentstream.bookkeeper.stats-codahale-metrics-provider-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-bookkeeper-slogger-api-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-bookkeeper-slogger-slf4j-4.16.8.0.jar
+ - com.ascentstream.bookkeeper-native-io-4.16.8.0.jar
* Apache HTTP Client
- org.apache.httpcomponents-httpclient-4.5.13.jar
- org.apache.httpcomponents-httpcore-4.4.15.jar
diff --git a/managed-ledger/pom.xml b/managed-ledger/pom.xml
index a8749fd99bd9e..fe8291aeee01c 100644
--- a/managed-ledger/pom.xml
+++ b/managed-ledger/pom.xml
@@ -34,17 +34,17 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-server
- org.apache.bookkeeper.stats
+ ${bookkeeper.groupId}.stats
prometheus-metrics-provider
- org.apache.bookkeeper.stats
+ ${bookkeeper.groupId}.stats
codahale-metrics-provider
${bookkeeper.version}
diff --git a/pom.xml b/pom.xml
index 0dc05be1b44c9..688e55e78f5dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,10 @@ flexible messaging model and an intuitive client API.
1.26.0
- 4.16.6
+ com.ascentstream
+ ${storage.groupId}.bookkeeper
+ ${storage.groupId}.distributedlog
+ 4.16.8.0
3.9.3
1.5.0
1.1.10.5
@@ -457,7 +460,7 @@ flexible messaging model and an intuitive client API.
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-server
${bookkeeper.version}
@@ -486,7 +489,7 @@ flexible messaging model and an intuitive client API.
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
cpu-affinity
${bookkeeper.version}
@@ -515,13 +518,13 @@ flexible messaging model and an intuitive client API.
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-common-allocator
${bookkeeper.version}
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-tools-framework
${bookkeeper.version}
@@ -535,7 +538,7 @@ flexible messaging model and an intuitive client API.
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
stream-storage-java-client
${bookkeeper.version}
@@ -572,7 +575,7 @@ flexible messaging model and an intuitive client API.
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
stream-storage-server
${bookkeeper.version}
@@ -611,19 +614,19 @@ flexible messaging model and an intuitive client API.
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-common
${bookkeeper.version}
- org.apache.bookkeeper.stats
+ ${bookkeeper.groupId}.stats
bookkeeper-stats-api
${bookkeeper.version}
- org.apache.bookkeeper.stats
+ ${bookkeeper.groupId}.stats
datasketches-metrics-provider
${bookkeeper.version}
@@ -635,7 +638,7 @@ flexible messaging model and an intuitive client API.
- org.apache.bookkeeper.stats
+ ${bookkeeper.groupId}.stats
prometheus-metrics-provider
${bookkeeper.version}
@@ -1191,13 +1194,13 @@ flexible messaging model and an intuitive client API.
- org.apache.distributedlog
+ ${distributedlog.groupId}
distributedlog-core
${bookkeeper.version}
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-server
@@ -1514,7 +1517,7 @@ flexible messaging model and an intuitive client API.
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-server
${bookkeeper.version}
test
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 117c6b6f4f40d..4bdb12b4d9412 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -94,7 +94,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
stream-storage-server
@@ -106,7 +106,7 @@
*
- org.apache.bookkeeper.tests
+ ${bookkeeper.groupId}.tests
stream-storage-tests-common
@@ -125,7 +125,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-tools-framework
diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
index 9824cdebba01e..a45dcabf21f76 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -126,7 +126,7 @@
com.fasterxml.jackson.core
io.netty:*
com.ascentstream.pulsar:pulsar-common
- org.apache.bookkeeper:*
+ ${bookkeeper.groupId}:*
com.yahoo.datasketches:sketches-core
org.glassfish.jersey*:*
javax.ws.rs:*
diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
index 46bb7f6299ec0..baac4038b4364 100644
--- a/pulsar-client-all/pom.xml
+++ b/pulsar-client-all/pom.xml
@@ -166,7 +166,7 @@
io.airlift:*
com.ascentstream.pulsar:pulsar-common
- org.apache.bookkeeper:*
+ ${bookkeeper.groupId}:*
com.yahoo.datasketches:sketches-core
org.glassfish.jersey*:*
javax.ws.rs:*
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index 04414b654baa5..a6f7fd559e3e1 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -130,7 +130,7 @@
com.ascentstream.pulsar:pulsar-client-original
com.ascentstream.pulsar:pulsar-transaction-common
- org.apache.bookkeeper:*
+ ${bookkeeper.groupId}:*
org.apache.commons:commons-lang3
commons-codec:commons-codec
commons-collections:commons-collections
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index 91f336d15faa3..7e3c7c315e4ec 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -95,7 +95,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-common-allocator
@@ -106,7 +106,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
cpu-affinity
@@ -116,7 +116,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
circe-checksum
${bookkeeper.version}
diff --git a/pulsar-functions/instance/pom.xml b/pulsar-functions/instance/pom.xml
index 0151e2e2279b2..1b7ed47fe95ec 100644
--- a/pulsar-functions/instance/pom.xml
+++ b/pulsar-functions/instance/pom.xml
@@ -102,7 +102,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
stream-storage-java-client
@@ -139,7 +139,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-common
diff --git a/pulsar-functions/localrun-shaded/pom.xml b/pulsar-functions/localrun-shaded/pom.xml
index ef664573f9953..2113e0d635779 100644
--- a/pulsar-functions/localrun-shaded/pom.xml
+++ b/pulsar-functions/localrun-shaded/pom.xml
@@ -109,7 +109,7 @@
com.ascentstream.pulsar:*
- org.apache.bookkeeper:*
+ ${bookkeeper.groupId}:*
commons-*:*
org.apache.commons:*
com.fasterxml.jackson.*:*
diff --git a/pulsar-functions/worker/pom.xml b/pulsar-functions/worker/pom.xml
index 76dd817cdf29c..9b32e21dc18e2 100644
--- a/pulsar-functions/worker/pom.xml
+++ b/pulsar-functions/worker/pom.xml
@@ -109,7 +109,7 @@
- org.apache.distributedlog
+ ${distributedlog.groupId}
distributedlog-core
@@ -120,7 +120,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-server
diff --git a/pulsar-metadata/pom.xml b/pulsar-metadata/pom.xml
index 25b70d505e118..3fbbbb2062277 100644
--- a/pulsar-metadata/pom.xml
+++ b/pulsar-metadata/pom.xml
@@ -78,7 +78,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-server
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 404ede1ae7909..feb9e8539abf1 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,9 +240,9 @@ public PulsarZooKeeperClient build() throws IOException, KeeperException, Interr
// Create a watcher manager
StatsLogger watcherStatsLogger = statsLogger.scope("watcher");
- ZooKeeperWatcherBase watcherManager =
- null == watchers ? new ZooKeeperWatcherBase(sessionTimeoutMs, watcherStatsLogger) :
- new ZooKeeperWatcherBase(sessionTimeoutMs, watchers, watcherStatsLogger);
+ ZooKeeperWatcherBase watcherManager = null == watchers
+ ? new ZooKeeperWatcherBase(sessionTimeoutMs, allowReadOnlyMode, watcherStatsLogger)
+ : new ZooKeeperWatcherBase(sessionTimeoutMs, allowReadOnlyMode, watchers, watcherStatsLogger);
PulsarZooKeeperClient client = new PulsarZooKeeperClient(
connectString,
sessionTimeoutMs,
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClientTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClientTest.java
index cfcf2f25c9a81..39be7988cc6be 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClientTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/bookkeeper/PulsarRegistrationClientTest.java
@@ -365,7 +365,7 @@ public void testNetworkDelayWithBkZkManager() throws Throwable {
final String zksConnectionString = zks.getConnectionString();
final String ledgersRoot = "/test/ledgers-" + UUID.randomUUID();
// prepare registration manager
- ZooKeeper zk = new ZooKeeper(zksConnectionString, 5000, new ZooKeeperWatcherBase(1000));
+ ZooKeeper zk = new ZooKeeper(zksConnectionString, 5000, new ZooKeeperWatcherBase(1000, false));
final ServerConfiguration serverConfiguration = new ServerConfiguration();
serverConfiguration.setZkLedgersRootPath(ledgersRoot);
final FaultInjectableZKRegistrationManager rm = new FaultInjectableZKRegistrationManager(serverConfiguration, zk);
diff --git a/pulsar-package-management/bookkeeper-storage/pom.xml b/pulsar-package-management/bookkeeper-storage/pom.xml
index 27904ce2300c1..8e3ba2b0edf2a 100644
--- a/pulsar-package-management/bookkeeper-storage/pom.xml
+++ b/pulsar-package-management/bookkeeper-storage/pom.xml
@@ -40,7 +40,7 @@
- org.apache.distributedlog
+ ${distributedlog.groupId}
distributedlog-core
diff --git a/testmocks/pom.xml b/testmocks/pom.xml
index c9e2e12ef38c1..01ecc312e98cf 100644
--- a/testmocks/pom.xml
+++ b/testmocks/pom.xml
@@ -54,7 +54,7 @@
- org.apache.bookkeeper
+ ${bookkeeper.groupId}
bookkeeper-server