Skip to content

Commit e7b4d63

Browse files
damccormdamccorm
authored
Upgrade to new vendored grpc (#33555)
* Vendor grpc * Add settings.gradle.kts back * test vendored grpc * Update files to test * Update imports * Update BeamModulePlugin * Fix snapshot version * Inline NoopClientCall * Fix conflicts * remove leftover test repo pieces * one more 60 -> 69 * one more 60 -> 69 * Fix version
1 parent b65a529 commit e7b4d63

379 files changed

Lines changed: 760 additions & 732 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ class BeamModulePlugin implements Plugin<Project> {
906906
testcontainers_solace : "org.testcontainers:solace:$testcontainers_version",
907907
truth : "com.google.truth:truth:1.1.5",
908908
threetenbp : "org.threeten:threetenbp:1.6.8",
909-
vendored_grpc_1_60_1 : "org.apache.beam:beam-vendor-grpc-1_60_1:0.3",
909+
vendored_grpc_1_69_0 : "org.apache.beam:beam-vendor-grpc-1_69_0:0.1",
910910
vendored_guava_32_1_2_jre : "org.apache.beam:beam-vendor-guava-32_1_2-jre:0.1",
911911
vendored_calcite_1_28_0 : "org.apache.beam:beam-vendor-calcite-1_28_0:0.2",
912912
woodstox_core_asl : "org.codehaus.woodstox:woodstox-core-asl:4.4.1",
@@ -2417,7 +2417,7 @@ class BeamModulePlugin implements Plugin<Project> {
24172417
archivesBaseName: configuration.archivesBaseName,
24182418
automaticModuleName: configuration.automaticModuleName,
24192419
shadowJarValidationExcludes: it.shadowJarValidationExcludes,
2420-
shadowClosure: GrpcVendoring_1_60_1.shadowClosure() << {
2420+
shadowClosure: GrpcVendoring_1_69_0.shadowClosure() << {
24212421
// We perform all the code relocations but don't include
24222422
// any of the actual dependencies since they will be supplied
24232423
// by org.apache.beam:beam-vendor-grpc-v1p60p1
@@ -2437,14 +2437,14 @@ class BeamModulePlugin implements Plugin<Project> {
24372437
project.protobuf {
24382438
protoc {
24392439
// The artifact spec for the Protobuf Compiler
2440-
artifact = "com.google.protobuf:protoc:${GrpcVendoring_1_60_1.protobuf_version}" }
2440+
artifact = "com.google.protobuf:protoc:${GrpcVendoring_1_69_0.protobuf_version}" }
24412441

24422442
// Configure the codegen plugins
24432443
plugins {
24442444
// An artifact spec for a protoc plugin, with "grpc" as
24452445
// the identifier, which can be referred to in the "plugins"
24462446
// container of the "generateProtoTasks" closure.
2447-
grpc { artifact = "io.grpc:protoc-gen-grpc-java:${GrpcVendoring_1_60_1.grpc_version}" }
2447+
grpc { artifact = "io.grpc:protoc-gen-grpc-java:${GrpcVendoring_1_69_0.grpc_version}" }
24482448
}
24492449

24502450
generateProtoTasks {
@@ -2458,7 +2458,7 @@ class BeamModulePlugin implements Plugin<Project> {
24582458
}
24592459
}
24602460

2461-
project.dependencies GrpcVendoring_1_60_1.dependenciesClosure() << { shadow project.ext.library.java.vendored_grpc_1_60_1 }
2461+
project.dependencies GrpcVendoring_1_69_0.dependenciesClosure() << { shadow project.ext.library.java.vendored_grpc_1_69_0 }
24622462
}
24632463

24642464
/** ***********************************************************************************************/

‎examples/java/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ dependencies {
8989
implementation library.java.commons_io
9090
implementation library.java.commons_csv
9191
runtimeOnly project(path: ":runners:direct-java", configuration: "shadow")
92-
implementation library.java.vendored_grpc_1_60_1
92+
implementation library.java.vendored_grpc_1_69_0
9393
implementation library.java.vendored_guava_32_1_2_jre
9494
implementation "com.google.api.grpc:proto-google-cloud-language-v1:1.81.4"
9595
implementation ("io.confluent:kafka-avro-serializer:5.3.2") {

‎examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/transforms/DataProtectors.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
import org.apache.beam.sdk.values.Row;
4949
import org.apache.beam.sdk.values.TupleTag;
5050
import org.apache.beam.sdk.values.TupleTagList;
51-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.gson.Gson;
52-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.gson.JsonArray;
53-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.gson.JsonObject;
51+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.gson.Gson;
52+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.gson.JsonArray;
53+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.gson.JsonObject;
5454
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Throwables;
5555
import org.apache.commons.io.IOUtils;
5656
import org.apache.http.HttpEntity;

‎examples/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/kafka/consumer/Utils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import java.util.Map;
2929
import java.util.stream.Collectors;
3030
import org.apache.beam.examples.complete.kafkatopubsub.options.KafkaToPubsubOptions;
31-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.gson.JsonObject;
32-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.gson.JsonParser;
31+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.gson.JsonObject;
32+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.gson.JsonParser;
3333
import org.apache.http.HttpResponse;
3434
import org.apache.http.client.HttpClient;
3535
import org.apache.http.client.methods.HttpGet;

‎runners/core-java/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies {
4545
implementation library.java.google_api_services_dataflow
4646
implementation library.java.vendored_guava_32_1_2_jre
4747
implementation library.java.joda_time
48-
implementation library.java.vendored_grpc_1_60_1
48+
implementation library.java.vendored_grpc_1_69_0
4949
implementation library.java.slf4j_api
5050
implementation library.java.jackson_core
5151
implementation library.java.jackson_databind

‎runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MetricsContainerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.apache.beam.sdk.metrics.MetricsContainer;
5151
import org.apache.beam.sdk.util.HistogramData;
5252
import org.apache.beam.sdk.values.KV;
53-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
53+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.protobuf.ByteString;
5454
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting;
5555
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
5656
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;

‎runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MetricsContainerStepMap.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
import org.apache.beam.sdk.metrics.MetricKey;
3535
import org.apache.beam.sdk.metrics.MetricResult;
3636
import org.apache.beam.sdk.metrics.MetricResults;
37-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
38-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.InvalidProtocolBufferException;
39-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.util.JsonFormat;
37+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.protobuf.ByteString;
38+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.protobuf.InvalidProtocolBufferException;
39+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.protobuf.util.JsonFormat;
4040
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
4141
import org.checkerframework.checker.nullness.qual.Nullable;
4242

‎runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MonitoringInfoEncodings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.apache.beam.sdk.coders.VarLongCoder;
3939
import org.apache.beam.sdk.util.ByteStringOutputStream;
4040
import org.apache.beam.sdk.util.HistogramData;
41-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
41+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.protobuf.ByteString;
4242
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Sets;
4343
import org.joda.time.Instant;
4444

‎runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/ShortIdMap.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.Map;
2424
import java.util.NoSuchElementException;
2525
import org.apache.beam.model.pipeline.v1.MetricsApi.MonitoringInfo;
26-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
26+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.protobuf.ByteString;
2727
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
2828
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.BiMap;
2929
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.HashBiMap;

‎runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/SimpleExecutionState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.Map;
2626
import org.apache.beam.model.pipeline.v1.MetricsApi.MonitoringInfo;
2727
import org.apache.beam.runners.core.metrics.ExecutionStateTracker.ExecutionState;
28-
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
28+
import org.apache.beam.vendor.grpc.v1p69p0.com.google.protobuf.ByteString;
2929
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting;
3030
import org.joda.time.Duration;
3131
import org.joda.time.format.PeriodFormatter;

0 commit comments

Comments
 (0)