From c684a268918079a67822f79f4cddc89139e43525 Mon Sep 17 00:00:00 2001 From: chenhang Date: Mon, 17 Jul 2023 18:07:49 +0800 Subject: [PATCH 1/4] Bump Bookkeeper version to 4.14.8 --- .../server/src/assemble/LICENSE.bin.txt | 52 +++++++++---------- pom.xml | 12 ++++- pulsar-sql/presto-distribution/LICENSE | 26 +++++----- 3 files changed, 49 insertions(+), 41 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 73097e53f49f3..10bd07b505b0e 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 20f163939260a..1dc93b244dcb3 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ flexible messaging model and an intuitive client API. 1.21 - 4.14.7 + 4.14.8 3.6.4 1.5.0 1.1.10.1 @@ -117,7 +117,7 @@ flexible messaging model and an intuitive client API. 1.10.50 0.5.0 3.9.8 - 6.16.4 + 6.29.4.1 1.7.32 3.2.2 2.18.0 @@ -2451,6 +2451,14 @@ flexible messaging model and an intuitive client API. false + + bk-staging + bk-staging + https://repository.apache.org/content/repositories/orgapachebookkeeper-1087/ + + false + + diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index bfc8923dba862..edfaadd541580 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 From 8c29296a7a79172eba1826d94e5af2bf8ef0eac4 Mon Sep 17 00:00:00 2001 From: chenhang Date: Tue, 15 Aug 2023 19:54:24 +0800 Subject: [PATCH 2/4] fix failed test --- .../org/apache/pulsar/client/impl/KeySharedSubscriptionTest.java | 1 + 1 file changed, 1 insertion(+) 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 36d3bf6c44076..213296d22833a 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 void testCanRecoverConsumptionWhenLiftMaxUnAckedMessagesRestriction(Subsc // 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)); From fccdb00db0f4882ce302881f9a73de31118f3af4 Mon Sep 17 00:00:00 2001 From: chenhang Date: Thu, 17 Aug 2023 20:23:21 +0800 Subject: [PATCH 3/4] use a new bk rc package --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1dc93b244dcb3..18bce0c5a730d 100644 --- a/pom.xml +++ b/pom.xml @@ -2454,7 +2454,7 @@ flexible messaging model and an intuitive client API. bk-staging bk-staging - https://repository.apache.org/content/repositories/orgapachebookkeeper-1087/ + https://repository.apache.org/content/repositories/orgapachebookkeeper-1088/ false From 5af2070fc1a77c0152cf79c33519edc5cc2a526a Mon Sep 17 00:00:00 2001 From: chenhang Date: Fri, 8 Sep 2023 16:46:57 +0800 Subject: [PATCH 4/4] Upgrade BookKeeper dependency to 4.14.8 --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 18bce0c5a730d..485c8c89b113e 100644 --- a/pom.xml +++ b/pom.xml @@ -2451,14 +2451,6 @@ flexible messaging model and an intuitive client API. false - - bk-staging - bk-staging - https://repository.apache.org/content/repositories/orgapachebookkeeper-1088/ - - false - -