This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 5aea813ff33 [imporve] [bookie] Upgrade BookKeeper dependency to 4.14.8
for branch 2.10 (#21148)
5aea813ff33 is described below
commit 5aea813ff339a85e971ee8af3b29ff9009a5d45a
Author: Hang Chen <[email protected]>
AuthorDate: Mon Sep 18 14:25:56 2023 +0800
[imporve] [bookie] Upgrade BookKeeper dependency to 4.14.8 for branch 2.10
(#21148)
---
distribution/server/src/assemble/LICENSE.bin.txt | 52 +++++++++++-----------
pom.xml | 4 +-
.../client/impl/KeySharedSubscriptionTest.java | 1 +
pulsar-sql/presto-distribution/LICENSE | 26 +++++------
4 files changed, 42 insertions(+), 41 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index 73097e53f49..10bd07b505b 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -396,31 +396,31 @@ The Apache Software License, Version 2.0
- org.apache.logging.log4j-log4j-web-2.18.0.jar
* Java Native Access JNA -- net.java.dev.jna-jna-4.2.0.jar
* BookKeeper
- - org.apache.bookkeeper-bookkeeper-common-4.14.7.jar
- - org.apache.bookkeeper-bookkeeper-common-allocator-4.14.7.jar
- - org.apache.bookkeeper-bookkeeper-proto-4.14.7.jar
- - org.apache.bookkeeper-bookkeeper-server-4.14.7.jar
- - org.apache.bookkeeper-bookkeeper-tools-framework-4.14.7.jar
- - org.apache.bookkeeper-circe-checksum-4.14.7.jar
- - org.apache.bookkeeper-cpu-affinity-4.14.7.jar
- - org.apache.bookkeeper-statelib-4.14.7.jar
- - org.apache.bookkeeper-stream-storage-api-4.14.7.jar
- - org.apache.bookkeeper-stream-storage-common-4.14.7.jar
- - org.apache.bookkeeper-stream-storage-java-client-4.14.7.jar
- - org.apache.bookkeeper-stream-storage-java-client-base-4.14.7.jar
- - org.apache.bookkeeper-stream-storage-proto-4.14.7.jar
- - org.apache.bookkeeper-stream-storage-server-4.14.7.jar
- - org.apache.bookkeeper-stream-storage-service-api-4.14.7.jar
- - org.apache.bookkeeper-stream-storage-service-impl-4.14.7.jar
- - org.apache.bookkeeper.http-http-server-4.14.7.jar
- - org.apache.bookkeeper.http-vertx-http-server-4.14.7.jar
- - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.14.7.jar
- - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.14.7.jar
- - org.apache.distributedlog-distributedlog-common-4.14.7.jar
- - org.apache.distributedlog-distributedlog-core-4.14.7-tests.jar
- - org.apache.distributedlog-distributedlog-core-4.14.7.jar
- - org.apache.distributedlog-distributedlog-protocol-4.14.7.jar
- - org.apache.bookkeeper.stats-codahale-metrics-provider-4.14.7.jar
+ - org.apache.bookkeeper-bookkeeper-common-4.14.8.jar
+ - org.apache.bookkeeper-bookkeeper-common-allocator-4.14.8.jar
+ - org.apache.bookkeeper-bookkeeper-proto-4.14.8.jar
+ - org.apache.bookkeeper-bookkeeper-server-4.14.8.jar
+ - org.apache.bookkeeper-bookkeeper-tools-framework-4.14.8.jar
+ - org.apache.bookkeeper-circe-checksum-4.14.8.jar
+ - org.apache.bookkeeper-cpu-affinity-4.14.8.jar
+ - org.apache.bookkeeper-statelib-4.14.8.jar
+ - org.apache.bookkeeper-stream-storage-api-4.14.8.jar
+ - org.apache.bookkeeper-stream-storage-common-4.14.8.jar
+ - org.apache.bookkeeper-stream-storage-java-client-4.14.8.jar
+ - org.apache.bookkeeper-stream-storage-java-client-base-4.14.8.jar
+ - org.apache.bookkeeper-stream-storage-proto-4.14.8.jar
+ - org.apache.bookkeeper-stream-storage-server-4.14.8.jar
+ - org.apache.bookkeeper-stream-storage-service-api-4.14.8.jar
+ - org.apache.bookkeeper-stream-storage-service-impl-4.14.8.jar
+ - org.apache.bookkeeper.http-http-server-4.14.8.jar
+ - org.apache.bookkeeper.http-vertx-http-server-4.14.8.jar
+ - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.14.8.jar
+ - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.14.8.jar
+ - org.apache.distributedlog-distributedlog-common-4.14.8.jar
+ - org.apache.distributedlog-distributedlog-core-4.14.8-tests.jar
+ - org.apache.distributedlog-distributedlog-core-4.14.8.jar
+ - org.apache.distributedlog-distributedlog-protocol-4.14.8.jar
+ - org.apache.bookkeeper.stats-codahale-metrics-provider-4.14.8.jar
* Apache HTTP Client
- org.apache.httpcomponents-httpclient-4.5.13.jar
- org.apache.httpcomponents-httpcore-4.4.13.jar
@@ -450,7 +450,7 @@ The Apache Software License, Version 2.0
- org.eclipse.jetty-jetty-alpn-conscrypt-server-9.4.51.v20230217.jar
- org.eclipse.jetty-jetty-alpn-server-9.4.51.v20230217.jar
* SnakeYaml -- org.yaml-snakeyaml-2.0.jar
- * RocksDB - org.rocksdb-rocksdbjni-6.16.4.jar
+ * RocksDB - org.rocksdb-rocksdbjni-6.29.4.1.jar
* Google Error Prone Annotations -
com.google.errorprone-error_prone_annotations-2.5.1.jar
* Apache Thrift - org.apache.thrift-libthrift-0.14.2.jar
* OkHttp3
diff --git a/pom.xml b/pom.xml
index a94d0c8bb22..a0eb4668399 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@ flexible messaging model and an intuitive client
API.</description>
<!-- apache commons -->
<commons-compress.version>1.21</commons-compress.version>
- <bookkeeper.version>4.14.7</bookkeeper.version>
+ <bookkeeper.version>4.14.8</bookkeeper.version>
<zookeeper.version>3.6.4</zookeeper.version>
<commons-cli.version>1.5.0</commons-cli.version>
<snappy.version>1.1.10.1</snappy.version> <!-- ZooKeeper server -->
@@ -117,7 +117,7 @@ flexible messaging model and an intuitive client
API.</description>
<athenz.version>1.10.50</athenz.version>
<prometheus.version>0.5.0</prometheus.version>
<vertx.version>3.9.8</vertx.version>
- <rocksdb.version>6.16.4</rocksdb.version>
+ <rocksdb.version>6.29.4.1</rocksdb.version>
<slf4j.version>1.7.32</slf4j.version>
<commons.collections.version>3.2.2</commons.collections.version>
<log4j2.version>2.18.0</log4j2.version>
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java
index 36d3bf6c440..213296d2283 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java
@@ -176,6 +176,7 @@ public class KeySharedSubscriptionTest extends
ProducerConsumerBase {
// Wait for all consumers to continue receiving messages.
Awaitility.await()
+ .atMost(30, TimeUnit.SECONDS)
.pollDelay(5, TimeUnit.SECONDS)
.until(() ->
(System.currentTimeMillis() - lastActiveTime.get()) >
TimeUnit.SECONDS.toMillis(5));
diff --git a/pulsar-sql/presto-distribution/LICENSE
b/pulsar-sql/presto-distribution/LICENSE
index bfc8923dba8..edfaadd5415 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -411,7 +411,7 @@ The Apache Software License, Version 2.0
- presto-spi-332.jar
- presto-record-decoder-332.jar
* RocksDB JNI
- - rocksdbjni-6.16.4.jar
+ - rocksdbjni-6.29.4.1.jar
* SnakeYAML
- snakeyaml-2.0.jar
* Bean Validation API
@@ -434,18 +434,18 @@ The Apache Software License, Version 2.0
- async-http-client-2.12.1.jar
- async-http-client-netty-utils-2.12.1.jar
* Apache Bookkeeper
- - bookkeeper-common-4.14.7.jar
- - bookkeeper-common-allocator-4.14.7.jar
- - bookkeeper-proto-4.14.7.jar
- - bookkeeper-server-4.14.7.jar
- - bookkeeper-stats-api-4.14.7.jar
- - bookkeeper-tools-framework-4.14.7.jar
- - circe-checksum-4.14.7.jar
- - codahale-metrics-provider-4.14.7.jar
- - cpu-affinity-4.14.7.jar
- - http-server-4.14.7.jar
- - prometheus-metrics-provider-4.14.7.jar
- - codahale-metrics-provider-4.14.7.jar
+ - bookkeeper-common-4.14.8.jar
+ - bookkeeper-common-allocator-4.14.8.jar
+ - bookkeeper-proto-4.14.8.jar
+ - bookkeeper-server-4.14.8.jar
+ - bookkeeper-stats-api-4.14.8.jar
+ - bookkeeper-tools-framework-4.14.8.jar
+ - circe-checksum-4.14.8.jar
+ - codahale-metrics-provider-4.14.8.jar
+ - cpu-affinity-4.14.8.jar
+ - http-server-4.14.8.jar
+ - prometheus-metrics-provider-4.14.8.jar
+ - codahale-metrics-provider-4.14.8.jar
* Apache Commons
- commons-cli-1.5.0.jar
- commons-codec-1.15.jar
