Skip to content

Commit e7853aa

Browse files
merlimatlhotari
authored andcommitted
Upgrade gRPC to 1.70.0 (#4512)
* Upgrade gRPC to 1.67.1 * Fixed license files * Removed io.opentelemetry-opentelemetry-api-incubator-1.43.0-alpha.jar from license * Bringing it back for bkctl (cherry picked from commit 3e8ca44)
1 parent f629316 commit e7853aa

File tree

7 files changed

+147
-124
lines changed

7 files changed

+147
-124
lines changed

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

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -276,29 +276,29 @@ Apache Software License, Version 2.
276276
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
277277
- lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25]
278278
- lib/net.jpountz.lz4-lz4-1.3.0.jar [26]
279-
- lib/com.google.api.grpc-proto-google-common-protos-2.29.0.jar [28]
280-
- lib/com.google.code.gson-gson-2.10.1.jar [29]
279+
- lib/com.google.api.grpc-proto-google-common-protos-2.48.0.jar [28]
280+
- lib/com.google.code.gson-gson-2.11.0.jar [29]
281281
- lib/io.opencensus-opencensus-api-0.31.1.jar [30]
282282
- lib/io.opencensus-opencensus-contrib-http-util-0.31.1.jar [30]
283-
- lib/io.opencensus-opencensus-proto-0.2.0.jar [30]
284-
- lib/io.grpc-grpc-all-1.64.0.jar [33]
285-
- lib/io.grpc-grpc-alts-1.64.0.jar [33]
286-
- lib/io.grpc-grpc-api-1.64.0.jar [33]
287-
- lib/io.grpc-grpc-auth-1.64.0.jar [33]
288-
- lib/io.grpc-grpc-context-1.64.0.jar [33]
289-
- lib/io.grpc-grpc-core-1.64.0.jar [33]
290-
- lib/io.grpc-grpc-grpclb-1.64.0.jar [33]
291-
- lib/io.grpc-grpc-inprocess-1.64.0.jar [33]
292-
- lib/io.grpc-grpc-opentelemetry-1.64.0.jar [33]
293-
- lib/io.grpc-grpc-netty-1.64.0.jar [33]
294-
- lib/io.grpc-grpc-protobuf-1.64.0.jar [33]
295-
- lib/io.grpc-grpc-protobuf-lite-1.64.0.jar [33]
296-
- lib/io.grpc-grpc-services-1.64.0.jar [33]
297-
- lib/io.grpc-grpc-stub-1.64.0.jar [33]
298-
- lib/io.grpc-grpc-testing-1.64.0.jar [33]
299-
- lib/io.grpc-grpc-util-1.64.0.jar [33]
300-
- lib/io.grpc-grpc-xds-1.64.0.jar [33]
301-
- lib/io.grpc-grpc-rls-1.64.0.jar[33]
283+
- lib/io.grpc-grpc-all-1.70.0.jar [33]
284+
- lib/io.grpc-grpc-alts-1.70.0.jar [33]
285+
- lib/io.grpc-grpc-api-1.70.0.jar [33]
286+
- lib/io.grpc-grpc-auth-1.70.0.jar [33]
287+
- lib/io.grpc-grpc-context-1.70.0.jar [33]
288+
- lib/io.grpc-grpc-core-1.70.0.jar [33]
289+
- lib/io.grpc-grpc-grpclb-1.70.0.jar [33]
290+
- lib/io.grpc-grpc-inprocess-1.70.0.jar [33]
291+
- lib/io.grpc-grpc-opentelemetry-1.70.0.jar [33]
292+
- lib/io.grpc-grpc-netty-shaded-1.70.0.jar [33]
293+
- lib/io.grpc-grpc-protobuf-1.70.0.jar [33]
294+
- lib/io.grpc-grpc-protobuf-lite-1.70.0.jar [33]
295+
- lib/io.grpc-grpc-services-1.70.0.jar [33]
296+
- lib/io.grpc-grpc-stub-1.70.0.jar [33]
297+
- lib/io.grpc-grpc-testing-1.70.0.jar [33]
298+
- lib/io.grpc-grpc-util-1.70.0.jar [33]
299+
- lib/io.grpc-grpc-xds-1.70.0.jar [33]
300+
- lib/io.grpc-grpc-rls-1.70.0.jar[33]
301+
- lib/io.grpc-grpc-gcp-csm-observability-1.70.0.jar [33]
302302
- lib/org.apache.curator-curator-client-5.7.1.jar [34]
303303
- lib/org.apache.curator-curator-framework-5.7.1.jar [34]
304304
- lib/org.apache.curator-curator-recipes-5.7.1.jar [34]
@@ -309,16 +309,16 @@ Apache Software License, Version 2.
309309
- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [40]
310310
- lib/org.apache.thrift-libthrift-0.14.2.jar [41]
311311
- lib/com.google.android-annotations-4.1.1.4.jar [42]
312-
- lib/com.google.http-client-google-http-client-1.43.3.jar [43]
313-
- lib/com.google.http-client-google-http-client-gson-1.43.3.jar [43]
314-
- lib/com.google.auto.value-auto-value-annotations-1.10.4.jar [44]
312+
- lib/com.google.http-client-google-http-client-1.44.2.jar [43]
313+
- lib/com.google.http-client-google-http-client-gson-1.44.2.jar [43]
314+
- lib/com.google.auto.value-auto-value-annotations-1.11.0.jar [44]
315315
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [45]
316316
- lib/com.google.re2j-re2j-1.7.jar [46]
317317
- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47]
318318
- lib/io.dropwizard.metrics-metrics-graphite-4.1.12.1.jar [47]
319319
- lib/io.dropwizard.metrics-metrics-jmx-4.1.12.1.jar [47]
320320
- lib/io.dropwizard.metrics-metrics-jvm-4.1.12.1.jar [47]
321-
- lib/io.perfmark-perfmark-api-0.26.0.jar [48]
321+
- lib/io.perfmark-perfmark-api-0.27.0.jar [48]
322322
- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49]
323323
- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50]
324324
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
@@ -344,9 +344,12 @@ Apache Software License, Version 2.
344344
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [55]
345345
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [55]
346346
- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [55]
347+
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar [55]
348+
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [55]
347349
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.26.0.jar [55]
348350
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.26.0-alpha.jar [55]
349351
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-metrics-1.26.0-alpha.jar [54]
352+
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
350353
- lib/org.jetbrains-annotations-13.0.jar [56]
351354
- lib/org.jetbrains.kotlin-kotlin-stdlib-1.8.21.jar [56]
352355
- lib/org.jetbrains.kotlin-kotlin-stdlib-common-1.8.21.jar [56]
@@ -378,10 +381,10 @@ Apache Software License, Version 2.
378381
[24] Source available at https://github.com/cbeust/jcommander/tree/1.82
379382
[25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3
380383
[26] Source available at https://github.com/lz4/lz4-java/tree/1.3.0
381-
[28] Source available at https://github.com/googleapis/java-common-protos/tree/v2.29.0
382-
[29] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1
384+
[28] Source available at https://github.com/googleapis/java-common-protos/tree/v2.48.0
385+
[29] Source available at https://github.com/google/gson/tree/gson-parent-2.11.0
383386
[30] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.31.1
384-
[33] Source available at https://github.com/grpc/grpc-java/tree/v1.64.0
387+
[33] Source available at https://github.com/grpc/grpc-java/tree/v1.70.0
385388
[34] Source available at https://github.com/apache/curator/releases/tag/apache.curator-5.7.1
386389
[36] Source available at https://github.com/google/error-prone/tree/v2.9.0
387390
[37] Source available at https://github.com/apache/yetus/tree/rel/0.12.0
@@ -395,7 +398,7 @@ Apache Software License, Version 2.
395398
[45] Source available at https://github.com/google/j2objc/releases/tag/1.3
396399
[46] Source available at https://github.com/google/re2j/releases/tag/re2j-1.7
397400
[47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1
398-
[48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0
401+
[48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.27.0
399402
[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2
400403
[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5
401404
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
@@ -701,9 +704,9 @@ This product bundles the Google Auth Library, which is available under a "3-clau
701704
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
702705

703706
Bundled as
704-
- lib/com.google.auth-google-auth-library-credentials-1.22.0.jar
705-
- lib/com.google.auth-google-auth-library-oauth2-http-1.22.0.jar
706-
Source available at https://github.com/googleapis/google-auth-library-java/releases/tag/v1.22.0
707+
- lib/com.google.auth-google-auth-library-credentials-1.24.1.jar
708+
- lib/com.google.auth-google-auth-library-oauth2-http-1.24.1.jar
709+
Source available at https://github.com/googleapis/google-auth-library-java/releases/tag/v1.24.1
707710
------------------------------------------------------------------------------------
708711
This product bundles the bouncycastle Library.
709712
For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html

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

Lines changed: 49 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -247,29 +247,29 @@ Apache Software License, Version 2.
247247
- lib/org.apache.zookeeper-zookeeper-3.9.3-tests.jar [20]
248248
- lib/com.beust-jcommander-1.82.jar [23]
249249
- lib/net.jpountz.lz4-lz4-1.3.0.jar [25]
250-
- lib/com.google.api.grpc-proto-google-common-protos-2.29.0.jar [27]
251-
- lib/com.google.code.gson-gson-2.10.1.jar [28]
250+
- lib/com.google.api.grpc-proto-google-common-protos-2.48.0.jar [27]
251+
- lib/com.google.code.gson-gson-2.11.0.jar [28]
252252
- lib/io.opencensus-opencensus-api-0.31.1.jar [29]
253253
- lib/io.opencensus-opencensus-contrib-http-util-0.31.1.jar [29]
254-
- lib/io.opencensus-opencensus-proto-0.2.0.jar [29]
255-
- lib/io.grpc-grpc-all-1.64.0.jar [32]
256-
- lib/io.grpc-grpc-alts-1.64.0.jar [32]
257-
- lib/io.grpc-grpc-api-1.64.0.jar [32]
258-
- lib/io.grpc-grpc-auth-1.64.0.jar [32]
259-
- lib/io.grpc-grpc-context-1.64.0.jar [32]
260-
- lib/io.grpc-grpc-core-1.64.0.jar [32]
261-
- lib/io.grpc-grpc-grpclb-1.64.0.jar [32]
262-
- lib/io.grpc-grpc-inprocess-1.64.0.jar [32]
263-
- lib/io.grpc-grpc-opentelemetry-1.64.0.jar [32]
264-
- lib/io.grpc-grpc-netty-1.64.0.jar [32]
265-
- lib/io.grpc-grpc-protobuf-1.64.0.jar [32]
266-
- lib/io.grpc-grpc-protobuf-lite-1.64.0.jar [32]
267-
- lib/io.grpc-grpc-services-1.64.0.jar [32]
268-
- lib/io.grpc-grpc-stub-1.64.0.jar [32]
269-
- lib/io.grpc-grpc-testing-1.64.0.jar [32]
270-
- lib/io.grpc-grpc-util-1.64.0.jar [32]
271-
- lib/io.grpc-grpc-xds-1.64.0.jar [32]
272-
- lib/io.grpc-grpc-rls-1.64.0.jar[32]
254+
- lib/io.grpc-grpc-all-1.70.0.jar [32]
255+
- lib/io.grpc-grpc-alts-1.70.0.jar [32]
256+
- lib/io.grpc-grpc-api-1.70.0.jar [32]
257+
- lib/io.grpc-grpc-auth-1.70.0.jar [32]
258+
- lib/io.grpc-grpc-context-1.70.0.jar [32]
259+
- lib/io.grpc-grpc-core-1.70.0.jar [32]
260+
- lib/io.grpc-grpc-grpclb-1.70.0.jar [32]
261+
- lib/io.grpc-grpc-inprocess-1.70.0.jar [32]
262+
- lib/io.grpc-grpc-opentelemetry-1.70.0.jar [32]
263+
- lib/io.grpc-grpc-netty-shaded-1.70.0.jar [32]
264+
- lib/io.grpc-grpc-protobuf-1.70.0.jar [32]
265+
- lib/io.grpc-grpc-protobuf-lite-1.70.0.jar [32]
266+
- lib/io.grpc-grpc-services-1.70.0.jar [32]
267+
- lib/io.grpc-grpc-stub-1.70.0.jar [32]
268+
- lib/io.grpc-grpc-testing-1.70.0.jar [32]
269+
- lib/io.grpc-grpc-util-1.70.0.jar [32]
270+
- lib/io.grpc-grpc-xds-1.70.0.jar [32]
271+
- lib/io.grpc-grpc-rls-1.70.0.jar[32]
272+
- lib/io.grpc-grpc-gcp-csm-observability-1.70.0.jar [32]
273273
- lib/org.apache.curator-curator-client-5.7.1.jar [33]
274274
- lib/org.apache.curator-curator-framework-5.7.1.jar [33]
275275
- lib/org.apache.curator-curator-recipes-5.7.1.jar [33]
@@ -280,19 +280,36 @@ Apache Software License, Version 2.
280280
- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [39]
281281
- lib/org.apache.thrift-libthrift-0.14.2.jar [40]
282282
- lib/com.google.android-annotations-4.1.1.4.jar [41]
283-
- lib/com.google.auto.value-auto-value-annotations-1.10.4.jar [42]
284-
- lib/com.google.http-client-google-http-client-1.43.3.jar [43]
285-
- lib/com.google.http-client-google-http-client-gson-1.43.3.jar [43]
283+
- lib/com.google.auto.value-auto-value-annotations-1.11.0.jar [42]
284+
- lib/com.google.http-client-google-http-client-1.44.2.jar [43]
285+
- lib/com.google.http-client-google-http-client-gson-1.44.2.jar [43]
286286
- lib/com.google.j2objc-j2objc-annotations-2.8.jar [44]
287287
- lib/com.google.re2j-re2j-1.7.jar [45]
288288
- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46]
289-
- lib/io.perfmark-perfmark-api-0.26.0.jar [47]
289+
- lib/io.perfmark-perfmark-api-0.27.0.jar [47]
290290
- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49]
291291
- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50]
292292
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
293293
- lib/com.carrotsearch-hppc-0.9.1.jar [52]
294294
- lib/io.opentelemetry-opentelemetry-api-1.26.0.jar [54]
295295
- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [54]
296+
- lib/io.opentelemetry-opentelemetry-api-1.26.0.jar [55]
297+
- lib/io.opentelemetry-opentelemetry-api-events-1.26.0-alpha.jar [55]
298+
- lib/io.opentelemetry-opentelemetry-api-logs-1.26.0-alpha.jar [55]
299+
- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [55]
300+
- lib/io.opentelemetry-opentelemetry-extension-incubator-1.26.0-alpha.jar [55]
301+
- lib/io.opentelemetry-opentelemetry-sdk-1.26.0.jar [55]
302+
- lib/io.opentelemetry-opentelemetry-sdk-common-1.26.0.jar [55]
303+
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.26.0.jar [55]
304+
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.26.0-alpha.jar [55]
305+
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [55]
306+
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [55]
307+
- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [55]
308+
- lib/io.opentelemetry-opentelemetry-api-incubator-1.43.0-alpha.jar [55]
309+
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar [55]
310+
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [55]
311+
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.43.0.jar [55]
312+
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
296313

297314
[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
298315
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
@@ -311,10 +328,10 @@ Apache Software License, Version 2.
311328
[20] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
312329
[23] Source available at https://github.com/cbeust/jcommander/tree/1.82
313330
[25] Source available at https://github.com/lz4/lz4-java/tree/1.3.0
314-
[27] Source available at https://github.com/googleapis/java-common-protos/tree/v2.29.0
315-
[28] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1
331+
[27] Source available at https://github.com/googleapis/java-common-protos/tree/v2.48.0
332+
[28] Source available at https://github.com/google/gson/tree/gson-parent-2.11.0
316333
[29] Source available at https://github.com/census-instrumentation/opencensus-java/tree/v0.31.1
317-
[32] Source available at https://github.com/grpc/grpc-java/tree/v1.64.0
334+
[32] Source available at https://github.com/grpc/grpc-java/tree/v1.70.0
318335
[33] Source available at https://github.com/apache/curator/tree/apache-curator-5.7.1
319336
[35] Source available at https://github.com/google/error-prone/tree/v2.9.0
320337
[36] Source available at https://github.com/apache/yetus/tree/rel/0.12.0
@@ -328,7 +345,7 @@ Apache Software License, Version 2.
328345
[44] Source available at https://github.com/google/j2objc/releases/tag/1.3
329346
[45] Source available at https://github.com/google/re2j/releases/tag/re2j-1.7
330347
[46] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1
331-
[47] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0
348+
[47] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.27.0
332349
[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2
333350
[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5
334351
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
@@ -587,9 +604,9 @@ This product bundles the Google Auth Library, which is available under a "3-clau
587604
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
588605

589606
Bundled as
590-
- lib/com.google.auth-google-auth-library-credentials-1.22.0.jar
591-
- lib/com.google.auth-google-auth-library-oauth2-http-1.22.0.jar
592-
Source available at https://github.com/google/google-auth-library-java/tree/1.22.0
607+
- lib/com.google.auth-google-auth-library-credentials-1.24.1.jar
608+
- lib/com.google.auth-google-auth-library-oauth2-http-1.24.1.jar
609+
Source available at https://github.com/google/google-auth-library-java/tree/1.24.1
593610
------------------------------------------------------------------------------------
594611
This product bundles the bouncycastle Library.
595612
For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html

0 commit comments

Comments
 (0)