This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new a583e807db Upgrade protobuf and grpc to latest versions (#4716)
a583e807db is described below
commit a583e807dbce4c99489abfad8720b9e339b2d31d
Author: Lari Hotari <[email protected]>
AuthorDate: Tue Mar 3 10:40:40 2026 +0200
Upgrade protobuf and grpc to latest versions (#4716)
---
bookkeeper-dist/src/assemble/bin-all.xml | 3 +-
bookkeeper-dist/src/assemble/bin-server.xml | 3 +-
bookkeeper-dist/src/assemble/bkctl.xml | 3 +-
.../src/main/resources/LICENSE-all.bin.txt | 74 +++++++++++-----------
.../src/main/resources/LICENSE-bkctl.bin.txt | 74 +++++++++++-----------
.../src/main/resources/LICENSE-server.bin.txt | 74 +++++++++++-----------
.../src/main/resources/NOTICE-all.bin.txt | 18 +++---
.../src/main/resources/NOTICE-bkctl.bin.txt | 18 +++---
.../src/main/resources/NOTICE-server.bin.txt | 18 +++---
.../main/resources/deps/protobuf-3.14.0/LICENSE | 32 ----------
.../deps/{protobuf-3.12.0 => protobuf}/LICENSE | 2 +-
bookkeeper-proto/pom.xml | 2 +-
pom.xml | 10 ++-
stream/proto/pom.xml | 2 +-
stream/statelib/pom.xml | 2 +-
stream/tests-common/pom.xml | 2 +-
16 files changed, 156 insertions(+), 181 deletions(-)
diff --git a/bookkeeper-dist/src/assemble/bin-all.xml
b/bookkeeper-dist/src/assemble/bin-all.xml
index 506bfaaf9a..b4738eed52 100644
--- a/bookkeeper-dist/src/assemble/bin-all.xml
+++ b/bookkeeper-dist/src/assemble/bin-all.xml
@@ -66,8 +66,7 @@
<include>jsr-305/LICENSE</include>
<include>netty/*</include>
<include>paranamer-2.8/LICENSE.txt</include>
- <include>protobuf-3.14.0/LICENSE</include>
- <include>protobuf-3.12.0/LICENSE</include>
+ <include>protobuf/LICENSE</include>
<include>reactivestreams-1.0.3/LICENSE</include>
<include>scala-library-2.11.7/LICENSE.md</include>
<include>scala-parser-combinators_2.11-1.0.4/LICENSE.md</include>
diff --git a/bookkeeper-dist/src/assemble/bin-server.xml
b/bookkeeper-dist/src/assemble/bin-server.xml
index f80dac43c4..eb4aada2fe 100644
--- a/bookkeeper-dist/src/assemble/bin-server.xml
+++ b/bookkeeper-dist/src/assemble/bin-server.xml
@@ -54,8 +54,7 @@
<include>javax.servlet-api-4.0.0/CDDL+GPL-1.1</include>
<include>netty/*</include>
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
- <include>protobuf-3.14.0/LICENSE</include>
- <include>protobuf-3.12.0/LICENSE</include>
+ <include>protobuf/LICENSE</include>
<include>reactivestreams-1.0.3/LICENSE</include>
<include>slf4j-2.0.12/LICENSE.txt</include>
</includes>
diff --git a/bookkeeper-dist/src/assemble/bkctl.xml
b/bookkeeper-dist/src/assemble/bkctl.xml
index 45f9d1b12a..97df42b970 100644
--- a/bookkeeper-dist/src/assemble/bkctl.xml
+++ b/bookkeeper-dist/src/assemble/bkctl.xml
@@ -71,8 +71,7 @@
<include>google-auth-library-credentials-0.20.0/LICENSE</include>
<include>netty/*</include>
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
- <include>protobuf-3.14.0/LICENSE</include>
- <include>protobuf-3.12.0/LICENSE</include>
+ <include>protobuf/LICENSE</include>
<include>reactivestreams-1.0.3/LICENSE</include>
<include>slf4j-2.0.12/LICENSE.txt</include>
</includes>
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index 2ba11752d9..799cb6bb3d 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -277,29 +277,30 @@ Apache Software License, Version 2.
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
- lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25]
- lib/at.yawk.lz4-lz4-java-1.10.2.jar [26]
-- lib/com.google.api.grpc-proto-google-common-protos-2.51.0.jar [28]
-- lib/com.google.code.gson-gson-2.11.0.jar [29]
+- lib/com.google.api-api-common-2.53.0.jar [63]
+- lib/com.google.api.grpc-proto-google-common-protos-2.63.2.jar [28]
+- lib/com.google.code.gson-gson-2.12.1.jar [29]
- lib/io.opencensus-opencensus-api-0.31.1.jar [30]
- lib/io.opencensus-opencensus-contrib-http-util-0.31.1.jar [30]
-- lib/io.grpc-grpc-all-1.72.0.jar [33]
-- lib/io.grpc-grpc-alts-1.72.0.jar [33]
-- lib/io.grpc-grpc-api-1.72.0.jar [33]
-- lib/io.grpc-grpc-auth-1.72.0.jar [33]
-- lib/io.grpc-grpc-context-1.72.0.jar [33]
-- lib/io.grpc-grpc-core-1.72.0.jar [33]
-- lib/io.grpc-grpc-grpclb-1.72.0.jar [33]
-- lib/io.grpc-grpc-inprocess-1.72.0.jar [33]
-- lib/io.grpc-grpc-opentelemetry-1.72.0.jar [33]
-- lib/io.grpc-grpc-netty-shaded-1.72.0.jar [33]
-- lib/io.grpc-grpc-protobuf-1.72.0.jar [33]
-- lib/io.grpc-grpc-protobuf-lite-1.72.0.jar [33]
-- lib/io.grpc-grpc-services-1.72.0.jar [33]
-- lib/io.grpc-grpc-stub-1.72.0.jar [33]
-- lib/io.grpc-grpc-testing-1.72.0.jar [33]
-- lib/io.grpc-grpc-util-1.72.0.jar [33]
-- lib/io.grpc-grpc-xds-1.72.0.jar [33]
-- lib/io.grpc-grpc-rls-1.72.0.jar[33]
-- lib/io.grpc-grpc-gcp-csm-observability-1.72.0.jar [33]
+- lib/io.grpc-grpc-all-1.79.0.jar [33]
+- lib/io.grpc-grpc-alts-1.79.0.jar [33]
+- lib/io.grpc-grpc-api-1.79.0.jar [33]
+- lib/io.grpc-grpc-auth-1.79.0.jar [33]
+- lib/io.grpc-grpc-context-1.79.0.jar [33]
+- lib/io.grpc-grpc-core-1.79.0.jar [33]
+- lib/io.grpc-grpc-grpclb-1.79.0.jar [33]
+- lib/io.grpc-grpc-inprocess-1.79.0.jar [33]
+- lib/io.grpc-grpc-opentelemetry-1.79.0.jar [33]
+- lib/io.grpc-grpc-netty-shaded-1.79.0.jar [33]
+- lib/io.grpc-grpc-protobuf-1.79.0.jar [33]
+- lib/io.grpc-grpc-protobuf-lite-1.79.0.jar [33]
+- lib/io.grpc-grpc-services-1.79.0.jar [33]
+- lib/io.grpc-grpc-stub-1.79.0.jar [33]
+- lib/io.grpc-grpc-testing-1.79.0.jar [33]
+- lib/io.grpc-grpc-util-1.79.0.jar [33]
+- lib/io.grpc-grpc-xds-1.79.0.jar [33]
+- lib/io.grpc-grpc-rls-1.79.0.jar[33]
+- lib/io.grpc-grpc-gcp-csm-observability-1.79.0.jar [33]
- lib/org.apache.curator-curator-client-5.7.1.jar [34]
- lib/org.apache.curator-curator-framework-5.7.1.jar [34]
- lib/org.apache.curator-curator-recipes-5.7.1.jar [34]
@@ -310,8 +311,8 @@ Apache Software License, Version 2.
- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [40]
- lib/org.apache.thrift-libthrift-0.14.2.jar [41]
- lib/com.google.android-annotations-4.1.1.4.jar [42]
-- lib/com.google.http-client-google-http-client-1.44.2.jar [43]
-- lib/com.google.http-client-google-http-client-gson-1.44.2.jar [43]
+- lib/com.google.http-client-google-http-client-2.0.2.jar [43]
+- lib/com.google.http-client-google-http-client-gson-2.0.2.jar [43]
- lib/com.google.auto.value-auto-value-annotations-1.11.0.jar [44]
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [45]
- lib/com.google.re2j-re2j-1.8.jar [46]
@@ -384,10 +385,10 @@ Apache Software License, Version 2.
[24] Source available at https://github.com/cbeust/jcommander/tree/1.82
[25] Source available at
https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3
[26] Source available at https://github.com/yawkat/lz4-java/tree/v1.10.2
-[28] Source available at
https://github.com/googleapis/java-common-protos/tree/v2.51.0
-[29] Source available at https://github.com/google/gson/tree/gson-parent-2.11.0
+[28] Source available at
https://github.com/googleapis/sdk-platform-java/tree/v2.63.2/java-common-protos
+[29] Source available at https://github.com/google/gson/tree/gson-parent-2.12.1
[30] Source available at
https://github.com/census-instrumentation/opencensus-java/tree/v0.31.1
-[33] Source available at https://github.com/grpc/grpc-java/tree/v1.72.0
+[33] Source available at https://github.com/grpc/grpc-java/tree/v1.79.0
[34] Source available at
https://github.com/apache/curator/releases/tag/apache.curator-5.7.1
[36] Source available at https://github.com/google/error-prone/tree/v2.9.0
[37] Source available at https://github.com/apache/yetus/tree/rel/0.12.0
@@ -396,7 +397,7 @@ Apache Software License, Version 2.
[40] Source available at
https://github.com/apache/httpcomponents-core/tree/rel/v4.4.15
[41] Source available at https://github.com/apache/thrift/tree/0.14.2
[42] Source available at https://source.android.com/
-[43] Source available at
https://github.com/googleapis/google-http-java-client/releases/tag/v1.43.3
+[43] Source available at
https://github.com/googleapis/google-http-java-client/releases/tag/v2.0.2
[44] Source available at
https://github.com/google/auto/releases/tag/auto-value-1.10.4
[45] Source available at https://github.com/google/j2objc/releases/tag/1.3
[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.8
@@ -416,6 +417,7 @@ Apache Software License, Version 2.
[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.10
[61] Source available at
https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
[62] Source available at
https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
+[63] Source available at
https://github.com/googleapis/sdk-platform-java/tree/v2.53.0/api-common-java
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.130.Final.jar bundles some 3rd party dependencies
@@ -685,14 +687,14 @@ This product bundles Google Protocol Buffers, which is
available under a "3-clau
license.
Bundled as
- - lib/com.google.protobuf-protobuf-java-3.25.5.jar
-Source available at https://github.com/google/protobuf/tree/v3.25.5
-For details, see deps/protobuf-3.14.0/LICENSE.
+ - lib/com.google.protobuf-protobuf-java-4.34.0.jar
+Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
+For details, see deps/protobuf/LICENSE.
Bundled as
- - lib/com.google.protobuf-protobuf-java-util-3.25.5.jar
-Source available at https://github.com/protocolbuffers/protobuf/tree/v3.25.5
-For details, see deps/protobuf-3.12.0/LICENSE.
+ - lib/com.google.protobuf-protobuf-java-util-4.34.0.jar
+Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
+For details, see deps/protobuf/LICENSE.
------------------------------------------------------------------------------------
This product bundles the JCP Standard Java Servlet API, which is available
under a
CDDL 1.1 license. For details, see deps/javax.servlet-api-4.0.0/CDDL+GPL-1.1.
@@ -711,9 +713,9 @@ This product bundles the Google Auth Library, which is
available under a "3-clau
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
Bundled as
- - lib/com.google.auth-google-auth-library-credentials-1.24.1.jar
- - lib/com.google.auth-google-auth-library-oauth2-http-1.24.1.jar
-Source available at
https://github.com/googleapis/google-auth-library-java/releases/tag/v1.24.1
+ - lib/com.google.auth-google-auth-library-credentials-1.41.0.jar
+ - lib/com.google.auth-google-auth-library-oauth2-http-1.41.0.jar
+Source available at
https://github.com/googleapis/google-auth-library-java/releases/tag/v1.41.0
------------------------------------------------------------------------------------
This product bundles the bouncycastle Library.
For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index 5e133058e8..37aae80030 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -248,29 +248,30 @@ Apache Software License, Version 2.
- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [20]
- lib/com.beust-jcommander-1.82.jar [23]
- lib/at.yawk.lz4-lz4-java-1.10.2.jar [25]
-- lib/com.google.api.grpc-proto-google-common-protos-2.51.0.jar [27]
-- lib/com.google.code.gson-gson-2.11.0.jar [28]
+- lib/com.google.api-api-common-2.53.0.jar [58]
+- lib/com.google.api.grpc-proto-google-common-protos-2.63.2.jar [27]
+- lib/com.google.code.gson-gson-2.12.1.jar [28]
- lib/io.opencensus-opencensus-api-0.31.1.jar [29]
- lib/io.opencensus-opencensus-contrib-http-util-0.31.1.jar [29]
-- lib/io.grpc-grpc-all-1.72.0.jar [32]
-- lib/io.grpc-grpc-alts-1.72.0.jar [32]
-- lib/io.grpc-grpc-api-1.72.0.jar [32]
-- lib/io.grpc-grpc-auth-1.72.0.jar [32]
-- lib/io.grpc-grpc-context-1.72.0.jar [32]
-- lib/io.grpc-grpc-core-1.72.0.jar [32]
-- lib/io.grpc-grpc-grpclb-1.72.0.jar [32]
-- lib/io.grpc-grpc-inprocess-1.72.0.jar [32]
-- lib/io.grpc-grpc-opentelemetry-1.72.0.jar [32]
-- lib/io.grpc-grpc-netty-shaded-1.72.0.jar [32]
-- lib/io.grpc-grpc-protobuf-1.72.0.jar [32]
-- lib/io.grpc-grpc-protobuf-lite-1.72.0.jar [32]
-- lib/io.grpc-grpc-services-1.72.0.jar [32]
-- lib/io.grpc-grpc-stub-1.72.0.jar [32]
-- lib/io.grpc-grpc-testing-1.72.0.jar [32]
-- lib/io.grpc-grpc-util-1.72.0.jar [32]
-- lib/io.grpc-grpc-xds-1.72.0.jar [32]
-- lib/io.grpc-grpc-rls-1.72.0.jar[32]
-- lib/io.grpc-grpc-gcp-csm-observability-1.72.0.jar [32]
+- lib/io.grpc-grpc-all-1.79.0.jar [32]
+- lib/io.grpc-grpc-alts-1.79.0.jar [32]
+- lib/io.grpc-grpc-api-1.79.0.jar [32]
+- lib/io.grpc-grpc-auth-1.79.0.jar [32]
+- lib/io.grpc-grpc-context-1.79.0.jar [32]
+- lib/io.grpc-grpc-core-1.79.0.jar [32]
+- lib/io.grpc-grpc-grpclb-1.79.0.jar [32]
+- lib/io.grpc-grpc-inprocess-1.79.0.jar [32]
+- lib/io.grpc-grpc-opentelemetry-1.79.0.jar [32]
+- lib/io.grpc-grpc-netty-shaded-1.79.0.jar [32]
+- lib/io.grpc-grpc-protobuf-1.79.0.jar [32]
+- lib/io.grpc-grpc-protobuf-lite-1.79.0.jar [32]
+- lib/io.grpc-grpc-services-1.79.0.jar [32]
+- lib/io.grpc-grpc-stub-1.79.0.jar [32]
+- lib/io.grpc-grpc-testing-1.79.0.jar [32]
+- lib/io.grpc-grpc-util-1.79.0.jar [32]
+- lib/io.grpc-grpc-xds-1.79.0.jar [32]
+- lib/io.grpc-grpc-rls-1.79.0.jar[32]
+- lib/io.grpc-grpc-gcp-csm-observability-1.79.0.jar [32]
- lib/org.apache.curator-curator-client-5.7.1.jar [33]
- lib/org.apache.curator-curator-framework-5.7.1.jar [33]
- lib/org.apache.curator-curator-recipes-5.7.1.jar [33]
@@ -282,8 +283,8 @@ Apache Software License, Version 2.
- lib/org.apache.thrift-libthrift-0.14.2.jar [40]
- lib/com.google.android-annotations-4.1.1.4.jar [41]
- lib/com.google.auto.value-auto-value-annotations-1.11.0.jar [42]
-- lib/com.google.http-client-google-http-client-1.44.2.jar [43]
-- lib/com.google.http-client-google-http-client-gson-1.44.2.jar [43]
+- lib/com.google.http-client-google-http-client-2.0.2.jar [43]
+- lib/com.google.http-client-google-http-client-gson-2.0.2.jar [43]
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [44]
- lib/com.google.re2j-re2j-1.8.jar [45]
- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46]
@@ -326,10 +327,10 @@ Apache Software License, Version 2.
[20] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
[23] Source available at https://github.com/cbeust/jcommander/tree/1.82
[25] Source available at https://github.com/yawkat/lz4-java/tree/v1.10.2
-[27] Source available at
https://github.com/googleapis/java-common-protos/tree/v2.51.0
-[28] Source available at https://github.com/google/gson/tree/gson-parent-2.11.0
+[27] Source available at
https://github.com/googleapis/sdk-platform-java/tree/v2.63.2/java-common-protos
+[28] Source available at https://github.com/google/gson/tree/gson-parent-2.12.1
[29] Source available at
https://github.com/census-instrumentation/opencensus-java/tree/v0.31.1
-[32] Source available at https://github.com/grpc/grpc-java/tree/v1.72.0
+[32] Source available at https://github.com/grpc/grpc-java/tree/v1.79.0
[33] Source available at
https://github.com/apache/curator/tree/apache-curator-5.7.1
[35] Source available at https://github.com/google/error-prone/tree/v2.9.0
[36] Source available at https://github.com/apache/yetus/tree/rel/0.12.0
@@ -339,7 +340,7 @@ Apache Software License, Version 2.
[40] Source available at https://github.com/apache/thrift/tree/0.14.2
[41] Source available at https://source.android.com/
[42] Source available at
https://github.com/google/auto/releases/tag/auto-value-1.10.4
-[43] Source available at
https://github.com/googleapis/google-http-java-client/releases/tag/v1.43.3
+[43] Source available at
https://github.com/googleapis/google-http-java-client/releases/tag/v2.0.2
[44] Source available at https://github.com/google/j2objc/releases/tag/1.3
[45] Source available at https://github.com/google/re2j/releases/tag/re2j-1.8
[46] Source available at
https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1
@@ -353,6 +354,7 @@ Apache Software License, Version 2.
[55] Source available at
https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
[56] Source available at
https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
[57] Source available at
https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
+[58] Source available at
https://github.com/googleapis/sdk-platform-java/tree/v2.53.0/api-common-java
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.130.Final.jar bundles some 3rd party dependencies
@@ -585,14 +587,14 @@ This product bundles Google Protocol Buffers, which is
available under a "3-clau
license.
Bundled as
- - lib/com.google.protobuf-protobuf-java-3.25.5.jar
-Source available at https://github.com/google/protobuf/tree/v3.25.5
-For details, see deps/protobuf-3.14.0/LICENSE.
+ - lib/com.google.protobuf-protobuf-java-4.34.0.jar
+Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
+For details, see deps/protobuf/LICENSE.
Bundled as
- - lib/com.google.protobuf-protobuf-java-util-3.25.5.jar
-Source available at https://github.com/protocolbuffers/protobuf/tree/v3.25.5
-For details, see deps/protobuf-3.12.0/LICENSE.
+ - lib/com.google.protobuf-protobuf-java-util-4.34.0.jar
+Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
+For details, see deps/protobuf/LICENSE.
------------------------------------------------------------------------------------
This product bundles Simple Logging Facade for Java, which is available under a
MIT license. For details, see deps/slf4j-2.0.12/LICENSE.txt.
@@ -605,9 +607,9 @@ This product bundles the Google Auth Library, which is
available under a "3-clau
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
Bundled as
- - lib/com.google.auth-google-auth-library-credentials-1.24.1.jar
- - lib/com.google.auth-google-auth-library-oauth2-http-1.24.1.jar
-Source available at
https://github.com/google/google-auth-library-java/tree/1.24.1
+ - lib/com.google.auth-google-auth-library-credentials-1.41.0.jar
+ - lib/com.google.auth-google-auth-library-oauth2-http-1.41.0.jar
+Source available at
https://github.com/google/google-auth-library-java/tree/1.41.0
------------------------------------------------------------------------------------
This product bundles the bouncycastle Library.
For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index 856ba9617e..101be7dd21 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -277,29 +277,30 @@ Apache Software License, Version 2.
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
- lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25]
- lib/at.yawk.lz4-lz4-java-1.10.2.jar [26]
-- lib/com.google.api.grpc-proto-google-common-protos-2.51.0.jar [28]
-- lib/com.google.code.gson-gson-2.11.0.jar [29]
+- lib/com.google.api-api-common-2.53.0.jar [62]
+- lib/com.google.api.grpc-proto-google-common-protos-2.63.2.jar [28]
+- lib/com.google.code.gson-gson-2.12.1.jar [29]
- lib/io.opencensus-opencensus-api-0.31.1.jar [30]
- lib/io.opencensus-opencensus-contrib-http-util-0.31.1.jar [30]
-- lib/io.grpc-grpc-all-1.72.0.jar [33]
-- lib/io.grpc-grpc-alts-1.72.0.jar [33]
-- lib/io.grpc-grpc-api-1.72.0.jar [33]
-- lib/io.grpc-grpc-auth-1.72.0.jar [33]
-- lib/io.grpc-grpc-context-1.72.0.jar [33]
-- lib/io.grpc-grpc-core-1.72.0.jar [33]
-- lib/io.grpc-grpc-grpclb-1.72.0.jar [33]
-- lib/io.grpc-grpc-inprocess-1.72.0.jar [33]
-- lib/io.grpc-grpc-opentelemetry-1.72.0.jar [33]
-- lib/io.grpc-grpc-netty-shaded-1.72.0.jar [33]
-- lib/io.grpc-grpc-protobuf-1.72.0.jar [33]
-- lib/io.grpc-grpc-protobuf-lite-1.72.0.jar [33]
-- lib/io.grpc-grpc-services-1.72.0.jar [33]
-- lib/io.grpc-grpc-stub-1.72.0.jar [33]
-- lib/io.grpc-grpc-testing-1.72.0.jar [33]
-- lib/io.grpc-grpc-util-1.72.0.jar [33]
-- lib/io.grpc-grpc-xds-1.72.0.jar [33]
-- lib/io.grpc-grpc-rls-1.72.0.jar[33]
-- lib/io.grpc-grpc-gcp-csm-observability-1.72.0.jar [33]
+- lib/io.grpc-grpc-all-1.79.0.jar [33]
+- lib/io.grpc-grpc-alts-1.79.0.jar [33]
+- lib/io.grpc-grpc-api-1.79.0.jar [33]
+- lib/io.grpc-grpc-auth-1.79.0.jar [33]
+- lib/io.grpc-grpc-context-1.79.0.jar [33]
+- lib/io.grpc-grpc-core-1.79.0.jar [33]
+- lib/io.grpc-grpc-grpclb-1.79.0.jar [33]
+- lib/io.grpc-grpc-inprocess-1.79.0.jar [33]
+- lib/io.grpc-grpc-opentelemetry-1.79.0.jar [33]
+- lib/io.grpc-grpc-netty-shaded-1.79.0.jar [33]
+- lib/io.grpc-grpc-protobuf-1.79.0.jar [33]
+- lib/io.grpc-grpc-protobuf-lite-1.79.0.jar [33]
+- lib/io.grpc-grpc-services-1.79.0.jar [33]
+- lib/io.grpc-grpc-stub-1.79.0.jar [33]
+- lib/io.grpc-grpc-testing-1.79.0.jar [33]
+- lib/io.grpc-grpc-util-1.79.0.jar [33]
+- lib/io.grpc-grpc-xds-1.79.0.jar [33]
+- lib/io.grpc-grpc-rls-1.79.0.jar[33]
+- lib/io.grpc-grpc-gcp-csm-observability-1.79.0.jar [33]
- lib/org.apache.curator-curator-client-5.7.1.jar [34]
- lib/org.apache.curator-curator-framework-5.7.1.jar [34]
- lib/org.apache.curator-curator-recipes-5.7.1.jar [34]
@@ -310,8 +311,8 @@ Apache Software License, Version 2.
- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [40]
- lib/org.apache.thrift-libthrift-0.14.2.jar [41]
- lib/com.google.android-annotations-4.1.1.4.jar [42]
-- lib/com.google.http-client-google-http-client-1.44.2.jar [43]
-- lib/com.google.http-client-google-http-client-gson-1.44.2.jar [43]
+- lib/com.google.http-client-google-http-client-2.0.2.jar [43]
+- lib/com.google.http-client-google-http-client-gson-2.0.2.jar [43]
- lib/com.google.auto.value-auto-value-annotations-1.11.0.jar [44]
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [45]
- lib/com.google.re2j-re2j-1.8.jar [46]
@@ -380,10 +381,10 @@ Apache Software License, Version 2.
[24] Source available at https://github.com/cbeust/jcommander/tree/1.82
[25] Source available at
https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3
[26] Source available at https://github.com/yawkat/lz4-java/tree/v1.10.2
-[28] Source available at
https://github.com/googleapis/java-common-protos/tree/v2.51.0
-[29] Source available at https://github.com/google/gson/tree/gson-parent-2.11.0
+[28] Source available at
https://github.com/googleapis/sdk-platform-java/tree/v2.63.2/java-common-protos
+[29] Source available at https://github.com/google/gson/tree/gson-parent-2.12.1
[30] Source available at
https://github.com/census-instrumentation/opencensus-java/tree/v0.31.1
-[33] Source available at https://github.com/grpc/grpc-java/tree/v1.72.0
+[33] Source available at https://github.com/grpc/grpc-java/tree/v1.79.0
[34] Source available at
https://github.com/apache/curator/releases/tag/apache.curator-5.7.1
[36] Source available at https://github.com/google/error-prone/tree/v2.9.0
[37] Source available at https://github.com/apache/yetus/tree/rel/0.12.0
@@ -392,7 +393,7 @@ Apache Software License, Version 2.
[40] Source available at
https://github.com/apache/httpcomponents-core/tree/rel/v4.4.15
[41] Source available at https://github.com/apache/thrift/tree/0.14.2
[42] Source available at https://source.android.com/
-[43] Source available at
https://github.com/googleapis/google-http-java-client/releases/tag/v1.43.3
+[43] Source available at
https://github.com/googleapis/google-http-java-client/releases/tag/v2.0.2
[44] Source available at
https://github.com/google/auto/releases/tag/auto-value-1.10.4
[45] Source available at https://github.com/google/j2objc/releases/tag/1.3
[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.8
@@ -411,6 +412,7 @@ Apache Software License, Version 2.
[59] Source available at https://github.com/prometheus/client_java/tree/v1.3.10
[60] Source available at
https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
[61] Source available at
https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
+[62] Source available at
https://github.com/googleapis/sdk-platform-java/tree/v2.53.0/api-common-java
------------------------------------------------------------------------------------
lib/io.netty-netty-codec-4.1.130.Final.jar bundles some 3rd party dependencies
@@ -674,14 +676,14 @@ This product bundles Google Protocol Buffers, which is
available under a "3-clau
license.
Bundled as
- - lib/com.google.protobuf-protobuf-java-3.25.5.jar
-Source available at https://github.com/google/protobuf/tree/v3.25.5
-For details, see deps/protobuf-3.14.0/LICENSE.
+ - lib/com.google.protobuf-protobuf-java-4.34.0.jar
+Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
+For details, see deps/protobuf/LICENSE.
Bundled as
- - lib/com.google.protobuf-protobuf-java-util-3.25.5.jar
-Source available at https://github.com/protocolbuffers/protobuf/tree/v3.25.5
-For details, see deps/protobuf-3.12.0/LICENSE.
+ - lib/com.google.protobuf-protobuf-java-util-4.34.0.jar
+Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
+For details, see deps/protobuf/LICENSE.
------------------------------------------------------------------------------------
This product bundles the JCP Standard Java Servlet API, which is available
under a
CDDL 1.1 license. For details, see deps/javax.servlet-api-4.0.0/CDDL+GPL-1.1.
@@ -700,9 +702,9 @@ This product bundles the Google Auth Library, which is
available under a "3-clau
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
Bundled as
- - lib/com.google.auth-google-auth-library-credentials-1.24.1.jar
- - lib/com.google.auth-google-auth-library-oauth2-http-1.24.1.jar
-Source available at
https://github.com/googleapis/google-auth-library-java/releases/tag/v1.24.1
+ - lib/com.google.auth-google-auth-library-credentials-1.41.0.jar
+ - lib/com.google.auth-google-auth-library-oauth2-http-1.41.0.jar
+Source available at
https://github.com/googleapis/google-auth-library-java/releases/tag/v1.41.0
------------------------------------------------------------------------------------
This product bundles the bouncycastle Library.
For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html
diff --git a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
index 39a5c1ae70..9f401d690d 100644
--- a/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
@@ -135,15 +135,15 @@ granted provided that the copyright notice appears in all
copies.
Copyright 2010 Cedric Beust [email protected]
------------------------------------------------------------------------------------
-- lib/io.grpc-grpc-all-1.72.0.jar
-- lib/io.grpc-grpc-auth-1.72.0.jar
-- lib/io.grpc-grpc-context-1.72.0.jar
-- lib/io.grpc-grpc-core-1.72.0.jar
-- lib/io.grpc-grpc-netty-shaded-1.72.0.jar
-- lib/io.grpc-grpc-protobuf-1.72.0.jar
-- lib/io.grpc-grpc-protobuf-lite-1.72.0.jar
-- lib/io.grpc-grpc-stub-1.72.0.jar
-- lib/io.grpc-grpc-testing-1.72.0.jar
+- lib/io.grpc-grpc-all-1.79.0.jar
+- lib/io.grpc-grpc-auth-1.79.0.jar
+- lib/io.grpc-grpc-context-1.79.0.jar
+- lib/io.grpc-grpc-core-1.79.0.jar
+- lib/io.grpc-grpc-netty-shaded-1.79.0.jar
+- lib/io.grpc-grpc-protobuf-1.79.0.jar
+- lib/io.grpc-grpc-protobuf-lite-1.79.0.jar
+- lib/io.grpc-grpc-stub-1.79.0.jar
+- lib/io.grpc-grpc-testing-1.79.0.jar
Copyright 2014, gRPC Authors All rights reserved.
diff --git a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt
b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt
index 9099aeaab3..3370e8e6ff 100644
--- a/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt
@@ -53,15 +53,15 @@ under the License.
Copyright 2010 Cedric Beust [email protected]
------------------------------------------------------------------------------------
-- lib/io.grpc-grpc-all-1.72.0.jar
-- lib/io.grpc-grpc-auth-1.72.0.jar
-- lib/io.grpc-grpc-context-1.72.0.jar
-- lib/io.grpc-grpc-core-1.72.0.jar
-- lib/io.grpc-grpc-netty-shaded-1.72.0.jar
-- lib/io.grpc-grpc-protobuf-1.72.0.jar
-- lib/io.grpc-grpc-protobuf-lite-1.72.0.jar
-- lib/io.grpc-grpc-stub-1.72.0.jar
-- lib/io.grpc-grpc-testing-1.72.0.jar
+- lib/io.grpc-grpc-all-1.79.0.jar
+- lib/io.grpc-grpc-auth-1.79.0.jar
+- lib/io.grpc-grpc-context-1.79.0.jar
+- lib/io.grpc-grpc-core-1.79.0.jar
+- lib/io.grpc-grpc-netty-shaded-1.79.0.jar
+- lib/io.grpc-grpc-protobuf-1.79.0.jar
+- lib/io.grpc-grpc-protobuf-lite-1.79.0.jar
+- lib/io.grpc-grpc-stub-1.79.0.jar
+- lib/io.grpc-grpc-testing-1.79.0.jar
Copyright 2014, gRPC Authors All rights reserved.
diff --git a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
index b799b0b81b..cf55dd725f 100644
--- a/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
@@ -117,15 +117,15 @@ granted provided that the copyright notice appears in all
copies.
Copyright 2010 Cedric Beust [email protected]
------------------------------------------------------------------------------------
-- lib/io.grpc-grpc-all-1.72.0.jar
-- lib/io.grpc-grpc-auth-1.72.0.jar
-- lib/io.grpc-grpc-context-1.72.0.jar
-- lib/io.grpc-grpc-core-1.72.0.jar
-- lib/io.grpc-grpc-netty-shaded-1.72.0.jar
-- lib/io.grpc-grpc-protobuf-1.72.0.jar
-- lib/io.grpc-grpc-protobuf-lite-1.72.0.jar
-- lib/io.grpc-grpc-stub-1.72.0.jar
-- lib/io.grpc-grpc-testing-1.72.0.jar
+- lib/io.grpc-grpc-all-1.79.0.jar
+- lib/io.grpc-grpc-auth-1.79.0.jar
+- lib/io.grpc-grpc-context-1.79.0.jar
+- lib/io.grpc-grpc-core-1.79.0.jar
+- lib/io.grpc-grpc-netty-shaded-1.79.0.jar
+- lib/io.grpc-grpc-protobuf-1.79.0.jar
+- lib/io.grpc-grpc-protobuf-lite-1.79.0.jar
+- lib/io.grpc-grpc-stub-1.79.0.jar
+- lib/io.grpc-grpc-testing-1.79.0.jar
Copyright 2014, gRPC Authors All rights reserved.
diff --git a/bookkeeper-dist/src/main/resources/deps/protobuf-3.14.0/LICENSE
b/bookkeeper-dist/src/main/resources/deps/protobuf-3.14.0/LICENSE
deleted file mode 100644
index 2dcab42dae..0000000000
--- a/bookkeeper-dist/src/main/resources/deps/protobuf-3.14.0/LICENSE
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright 2014, Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it. This code is not
-standalone and requires a support library to be linked with it. This
-support library is itself covered by the above license.
diff --git a/bookkeeper-dist/src/main/resources/deps/protobuf-3.12.0/LICENSE
b/bookkeeper-dist/src/main/resources/deps/protobuf/LICENSE
similarity index 97%
rename from bookkeeper-dist/src/main/resources/deps/protobuf-3.12.0/LICENSE
rename to bookkeeper-dist/src/main/resources/deps/protobuf/LICENSE
index 2dcab42dae..19b305b000 100644
--- a/bookkeeper-dist/src/main/resources/deps/protobuf-3.12.0/LICENSE
+++ b/bookkeeper-dist/src/main/resources/deps/protobuf/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2014, Google Inc. All rights reserved.
+Copyright 2008 Google Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/bookkeeper-proto/pom.xml b/bookkeeper-proto/pom.xml
index 02e9f31b15..21e28cafce 100644
--- a/bookkeeper-proto/pom.xml
+++ b/bookkeeper-proto/pom.xml
@@ -50,7 +50,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${protobuf-maven-plugin.version}</version>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:${protoc3.version}:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
<checkStaleness>true</checkStaleness>
</configuration>
<executions>
diff --git a/pom.xml b/pom.xml
index 61df7dc992..33b6928564 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
<freebuilder.version>2.8.0</freebuilder.version>
<google.code.version>3.0.2</google.code.version>
<google.errorprone.version>2.9.0</google.errorprone.version>
- <grpc.version>1.72.0</grpc.version>
+ <grpc.version>1.79.0</grpc.version>
<guava.version>32.0.1-jre</guava.version>
<kerby.version>1.1.1</kerby.version>
<hadoop.version>3.4.2</hadoop.version>
@@ -164,8 +164,8 @@
<datasketches.version>0.8.3</datasketches.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.15</httpcore.version>
- <protobuf.version>3.25.5</protobuf.version>
- <protoc3.version>${protobuf.version}</protoc3.version>
+ <protobuf.version>4.34.0</protobuf.version>
+ <protoc.version>${protobuf.version}</protoc.version>
<protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
<reflections.version>0.9.11</reflections.version>
<rocksdb.version>9.9.3</rocksdb.version>
@@ -468,6 +468,10 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-servlet-jakarta</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/stream/proto/pom.xml b/stream/proto/pom.xml
index 1a30052dc8..108d69aca6 100644
--- a/stream/proto/pom.xml
+++ b/stream/proto/pom.xml
@@ -82,7 +82,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${protobuf-maven-plugin.version}</version>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:${protoc3.version}:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.version}:exe:${os.detected.classifier}</pluginArtifact>
<checkStaleness>true</checkStaleness>
diff --git a/stream/statelib/pom.xml b/stream/statelib/pom.xml
index 0a584d6bd5..73c1b349c1 100644
--- a/stream/statelib/pom.xml
+++ b/stream/statelib/pom.xml
@@ -117,7 +117,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${protobuf-maven-plugin.version}</version>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:${protoc3.version}:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
<executions>
<execution>
diff --git a/stream/tests-common/pom.xml b/stream/tests-common/pom.xml
index 8fe9c6b13f..bdd3b8ab2d 100644
--- a/stream/tests-common/pom.xml
+++ b/stream/tests-common/pom.xml
@@ -74,7 +74,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${protobuf-maven-plugin.version}</version>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:${protoc3.version}:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${protoc-gen-grpc-java.version}:exe:${os.detected.classifier}</pluginArtifact>
<checkStaleness>true</checkStaleness>
