Skip to content

Commit a583e80

Browse files
authored
Upgrade protobuf and grpc to latest versions (#4716)
1 parent ab2b29d commit a583e80

File tree

16 files changed

+156
-181
lines changed

16 files changed

+156
-181
lines changed

bookkeeper-dist/src/assemble/bin-all.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@
6666
<include>jsr-305/LICENSE</include>
6767
<include>netty/*</include>
6868
<include>paranamer-2.8/LICENSE.txt</include>
69-
<include>protobuf-3.14.0/LICENSE</include>
70-
<include>protobuf-3.12.0/LICENSE</include>
69+
<include>protobuf/LICENSE</include>
7170
<include>reactivestreams-1.0.3/LICENSE</include>
7271
<include>scala-library-2.11.7/LICENSE.md</include>
7372
<include>scala-parser-combinators_2.11-1.0.4/LICENSE.md</include>

bookkeeper-dist/src/assemble/bin-server.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
<include>javax.servlet-api-4.0.0/CDDL+GPL-1.1</include>
5555
<include>netty/*</include>
5656
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
57-
<include>protobuf-3.14.0/LICENSE</include>
58-
<include>protobuf-3.12.0/LICENSE</include>
57+
<include>protobuf/LICENSE</include>
5958
<include>reactivestreams-1.0.3/LICENSE</include>
6059
<include>slf4j-2.0.12/LICENSE.txt</include>
6160
</includes>

bookkeeper-dist/src/assemble/bkctl.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@
7171
<include>google-auth-library-credentials-0.20.0/LICENSE</include>
7272
<include>netty/*</include>
7373
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
74-
<include>protobuf-3.14.0/LICENSE</include>
75-
<include>protobuf-3.12.0/LICENSE</include>
74+
<include>protobuf/LICENSE</include>
7675
<include>reactivestreams-1.0.3/LICENSE</include>
7776
<include>slf4j-2.0.12/LICENSE.txt</include>
7877
</includes>

bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -277,29 +277,30 @@ Apache Software License, Version 2.
277277
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
278278
- lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25]
279279
- lib/at.yawk.lz4-lz4-java-1.10.2.jar [26]
280-
- lib/com.google.api.grpc-proto-google-common-protos-2.51.0.jar [28]
281-
- lib/com.google.code.gson-gson-2.11.0.jar [29]
280+
- lib/com.google.api-api-common-2.53.0.jar [63]
281+
- lib/com.google.api.grpc-proto-google-common-protos-2.63.2.jar [28]
282+
- lib/com.google.code.gson-gson-2.12.1.jar [29]
282283
- lib/io.opencensus-opencensus-api-0.31.1.jar [30]
283284
- lib/io.opencensus-opencensus-contrib-http-util-0.31.1.jar [30]
284-
- lib/io.grpc-grpc-all-1.72.0.jar [33]
285-
- lib/io.grpc-grpc-alts-1.72.0.jar [33]
286-
- lib/io.grpc-grpc-api-1.72.0.jar [33]
287-
- lib/io.grpc-grpc-auth-1.72.0.jar [33]
288-
- lib/io.grpc-grpc-context-1.72.0.jar [33]
289-
- lib/io.grpc-grpc-core-1.72.0.jar [33]
290-
- lib/io.grpc-grpc-grpclb-1.72.0.jar [33]
291-
- lib/io.grpc-grpc-inprocess-1.72.0.jar [33]
292-
- lib/io.grpc-grpc-opentelemetry-1.72.0.jar [33]
293-
- lib/io.grpc-grpc-netty-shaded-1.72.0.jar [33]
294-
- lib/io.grpc-grpc-protobuf-1.72.0.jar [33]
295-
- lib/io.grpc-grpc-protobuf-lite-1.72.0.jar [33]
296-
- lib/io.grpc-grpc-services-1.72.0.jar [33]
297-
- lib/io.grpc-grpc-stub-1.72.0.jar [33]
298-
- lib/io.grpc-grpc-testing-1.72.0.jar [33]
299-
- lib/io.grpc-grpc-util-1.72.0.jar [33]
300-
- lib/io.grpc-grpc-xds-1.72.0.jar [33]
301-
- lib/io.grpc-grpc-rls-1.72.0.jar[33]
302-
- lib/io.grpc-grpc-gcp-csm-observability-1.72.0.jar [33]
285+
- lib/io.grpc-grpc-all-1.79.0.jar [33]
286+
- lib/io.grpc-grpc-alts-1.79.0.jar [33]
287+
- lib/io.grpc-grpc-api-1.79.0.jar [33]
288+
- lib/io.grpc-grpc-auth-1.79.0.jar [33]
289+
- lib/io.grpc-grpc-context-1.79.0.jar [33]
290+
- lib/io.grpc-grpc-core-1.79.0.jar [33]
291+
- lib/io.grpc-grpc-grpclb-1.79.0.jar [33]
292+
- lib/io.grpc-grpc-inprocess-1.79.0.jar [33]
293+
- lib/io.grpc-grpc-opentelemetry-1.79.0.jar [33]
294+
- lib/io.grpc-grpc-netty-shaded-1.79.0.jar [33]
295+
- lib/io.grpc-grpc-protobuf-1.79.0.jar [33]
296+
- lib/io.grpc-grpc-protobuf-lite-1.79.0.jar [33]
297+
- lib/io.grpc-grpc-services-1.79.0.jar [33]
298+
- lib/io.grpc-grpc-stub-1.79.0.jar [33]
299+
- lib/io.grpc-grpc-testing-1.79.0.jar [33]
300+
- lib/io.grpc-grpc-util-1.79.0.jar [33]
301+
- lib/io.grpc-grpc-xds-1.79.0.jar [33]
302+
- lib/io.grpc-grpc-rls-1.79.0.jar[33]
303+
- lib/io.grpc-grpc-gcp-csm-observability-1.79.0.jar [33]
303304
- lib/org.apache.curator-curator-client-5.7.1.jar [34]
304305
- lib/org.apache.curator-curator-framework-5.7.1.jar [34]
305306
- lib/org.apache.curator-curator-recipes-5.7.1.jar [34]
@@ -310,8 +311,8 @@ Apache Software License, Version 2.
310311
- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [40]
311312
- lib/org.apache.thrift-libthrift-0.14.2.jar [41]
312313
- lib/com.google.android-annotations-4.1.1.4.jar [42]
313-
- lib/com.google.http-client-google-http-client-1.44.2.jar [43]
314-
- lib/com.google.http-client-google-http-client-gson-1.44.2.jar [43]
314+
- lib/com.google.http-client-google-http-client-2.0.2.jar [43]
315+
- lib/com.google.http-client-google-http-client-gson-2.0.2.jar [43]
315316
- lib/com.google.auto.value-auto-value-annotations-1.11.0.jar [44]
316317
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [45]
317318
- lib/com.google.re2j-re2j-1.8.jar [46]
@@ -384,10 +385,10 @@ Apache Software License, Version 2.
384385
[24] Source available at https://github.com/cbeust/jcommander/tree/1.82
385386
[25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3
386387
[26] Source available at https://github.com/yawkat/lz4-java/tree/v1.10.2
387-
[28] Source available at https://github.com/googleapis/java-common-protos/tree/v2.51.0
388-
[29] Source available at https://github.com/google/gson/tree/gson-parent-2.11.0
388+
[28] Source available at https://github.com/googleapis/sdk-platform-java/tree/v2.63.2/java-common-protos
389+
[29] Source available at https://github.com/google/gson/tree/gson-parent-2.12.1
389390
[30] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.31.1
390-
[33] Source available at https://github.com/grpc/grpc-java/tree/v1.72.0
391+
[33] Source available at https://github.com/grpc/grpc-java/tree/v1.79.0
391392
[34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.7.1
392393
[36] Source available at https://github.com/google/error-prone/tree/v2.9.0
393394
[37] Source available at https://github.com/apache/yetus/tree/rel/0.12.0
@@ -396,7 +397,7 @@ Apache Software License, Version 2.
396397
[40] Source available at https://github.com/apache/httpcomponents-core/tree/rel/v4.4.15
397398
[41] Source available at https://github.com/apache/thrift/tree/0.14.2
398399
[42] Source available at https://source.android.com/
399-
[43] Source available at https://github.com/googleapis/google-http-java-client/releases/tag/v1.43.3
400+
[43] Source available at https://github.com/googleapis/google-http-java-client/releases/tag/v2.0.2
400401
[44] Source available at https://github.com/google/auto/releases/tag/auto-value-1.10.4
401402
[45] Source available at https://github.com/google/j2objc/releases/tag/1.3
402403
[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.8
@@ -416,6 +417,7 @@ Apache Software License, Version 2.
416417
[60] Source available at https://github.com/prometheus/client_java/tree/v1.3.10
417418
[61] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
418419
[62] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
420+
[63] Source available at https://github.com/googleapis/sdk-platform-java/tree/v2.53.0/api-common-java
419421
------------------------------------------------------------------------------------
420422
lib/io.netty-netty-codec-4.1.130.Final.jar bundles some 3rd party dependencies
421423

@@ -685,14 +687,14 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau
685687
license.
686688

687689
Bundled as
688-
- lib/com.google.protobuf-protobuf-java-3.25.5.jar
689-
Source available at https://github.com/google/protobuf/tree/v3.25.5
690-
For details, see deps/protobuf-3.14.0/LICENSE.
690+
- lib/com.google.protobuf-protobuf-java-4.34.0.jar
691+
Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
692+
For details, see deps/protobuf/LICENSE.
691693

692694
Bundled as
693-
- lib/com.google.protobuf-protobuf-java-util-3.25.5.jar
694-
Source available at https://github.com/protocolbuffers/protobuf/tree/v3.25.5
695-
For details, see deps/protobuf-3.12.0/LICENSE.
695+
- lib/com.google.protobuf-protobuf-java-util-4.34.0.jar
696+
Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
697+
For details, see deps/protobuf/LICENSE.
696698
------------------------------------------------------------------------------------
697699
This product bundles the JCP Standard Java Servlet API, which is available under a
698700
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
711713
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
712714

713715
Bundled as
714-
- lib/com.google.auth-google-auth-library-credentials-1.24.1.jar
715-
- lib/com.google.auth-google-auth-library-oauth2-http-1.24.1.jar
716-
Source available at https://github.com/googleapis/google-auth-library-java/releases/tag/v1.24.1
716+
- lib/com.google.auth-google-auth-library-credentials-1.41.0.jar
717+
- lib/com.google.auth-google-auth-library-oauth2-http-1.41.0.jar
718+
Source available at https://github.com/googleapis/google-auth-library-java/releases/tag/v1.41.0
717719
------------------------------------------------------------------------------------
718720
This product bundles the bouncycastle Library.
719721
For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html

bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -248,29 +248,30 @@ Apache Software License, Version 2.
248248
- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [20]
249249
- lib/com.beust-jcommander-1.82.jar [23]
250250
- lib/at.yawk.lz4-lz4-java-1.10.2.jar [25]
251-
- lib/com.google.api.grpc-proto-google-common-protos-2.51.0.jar [27]
252-
- lib/com.google.code.gson-gson-2.11.0.jar [28]
251+
- lib/com.google.api-api-common-2.53.0.jar [58]
252+
- lib/com.google.api.grpc-proto-google-common-protos-2.63.2.jar [27]
253+
- lib/com.google.code.gson-gson-2.12.1.jar [28]
253254
- lib/io.opencensus-opencensus-api-0.31.1.jar [29]
254255
- lib/io.opencensus-opencensus-contrib-http-util-0.31.1.jar [29]
255-
- lib/io.grpc-grpc-all-1.72.0.jar [32]
256-
- lib/io.grpc-grpc-alts-1.72.0.jar [32]
257-
- lib/io.grpc-grpc-api-1.72.0.jar [32]
258-
- lib/io.grpc-grpc-auth-1.72.0.jar [32]
259-
- lib/io.grpc-grpc-context-1.72.0.jar [32]
260-
- lib/io.grpc-grpc-core-1.72.0.jar [32]
261-
- lib/io.grpc-grpc-grpclb-1.72.0.jar [32]
262-
- lib/io.grpc-grpc-inprocess-1.72.0.jar [32]
263-
- lib/io.grpc-grpc-opentelemetry-1.72.0.jar [32]
264-
- lib/io.grpc-grpc-netty-shaded-1.72.0.jar [32]
265-
- lib/io.grpc-grpc-protobuf-1.72.0.jar [32]
266-
- lib/io.grpc-grpc-protobuf-lite-1.72.0.jar [32]
267-
- lib/io.grpc-grpc-services-1.72.0.jar [32]
268-
- lib/io.grpc-grpc-stub-1.72.0.jar [32]
269-
- lib/io.grpc-grpc-testing-1.72.0.jar [32]
270-
- lib/io.grpc-grpc-util-1.72.0.jar [32]
271-
- lib/io.grpc-grpc-xds-1.72.0.jar [32]
272-
- lib/io.grpc-grpc-rls-1.72.0.jar[32]
273-
- lib/io.grpc-grpc-gcp-csm-observability-1.72.0.jar [32]
256+
- lib/io.grpc-grpc-all-1.79.0.jar [32]
257+
- lib/io.grpc-grpc-alts-1.79.0.jar [32]
258+
- lib/io.grpc-grpc-api-1.79.0.jar [32]
259+
- lib/io.grpc-grpc-auth-1.79.0.jar [32]
260+
- lib/io.grpc-grpc-context-1.79.0.jar [32]
261+
- lib/io.grpc-grpc-core-1.79.0.jar [32]
262+
- lib/io.grpc-grpc-grpclb-1.79.0.jar [32]
263+
- lib/io.grpc-grpc-inprocess-1.79.0.jar [32]
264+
- lib/io.grpc-grpc-opentelemetry-1.79.0.jar [32]
265+
- lib/io.grpc-grpc-netty-shaded-1.79.0.jar [32]
266+
- lib/io.grpc-grpc-protobuf-1.79.0.jar [32]
267+
- lib/io.grpc-grpc-protobuf-lite-1.79.0.jar [32]
268+
- lib/io.grpc-grpc-services-1.79.0.jar [32]
269+
- lib/io.grpc-grpc-stub-1.79.0.jar [32]
270+
- lib/io.grpc-grpc-testing-1.79.0.jar [32]
271+
- lib/io.grpc-grpc-util-1.79.0.jar [32]
272+
- lib/io.grpc-grpc-xds-1.79.0.jar [32]
273+
- lib/io.grpc-grpc-rls-1.79.0.jar[32]
274+
- lib/io.grpc-grpc-gcp-csm-observability-1.79.0.jar [32]
274275
- lib/org.apache.curator-curator-client-5.7.1.jar [33]
275276
- lib/org.apache.curator-curator-framework-5.7.1.jar [33]
276277
- lib/org.apache.curator-curator-recipes-5.7.1.jar [33]
@@ -282,8 +283,8 @@ Apache Software License, Version 2.
282283
- lib/org.apache.thrift-libthrift-0.14.2.jar [40]
283284
- lib/com.google.android-annotations-4.1.1.4.jar [41]
284285
- lib/com.google.auto.value-auto-value-annotations-1.11.0.jar [42]
285-
- lib/com.google.http-client-google-http-client-1.44.2.jar [43]
286-
- lib/com.google.http-client-google-http-client-gson-1.44.2.jar [43]
286+
- lib/com.google.http-client-google-http-client-2.0.2.jar [43]
287+
- lib/com.google.http-client-google-http-client-gson-2.0.2.jar [43]
287288
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [44]
288289
- lib/com.google.re2j-re2j-1.8.jar [45]
289290
- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46]
@@ -326,10 +327,10 @@ Apache Software License, Version 2.
326327
[20] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
327328
[23] Source available at https://github.com/cbeust/jcommander/tree/1.82
328329
[25] Source available at https://github.com/yawkat/lz4-java/tree/v1.10.2
329-
[27] Source available at https://github.com/googleapis/java-common-protos/tree/v2.51.0
330-
[28] Source available at https://github.com/google/gson/tree/gson-parent-2.11.0
330+
[27] Source available at https://github.com/googleapis/sdk-platform-java/tree/v2.63.2/java-common-protos
331+
[28] Source available at https://github.com/google/gson/tree/gson-parent-2.12.1
331332
[29] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.31.1
332-
[32] Source available at https://github.com/grpc/grpc-java/tree/v1.72.0
333+
[32] Source available at https://github.com/grpc/grpc-java/tree/v1.79.0
333334
[33] Source available at https://github.com/apache/curator/tree/apache-curator-5.7.1
334335
[35] Source available at https://github.com/google/error-prone/tree/v2.9.0
335336
[36] Source available at https://github.com/apache/yetus/tree/rel/0.12.0
@@ -339,7 +340,7 @@ Apache Software License, Version 2.
339340
[40] Source available at https://github.com/apache/thrift/tree/0.14.2
340341
[41] Source available at https://source.android.com/
341342
[42] Source available at https://github.com/google/auto/releases/tag/auto-value-1.10.4
342-
[43] Source available at https://github.com/googleapis/google-http-java-client/releases/tag/v1.43.3
343+
[43] Source available at https://github.com/googleapis/google-http-java-client/releases/tag/v2.0.2
343344
[44] Source available at https://github.com/google/j2objc/releases/tag/1.3
344345
[45] Source available at https://github.com/google/re2j/releases/tag/re2j-1.8
345346
[46] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1
@@ -353,6 +354,7 @@ Apache Software License, Version 2.
353354
[55] Source available at https://github.com/apache/commons-lang/tree/rel/commons-lang-3.17.0
354355
[56] Source available at https://github.com/apache/commons-text/tree/rel/commons-text-1.13.1
355356
[57] Source available at https://github.com/apache/commons-beanutils/tree/rel/commons-beanutils-1.11.0
357+
[58] Source available at https://github.com/googleapis/sdk-platform-java/tree/v2.53.0/api-common-java
356358
------------------------------------------------------------------------------------
357359
lib/io.netty-netty-codec-4.1.130.Final.jar bundles some 3rd party dependencies
358360

@@ -585,14 +587,14 @@ This product bundles Google Protocol Buffers, which is available under a "3-clau
585587
license.
586588

587589
Bundled as
588-
- lib/com.google.protobuf-protobuf-java-3.25.5.jar
589-
Source available at https://github.com/google/protobuf/tree/v3.25.5
590-
For details, see deps/protobuf-3.14.0/LICENSE.
590+
- lib/com.google.protobuf-protobuf-java-4.34.0.jar
591+
Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
592+
For details, see deps/protobuf/LICENSE.
591593

592594
Bundled as
593-
- lib/com.google.protobuf-protobuf-java-util-3.25.5.jar
594-
Source available at https://github.com/protocolbuffers/protobuf/tree/v3.25.5
595-
For details, see deps/protobuf-3.12.0/LICENSE.
595+
- lib/com.google.protobuf-protobuf-java-util-4.34.0.jar
596+
Source available at https://github.com/protocolbuffers/protobuf/tree/v34.0/java
597+
For details, see deps/protobuf/LICENSE.
596598
------------------------------------------------------------------------------------
597599
This product bundles Simple Logging Facade for Java, which is available under a
598600
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
605607
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
606608

607609
Bundled as
608-
- lib/com.google.auth-google-auth-library-credentials-1.24.1.jar
609-
- lib/com.google.auth-google-auth-library-oauth2-http-1.24.1.jar
610-
Source available at https://github.com/google/google-auth-library-java/tree/1.24.1
610+
- lib/com.google.auth-google-auth-library-credentials-1.41.0.jar
611+
- lib/com.google.auth-google-auth-library-oauth2-http-1.41.0.jar
612+
Source available at https://github.com/google/google-auth-library-java/tree/1.41.0
611613
------------------------------------------------------------------------------------
612614
This product bundles the bouncycastle Library.
613615
For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html

0 commit comments

Comments
 (0)