Skip to content

Commit 3e92c1b

Browse files
emilymyeemilymye
committed
switch to vendored grpc 1.43.2
1 parent 1838347 commit 3e92c1b

283 files changed

Lines changed: 552 additions & 784 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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ class BeamModulePlugin implements Plugin<Project> {
676676
testcontainers_postgresql : "org.testcontainers:postgresql:$testcontainers_version",
677677
testcontainers_gcloud : "org.testcontainers:gcloud:$testcontainers_version",
678678
vendored_bytebuddy_1_11_0 : "org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1",
679-
vendored_grpc_1_36_0 : "org.apache.beam:beam-vendor-grpc-1_36_0:0.2",
679+
vendored_grpc_1_43_2 : "org.apache.beam:beam-vendor-grpc-1_43_2:0.1",
680680
vendored_guava_26_0_jre : "org.apache.beam:beam-vendor-guava-26_0-jre:0.1",
681681
vendored_calcite_1_28_0 : "org.apache.beam:beam-vendor-calcite-1_28_0:0.1",
682682
woodstox_core_asl : "org.codehaus.woodstox:woodstox-core-asl:4.4.1",
@@ -1984,10 +1984,10 @@ class BeamModulePlugin implements Plugin<Project> {
19841984
archivesBaseName: configuration.archivesBaseName,
19851985
automaticModuleName: configuration.automaticModuleName,
19861986
shadowJarValidationExcludes: it.shadowJarValidationExcludes,
1987-
shadowClosure: GrpcVendoring_1_36_0.shadowClosure() << {
1987+
shadowClosure: GrpcVendoring_1_43_2.shadowClosure() << {
19881988
// We perform all the code relocations but don't include
19891989
// any of the actual dependencies since they will be supplied
1990-
// by org.apache.beam:beam-vendor-grpc-v1p36p0:0.1
1990+
// by org.apache.beam:beam-vendor-grpc-v1p43p2
19911991
dependencies {
19921992
include(dependency { return false })
19931993
}
@@ -2004,14 +2004,14 @@ class BeamModulePlugin implements Plugin<Project> {
20042004
project.protobuf {
20052005
protoc {
20062006
// The artifact spec for the Protobuf Compiler
2007-
artifact = "com.google.protobuf:protoc:${GrpcVendoring_1_36_0.protobuf_version}" }
2007+
artifact = "com.google.protobuf:protoc:${GrpcVendoring_1_43_2.protobuf_version}" }
20082008

20092009
// Configure the codegen plugins
20102010
plugins {
20112011
// An artifact spec for a protoc plugin, with "grpc" as
20122012
// the identifier, which can be referred to in the "plugins"
20132013
// container of the "generateProtoTasks" closure.
2014-
grpc { artifact = "io.grpc:protoc-gen-grpc-java:${GrpcVendoring_1_36_0.grpc_version}" }
2014+
grpc { artifact = "io.grpc:protoc-gen-grpc-java:${GrpcVendoring_1_43_2.grpc_version}" }
20152015
}
20162016

20172017
generateProtoTasks {
@@ -2025,7 +2025,7 @@ class BeamModulePlugin implements Plugin<Project> {
20252025
}
20262026
}
20272027

2028-
project.dependencies GrpcVendoring_1_36_0.dependenciesClosure() << { shadow project.ext.library.java.vendored_grpc_1_36_0 }
2028+
project.dependencies GrpcVendoring_1_43_2.dependenciesClosure() << { shadow project.ext.library.java.vendored_grpc_1_43_2 }
20292029
}
20302030

20312031
/** ***********************************************************************************************/

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

Lines changed: 0 additions & 194 deletions
This file was deleted.

‎examples/java/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ dependencies {
8080
implementation library.java.commons_io
8181
implementation library.java.commons_csv
8282
runtimeOnly project(path: ":runners:direct-java", configuration: "shadow")
83-
implementation library.java.vendored_grpc_1_36_0
83+
implementation library.java.vendored_grpc_1_43_2
8484
implementation library.java.vendored_guava_26_0_jre
8585
implementation "com.google.api.grpc:proto-google-cloud-language-v1:1.81.4"
8686
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.v1p36p0.com.google.gson.Gson;
52-
import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.JsonArray;
53-
import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.JsonObject;
51+
import org.apache.beam.vendor.grpc.v1p43p2.com.google.gson.Gson;
52+
import org.apache.beam.vendor.grpc.v1p43p2.com.google.gson.JsonArray;
53+
import org.apache.beam.vendor.grpc.v1p43p2.com.google.gson.JsonObject;
5454
import org.apache.beam.vendor.guava.v26_0_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
@@ -27,8 +27,8 @@
2727
import java.util.Map;
2828
import java.util.stream.Collectors;
2929
import org.apache.beam.examples.complete.kafkatopubsub.options.KafkaToPubsubOptions;
30-
import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.JsonObject;
31-
import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.JsonParser;
30+
import org.apache.beam.vendor.grpc.v1p43p2.com.google.gson.JsonObject;
31+
import org.apache.beam.vendor.grpc.v1p43p2.com.google.gson.JsonParser;
3232
import org.apache.http.HttpResponse;
3333
import org.apache.http.client.HttpClient;
3434
import org.apache.http.client.methods.HttpGet;

‎examples/notebooks/get-started/try-apache-beam-java.ipynb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -593,8 +593,8 @@
593593
"\n",
594594
"> Task :runShadow\n",
595595
"WARNING: An illegal reflective access operation has occurred\n",
596-
"WARNING: Illegal reflective access by org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.UnsafeUtil (file:/content/build/install/content-shadow/lib/WordCount.jar) to field java.nio.Buffer.address\n",
597-
"WARNING: Please consider reporting this to the maintainers of org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.UnsafeUtil\n",
596+
"WARNING: Illegal reflective access by org.apache.beam.vendor.grpc.v1p43p2.com.google.protobuf.UnsafeUtil (file:/content/build/install/content-shadow/lib/WordCount.jar) to field java.nio.Buffer.address\n",
597+
"WARNING: Please consider reporting this to the maintainers of org.apache.beam.vendor.grpc.v1p43p2.com.google.protobuf.UnsafeUtil\n",
598598
"WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations\n",
599599
"WARNING: All illegal access operations will be denied in a future release\n",
600600
"Mar 04, 2019 11:00:24 PM org.apache.beam.sdk.io.FileBasedSource getEstimatedSizeBytes\n",
@@ -735,8 +735,8 @@
735735
"\n",
736736
">> java -jar WordCount.jar\n",
737737
"WARNING: An illegal reflective access operation has occurred\n",
738-
"WARNING: Illegal reflective access by org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.UnsafeUtil (file:/content/WordCount.jar) to field java.nio.Buffer.address\n",
739-
"WARNING: Please consider reporting this to the maintainers of org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.UnsafeUtil\n",
738+
"WARNING: Illegal reflective access by org.apache.beam.vendor.grpc.v1p43p2.com.google.protobuf.UnsafeUtil (file:/content/WordCount.jar) to field java.nio.Buffer.address\n",
739+
"WARNING: Please consider reporting this to the maintainers of org.apache.beam.vendor.grpc.v1p43p2.com.google.protobuf.UnsafeUtil\n",
740740
"WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations\n",
741741
"WARNING: All illegal access operations will be denied in a future release\n",
742742
"Mar 04, 2019 11:00:49 PM org.apache.beam.sdk.io.FileBasedSource getEstimatedSizeBytes\n",
@@ -981,8 +981,8 @@
981981
"\n",
982982
"> Task :runShadow\n",
983983
"WARNING: An illegal reflective access operation has occurred\n",
984-
"WARNING: Illegal reflective access by org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.UnsafeUtil (file:/content/build/install/content-shadow/lib/WordCount.jar) to field java.nio.Buffer.address\n",
985-
"WARNING: Please consider reporting this to the maintainers of org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.UnsafeUtil\n",
984+
"WARNING: Illegal reflective access by org.apache.beam.vendor.grpc.v1p43p2.com.google.protobuf.UnsafeUtil (file:/content/build/install/content-shadow/lib/WordCount.jar) to field java.nio.Buffer.address\n",
985+
"WARNING: Please consider reporting this to the maintainers of org.apache.beam.vendor.grpc.v1p43p2.com.google.protobuf.UnsafeUtil\n",
986986
"WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations\n",
987987
"WARNING: All illegal access operations will be denied in a future release\n",
988988
"Mar 04, 2019 11:01:26 PM org.apache.beam.sdk.io.FileBasedSource getEstimatedSizeBytes\n",

‎runners/core-construction-java/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dependencies {
5454
implementation project(path: ":model:job-management", configuration: "shadow")
5555
implementation project(path: ":sdks:java:core", configuration: "shadow")
5656
implementation project(path: ":sdks:java:fn-execution")
57-
implementation library.java.vendored_grpc_1_36_0
57+
implementation library.java.vendored_grpc_1_43_2
5858
implementation library.java.vendored_guava_26_0_jre
5959
implementation library.java.classgraph
6060
implementation library.java.jackson_core

‎runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/BeamUrns.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.beam.runners.core.construction;
1919

2020
import org.apache.beam.model.pipeline.v1.RunnerApi;
21-
import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ProtocolMessageEnum;
21+
import org.apache.beam.vendor.grpc.v1p43p2.com.google.protobuf.ProtocolMessageEnum;
2222

2323
/** Returns the standard URN of a given enum annotated with [(standard_urn)]. */
2424
public class BeamUrns {

‎runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.apache.beam.model.pipeline.v1.RunnerApi.FunctionSpec;
2929
import org.apache.beam.sdk.coders.Coder;
3030
import org.apache.beam.sdk.util.SerializableUtils;
31-
import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString;
31+
import org.apache.beam.vendor.grpc.v1p43p2.com.google.protobuf.ByteString;
3232
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting;
3333
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.BiMap;
3434
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableBiMap;

‎runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslators.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.apache.beam.sdk.util.ShardedKey;
3737
import org.apache.beam.sdk.util.WindowedValue;
3838
import org.apache.beam.sdk.util.WindowedValue.FullWindowedValueCoder;
39-
import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException;
39+
import org.apache.beam.vendor.grpc.v1p43p2.com.google.protobuf.InvalidProtocolBufferException;
4040
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
4141

4242
/** {@link CoderTranslator} implementations for known coder types. */

0 commit comments

Comments
 (0)