diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 201c5dc680877..2681865291330 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -356,32 +356,33 @@ The Apache Software License, Version 2.0 - net.java.dev.jna-jna-jpms-5.18.1.jar - net.java.dev.jna-jna-platform-jpms-5.18.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.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-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.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-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 @@ -552,7 +553,7 @@ The Apache Software License, Version 2.0 - io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java17-2.21.0-alpha.jar - io.opentelemetry.instrumentation-opentelemetry-runtime-telemetry-java8-2.21.0-alpha.jar - io.opentelemetry.semconv-opentelemetry-semconv-1.37.0.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 9a0a74764c305..b1e4c4a0d2d78 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 @@ -394,9 +391,9 @@ The Apache Software License, Version 2.0 - opentelemetry-context-1.56.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 335fd2485dc59..16c2295121d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ flexible messaging model and an intuitive client API. 1.28.0 - 4.17.2 + 4.17.3 3.9.4 1.11.0 1.14.0 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 360d82e079193..c1f53d0adff1e 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 void asyncCreateLedger(int ensSize, int qSize, DigestType digestType, byt } @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) {