You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by cb...@apache.org on 2023/04/18 22:37:54 UTC
[pulsar] branch branch-3.0 updated (ad831d159ed -> 13eb2a75f3d)
This is an automated email from the ASF dual-hosted git repository.
cbornet pushed a change to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
from ad831d159ed [improve][broker] Fix ServiceUnitStateCompactionStrategy to cover fast-forward cursor behavior after compaction (#20110)
new 43ef457f292 [fix][admin] Add javax.xml.bind:jaxb-api to shade (#20106)
new 13eb2a75f3d [improve] [broker] Upgrade the BookKeeper dependency to 4.16.1 (#20127)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
distribution/server/src/assemble/LICENSE.bin.txt | 56 ++++++++++++------------
distribution/shell/src/assemble/LICENSE.bin.txt | 6 +--
pom.xml | 2 +-
pulsar-client-admin-shaded/pom.xml | 5 +++
pulsar-client-all/pom.xml | 5 +++
pulsar-sql/presto-distribution/LICENSE | 30 ++++++-------
6 files changed, 57 insertions(+), 47 deletions(-)
[pulsar] 02/02: [improve] [broker] Upgrade the BookKeeper dependency to 4.16.1 (#20127)
Posted by cb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cbornet pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 13eb2a75f3dc72bed21fdeb4fb0f211a7a0dd3fb
Author: Hang Chen <ch...@apache.org>
AuthorDate: Wed Apr 19 03:01:31 2023 +0800
[improve] [broker] Upgrade the BookKeeper dependency to 4.16.1 (#20127)
---
distribution/server/src/assemble/LICENSE.bin.txt | 56 ++++++++++++------------
distribution/shell/src/assemble/LICENSE.bin.txt | 6 +--
pom.xml | 2 +-
pulsar-sql/presto-distribution/LICENSE | 30 ++++++-------
4 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index c321e54de2e..c5e69f5cde9 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -346,34 +346,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.0.jar
- - org.apache.bookkeeper-bookkeeper-common-allocator-4.16.0.jar
- - org.apache.bookkeeper-bookkeeper-proto-4.16.0.jar
- - org.apache.bookkeeper-bookkeeper-server-4.16.0.jar
- - org.apache.bookkeeper-bookkeeper-tools-framework-4.16.0.jar
- - org.apache.bookkeeper-circe-checksum-4.16.0.jar
- - org.apache.bookkeeper-cpu-affinity-4.16.0.jar
- - org.apache.bookkeeper-statelib-4.16.0.jar
- - org.apache.bookkeeper-stream-storage-api-4.16.0.jar
- - org.apache.bookkeeper-stream-storage-common-4.16.0.jar
- - org.apache.bookkeeper-stream-storage-java-client-4.16.0.jar
- - org.apache.bookkeeper-stream-storage-java-client-base-4.16.0.jar
- - org.apache.bookkeeper-stream-storage-proto-4.16.0.jar
- - org.apache.bookkeeper-stream-storage-server-4.16.0.jar
- - org.apache.bookkeeper-stream-storage-service-api-4.16.0.jar
- - org.apache.bookkeeper-stream-storage-service-impl-4.16.0.jar
- - org.apache.bookkeeper.http-http-server-4.16.0.jar
- - org.apache.bookkeeper.http-vertx-http-server-4.16.0.jar
- - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.16.0.jar
- - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.16.0.jar
- - org.apache.distributedlog-distributedlog-common-4.16.0.jar
- - org.apache.distributedlog-distributedlog-core-4.16.0-tests.jar
- - org.apache.distributedlog-distributedlog-core-4.16.0.jar
- - org.apache.distributedlog-distributedlog-protocol-4.16.0.jar
- - org.apache.bookkeeper.stats-codahale-metrics-provider-4.16.0.jar
- - org.apache.bookkeeper-bookkeeper-slogger-api-4.16.0.jar
- - org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.16.0.jar
- - org.apache.bookkeeper-native-io-4.16.0.jar
+ - org.apache.bookkeeper-bookkeeper-common-4.16.1.jar
+ - org.apache.bookkeeper-bookkeeper-common-allocator-4.16.1.jar
+ - org.apache.bookkeeper-bookkeeper-proto-4.16.1.jar
+ - org.apache.bookkeeper-bookkeeper-server-4.16.1.jar
+ - org.apache.bookkeeper-bookkeeper-tools-framework-4.16.1.jar
+ - org.apache.bookkeeper-circe-checksum-4.16.1.jar
+ - org.apache.bookkeeper-cpu-affinity-4.16.1.jar
+ - org.apache.bookkeeper-statelib-4.16.1.jar
+ - org.apache.bookkeeper-stream-storage-api-4.16.1.jar
+ - org.apache.bookkeeper-stream-storage-common-4.16.1.jar
+ - org.apache.bookkeeper-stream-storage-java-client-4.16.1.jar
+ - org.apache.bookkeeper-stream-storage-java-client-base-4.16.1.jar
+ - org.apache.bookkeeper-stream-storage-proto-4.16.1.jar
+ - org.apache.bookkeeper-stream-storage-server-4.16.1.jar
+ - org.apache.bookkeeper-stream-storage-service-api-4.16.1.jar
+ - org.apache.bookkeeper-stream-storage-service-impl-4.16.1.jar
+ - org.apache.bookkeeper.http-http-server-4.16.1.jar
+ - org.apache.bookkeeper.http-vertx-http-server-4.16.1.jar
+ - org.apache.bookkeeper.stats-bookkeeper-stats-api-4.16.1.jar
+ - org.apache.bookkeeper.stats-prometheus-metrics-provider-4.16.1.jar
+ - org.apache.distributedlog-distributedlog-common-4.16.1.jar
+ - org.apache.distributedlog-distributedlog-core-4.16.1-tests.jar
+ - org.apache.distributedlog-distributedlog-core-4.16.1.jar
+ - org.apache.distributedlog-distributedlog-protocol-4.16.1.jar
+ - org.apache.bookkeeper.stats-codahale-metrics-provider-4.16.1.jar
+ - org.apache.bookkeeper-bookkeeper-slogger-api-4.16.1.jar
+ - org.apache.bookkeeper-bookkeeper-slogger-slf4j-4.16.1.jar
+ - org.apache.bookkeeper-native-io-4.16.1.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 0ac08caa1c0..cf741622c75 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.0.jar
- - cpu-affinity-4.16.0.jar
- - circe-checksum-4.16.0.jar
+ - bookkeeper-common-allocator-4.16.1.jar
+ - cpu-affinity-4.16.1.jar
+ - circe-checksum-4.16.1.jar
* AirCompressor
- aircompressor-0.20.jar
* AsyncHttpClient
diff --git a/pom.xml b/pom.xml
index 8daa95e3642..f960c694c19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@ flexible messaging model and an intuitive client API.</description>
<!-- apache commons -->
<commons-compress.version>1.21</commons-compress.version>
- <bookkeeper.version>4.16.0</bookkeeper.version>
+ <bookkeeper.version>4.16.1</bookkeeper.version>
<zookeeper.version>3.8.1</zookeeper.version>
<commons-cli.version>1.5.0</commons-cli.version>
<commons-text.version>1.10.0</commons-text.version>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 214a928a749..ede2ea39999 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -426,21 +426,21 @@ 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.16.0.jar
- - bookkeeper-common-allocator-4.16.0.jar
- - bookkeeper-proto-4.16.0.jar
- - bookkeeper-server-4.16.0.jar
- - bookkeeper-stats-api-4.16.0.jar
- - bookkeeper-tools-framework-4.16.0.jar
- - circe-checksum-4.16.0.jar
- - codahale-metrics-provider-4.16.0.jar
- - cpu-affinity-4.16.0.jar
- - http-server-4.16.0.jar
- - prometheus-metrics-provider-4.16.0.jar
- - codahale-metrics-provider-4.16.0.jar
- - bookkeeper-slogger-api-4.16.0.jar
- - bookkeeper-slogger-slf4j-4.16.0.jar
- - native-io-4.16.0.jar
+ - bookkeeper-common-4.16.1.jar
+ - bookkeeper-common-allocator-4.16.1.jar
+ - bookkeeper-proto-4.16.1.jar
+ - bookkeeper-server-4.16.1.jar
+ - bookkeeper-stats-api-4.16.1.jar
+ - bookkeeper-tools-framework-4.16.1.jar
+ - circe-checksum-4.16.1.jar
+ - codahale-metrics-provider-4.16.1.jar
+ - cpu-affinity-4.16.1.jar
+ - http-server-4.16.1.jar
+ - prometheus-metrics-provider-4.16.1.jar
+ - codahale-metrics-provider-4.16.1.jar
+ - bookkeeper-slogger-api-4.16.1.jar
+ - bookkeeper-slogger-slf4j-4.16.1.jar
+ - native-io-4.16.1.jar
* Apache Commons
- commons-cli-1.5.0.jar
- commons-codec-1.15.jar
[pulsar] 01/02: [fix][admin] Add javax.xml.bind:jaxb-api to shade (#20106)
Posted by cb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cbornet pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 43ef457f2927d2e8276e9e8b0e60e9b004ec2a72
Author: Zixuan Liu <no...@gmail.com>
AuthorDate: Wed Apr 19 01:27:39 2023 +0800
[fix][admin] Add javax.xml.bind:jaxb-api to shade (#20106)
Signed-off-by: nodece <no...@gmail.com>
---
pulsar-client-admin-shaded/pom.xml | 5 +++++
pulsar-client-all/pom.xml | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
index ae92f1c7a0d..cdf74cb8eb8 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -131,6 +131,7 @@
<include>com.yahoo.datasketches:sketches-core</include>
<include>org.glassfish.jersey*:*</include>
<include>javax.ws.rs:*</include>
+ <include>javax.xml.bind:jaxb-api</include>
<include>jakarta.annotation:*</include>
<include>org.glassfish.hk2*:*</include>
<include>io.grpc:*</include>
@@ -230,6 +231,10 @@
<pattern>javax.annotation</pattern>
<shadedPattern>org.apache.pulsar.shade.javax.annotation</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>javax.xml.bind</pattern>
+ <shadedPattern>org.apache.pulsar.shade.javax.xml.bind</shadedPattern>
+ </relocation>
<relocation>
<pattern>jersey</pattern>
<shadedPattern>org.apache.pulsar.shade.jersey</shadedPattern>
diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
index 20be552aed1..5bdc97c3624 100644
--- a/pulsar-client-all/pom.xml
+++ b/pulsar-client-all/pom.xml
@@ -182,6 +182,7 @@
<include>com.yahoo.datasketches:sketches-core</include>
<include>org.glassfish.jersey*:*</include>
<include>javax.ws.rs:*</include>
+ <include>javax.xml.bind:jaxb-api</include>
<include>jakarta.annotation:*</include>
<include>org.glassfish.hk2*:*</include>
<include>io.grpc:*</include>
@@ -285,6 +286,10 @@
<pattern>javax.annotation</pattern>
<shadedPattern>org.apache.pulsar.shade.javax.annotation</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>javax.xml.bind</pattern>
+ <shadedPattern>org.apache.pulsar.shade.javax.xml.bind</shadedPattern>
+ </relocation>
<relocation>
<pattern>jersey</pattern>
<shadedPattern>org.apache.pulsar.shade.jersey</shadedPattern>