Skip to content

Commit

Permalink
Upgrade gRPC to 1.70.0 (#4512)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@merlimat
merlimat authored Feb 6, 2025
1 parent 1e2c6ef commit 3e8ca44
Show file tree
Hide file tree
Showing 7 changed files with 147 additions and 124 deletions.
67 changes: 35 additions & 32 deletions bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,29 +276,29 @@ 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/net.jpountz.lz4-lz4-1.3.0.jar [26]
- lib/com.google.api.grpc-proto-google-common-protos-2.29.0.jar [28]
- lib/com.google.code.gson-gson-2.10.1.jar [29]
- lib/com.google.api.grpc-proto-google-common-protos-2.48.0.jar [28]
- lib/com.google.code.gson-gson-2.11.0.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.opencensus-opencensus-proto-0.2.0.jar [30]
- lib/io.grpc-grpc-all-1.64.0.jar [33]
- lib/io.grpc-grpc-alts-1.64.0.jar [33]
- lib/io.grpc-grpc-api-1.64.0.jar [33]
- lib/io.grpc-grpc-auth-1.64.0.jar [33]
- lib/io.grpc-grpc-context-1.64.0.jar [33]
- lib/io.grpc-grpc-core-1.64.0.jar [33]
- lib/io.grpc-grpc-grpclb-1.64.0.jar [33]
- lib/io.grpc-grpc-inprocess-1.64.0.jar [33]
- lib/io.grpc-grpc-opentelemetry-1.64.0.jar [33]
- lib/io.grpc-grpc-netty-shaded-1.64.0.jar [33]
- lib/io.grpc-grpc-protobuf-1.64.0.jar [33]
- lib/io.grpc-grpc-protobuf-lite-1.64.0.jar [33]
- lib/io.grpc-grpc-services-1.64.0.jar [33]
- lib/io.grpc-grpc-stub-1.64.0.jar [33]
- lib/io.grpc-grpc-testing-1.64.0.jar [33]
- lib/io.grpc-grpc-util-1.64.0.jar [33]
- lib/io.grpc-grpc-xds-1.64.0.jar [33]
- lib/io.grpc-grpc-rls-1.64.0.jar[33]
- lib/io.grpc-grpc-all-1.70.0.jar [33]
- lib/io.grpc-grpc-alts-1.70.0.jar [33]
- lib/io.grpc-grpc-api-1.70.0.jar [33]
- lib/io.grpc-grpc-auth-1.70.0.jar [33]
- lib/io.grpc-grpc-context-1.70.0.jar [33]
- lib/io.grpc-grpc-core-1.70.0.jar [33]
- lib/io.grpc-grpc-grpclb-1.70.0.jar [33]
- lib/io.grpc-grpc-inprocess-1.70.0.jar [33]
- lib/io.grpc-grpc-opentelemetry-1.70.0.jar [33]
- lib/io.grpc-grpc-netty-shaded-1.70.0.jar [33]
- lib/io.grpc-grpc-protobuf-1.70.0.jar [33]
- lib/io.grpc-grpc-protobuf-lite-1.70.0.jar [33]
- lib/io.grpc-grpc-services-1.70.0.jar [33]
- lib/io.grpc-grpc-stub-1.70.0.jar [33]
- lib/io.grpc-grpc-testing-1.70.0.jar [33]
- lib/io.grpc-grpc-util-1.70.0.jar [33]
- lib/io.grpc-grpc-xds-1.70.0.jar [33]
- lib/io.grpc-grpc-rls-1.70.0.jar[33]
- lib/io.grpc-grpc-gcp-csm-observability-1.70.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]
Expand All @@ -309,16 +309,16 @@ 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.43.3.jar [43]
- lib/com.google.http-client-google-http-client-gson-1.43.3.jar [43]
- lib/com.google.auto.value-auto-value-annotations-1.10.4.jar [44]
- 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.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.7.jar [46]
- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [47]
- lib/io.dropwizard.metrics-metrics-graphite-4.1.12.1.jar [47]
- lib/io.dropwizard.metrics-metrics-jmx-4.1.12.1.jar [47]
- lib/io.dropwizard.metrics-metrics-jvm-4.1.12.1.jar [47]
- lib/io.perfmark-perfmark-api-0.26.0.jar [48]
- lib/io.perfmark-perfmark-api-0.27.0.jar [48]
- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49]
- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50]
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
Expand All @@ -344,9 +344,12 @@ Apache Software License, Version 2.
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [55]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar [55]
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [55]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-1.26.0.jar [55]
- lib/io.opentelemetry.instrumentation-opentelemetry-instrumentation-api-semconv-1.26.0-alpha.jar [55]
- lib/io.opentelemetry.instrumentation-opentelemetry-runtime-metrics-1.26.0-alpha.jar [54]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]
- lib/org.jetbrains-annotations-13.0.jar [56]
- lib/org.jetbrains.kotlin-kotlin-stdlib-1.8.21.jar [56]
- lib/org.jetbrains.kotlin-kotlin-stdlib-common-1.8.21.jar [56]
Expand Down Expand Up @@ -379,10 +382,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/lz4/lz4-java/tree/1.3.0
[28] Source available at https://github.com/googleapis/java-common-protos/tree/v2.29.0
[29] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1
[28] Source available at https://github.com/googleapis/java-common-protos/tree/v2.48.0
[29] Source available at https://github.com/google/gson/tree/gson-parent-2.11.0
[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.64.0
[33] Source available at https://github.com/grpc/grpc-java/tree/v1.70.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
Expand All @@ -396,7 +399,7 @@ Apache Software License, Version 2.
[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.7
[47] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1
[48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0
[48] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.27.0
[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2
[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
Expand Down Expand Up @@ -702,9 +705,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.22.0.jar
- lib/com.google.auth-google-auth-library-oauth2-http-1.22.0.jar
Source available at https://github.com/googleapis/google-auth-library-java/releases/tag/v1.22.0
- 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
------------------------------------------------------------------------------------
This product bundles the bouncycastle Library.
For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html
Expand Down
81 changes: 49 additions & 32 deletions bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,29 +247,29 @@ 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/net.jpountz.lz4-lz4-1.3.0.jar [25]
- lib/com.google.api.grpc-proto-google-common-protos-2.29.0.jar [27]
- lib/com.google.code.gson-gson-2.10.1.jar [28]
- lib/com.google.api.grpc-proto-google-common-protos-2.48.0.jar [27]
- lib/com.google.code.gson-gson-2.11.0.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.opencensus-opencensus-proto-0.2.0.jar [29]
- lib/io.grpc-grpc-all-1.64.0.jar [32]
- lib/io.grpc-grpc-alts-1.64.0.jar [32]
- lib/io.grpc-grpc-api-1.64.0.jar [32]
- lib/io.grpc-grpc-auth-1.64.0.jar [32]
- lib/io.grpc-grpc-context-1.64.0.jar [32]
- lib/io.grpc-grpc-core-1.64.0.jar [32]
- lib/io.grpc-grpc-grpclb-1.64.0.jar [32]
- lib/io.grpc-grpc-inprocess-1.64.0.jar [32]
- lib/io.grpc-grpc-opentelemetry-1.64.0.jar [32]
- lib/io.grpc-grpc-netty-shaded-1.64.0.jar [32]
- lib/io.grpc-grpc-protobuf-1.64.0.jar [32]
- lib/io.grpc-grpc-protobuf-lite-1.64.0.jar [32]
- lib/io.grpc-grpc-services-1.64.0.jar [32]
- lib/io.grpc-grpc-stub-1.64.0.jar [32]
- lib/io.grpc-grpc-testing-1.64.0.jar [32]
- lib/io.grpc-grpc-util-1.64.0.jar [32]
- lib/io.grpc-grpc-xds-1.64.0.jar [32]
- lib/io.grpc-grpc-rls-1.64.0.jar[32]
- lib/io.grpc-grpc-all-1.70.0.jar [32]
- lib/io.grpc-grpc-alts-1.70.0.jar [32]
- lib/io.grpc-grpc-api-1.70.0.jar [32]
- lib/io.grpc-grpc-auth-1.70.0.jar [32]
- lib/io.grpc-grpc-context-1.70.0.jar [32]
- lib/io.grpc-grpc-core-1.70.0.jar [32]
- lib/io.grpc-grpc-grpclb-1.70.0.jar [32]
- lib/io.grpc-grpc-inprocess-1.70.0.jar [32]
- lib/io.grpc-grpc-opentelemetry-1.70.0.jar [32]
- lib/io.grpc-grpc-netty-shaded-1.70.0.jar [32]
- lib/io.grpc-grpc-protobuf-1.70.0.jar [32]
- lib/io.grpc-grpc-protobuf-lite-1.70.0.jar [32]
- lib/io.grpc-grpc-services-1.70.0.jar [32]
- lib/io.grpc-grpc-stub-1.70.0.jar [32]
- lib/io.grpc-grpc-testing-1.70.0.jar [32]
- lib/io.grpc-grpc-util-1.70.0.jar [32]
- lib/io.grpc-grpc-xds-1.70.0.jar [32]
- lib/io.grpc-grpc-rls-1.70.0.jar[32]
- lib/io.grpc-grpc-gcp-csm-observability-1.70.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]
Expand All @@ -280,20 +280,37 @@ Apache Software License, Version 2.
- lib/org.apache.httpcomponents-httpcore-4.4.15.jar [39]
- 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.10.4.jar [42]
- lib/com.google.http-client-google-http-client-1.43.3.jar [43]
- lib/com.google.http-client-google-http-client-gson-1.43.3.jar [43]
- 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.j2objc-j2objc-annotations-2.8.jar [44]
- lib/com.google.re2j-re2j-1.7.jar [45]
- lib/io.dropwizard.metrics-metrics-core-4.1.12.1.jar [46]
- lib/io.perfmark-perfmark-api-0.26.0.jar [47]
- lib/io.perfmark-perfmark-api-0.27.0.jar [47]
- lib/org.conscrypt-conscrypt-openjdk-uber-2.5.2.jar [49]
- lib/org.xerial.snappy-snappy-java-1.1.10.5.jar [50]
- lib/io.reactivex.rxjava3-rxjava-3.0.1.jar [51]
- lib/com.carrotsearch-hppc-0.9.1.jar [52]
- lib/com.lmax-disruptor-4.0.0.jar [53]
- lib/io.opentelemetry-opentelemetry-api-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [54]
- lib/io.opentelemetry-opentelemetry-api-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-api-events-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-api-logs-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-context-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-extension-incubator-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-common-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-spi-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-logs-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-metrics-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-trace-1.26.0.jar [55]
- lib/io.opentelemetry-opentelemetry-semconv-1.26.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-api-incubator-1.43.0-alpha.jar [55]
- lib/io.opentelemetry.contrib-opentelemetry-gcp-resources-1.40.0-alpha.jar [55]
- lib/io.opentelemetry.semconv-opentelemetry-semconv-1.28.0-alpha.jar [55]
- lib/io.opentelemetry-opentelemetry-sdk-extension-autoconfigure-1.43.0.jar [55]
- lib/com.google.cloud.opentelemetry-detector-resources-support-0.33.0.jar [54]

[1] Source available at https://github.com/FasterXML/jackson-annotations/tree/jackson-annotations-2.17.1
[2] Source available at https://github.com/FasterXML/jackson-core/tree/jackson-core-2.17.1
Expand All @@ -312,10 +329,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/lz4/lz4-java/tree/1.3.0
[27] Source available at https://github.com/googleapis/java-common-protos/tree/v2.29.0
[28] Source available at https://github.com/google/gson/tree/gson-parent-2.10.1
[27] Source available at https://github.com/googleapis/java-common-protos/tree/v2.48.0
[28] Source available at https://github.com/google/gson/tree/gson-parent-2.11.0
[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.64.0
[32] Source available at https://github.com/grpc/grpc-java/tree/v1.70.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
Expand All @@ -329,7 +346,7 @@ Apache Software License, Version 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.7
[46] Source available at https://github.com/dropwizard/metrics/releases/tag/v4.1.12.1
[47] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.26.0
[47] Source available at https://github.com/perfmark/perfmark/releases/tag/v0.27.0
[49] Source available at https://github.com/google/conscrypt/releases/tag/2.5.2
[50] Source available at https://github.com/xerial/snappy-java/releases/tag/v1.1.10.5
[51] Source available at https://github.com/ReactiveX/RxJava/tree/v3.0.1
Expand Down Expand Up @@ -589,9 +606,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.22.0.jar
- lib/com.google.auth-google-auth-library-oauth2-http-1.22.0.jar
Source available at https://github.com/google/google-auth-library-java/tree/1.22.0
- 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
------------------------------------------------------------------------------------
This product bundles the bouncycastle Library.
For license details, see deps/bouncycastle-1.0.2.3/LICENSE.html
Expand Down
Loading

0 comments on commit 3e8ca44

Please sign in to comment.