From a44a17433e0dfa74c24ad85a0d95d408e2fc9632 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 8 Apr 2021 10:17:45 -0400 Subject: [PATCH] Revert "[BEAM-11227] Try reverting #14295: Moving from vendored gRPC 1.26 to 1.36 (#14466)" This reverts commit 9601bdef8870bc6acc7895c06252e43ec040bd8c. --- .../beam/gradle/BeamModulePlugin.groovy | 10 +- .../beam/gradle/GrpcVendoring_1_26_0.groovy | 222 ------------------ examples/java/build.gradle | 2 +- .../transforms/DataProtectors.java | 6 +- .../kafkatopubsub/kafka/consumer/Utils.java | 4 +- runners/core-construction-java/build.gradle | 2 +- .../runners/core/construction/BeamUrns.java | 2 +- .../core/construction/CoderTranslation.java | 2 +- .../core/construction/CoderTranslators.java | 2 +- .../core/construction/CombineTranslation.java | 2 +- .../CreatePCollectionViewTranslation.java | 2 +- .../DefaultExpansionServiceClientFactory.java | 2 +- .../construction/DisplayDataTranslation.java | 2 +- .../core/construction/Environments.java | 4 +- .../runners/core/construction/External.java | 6 +- .../core/construction/ModelCoders.java | 2 +- .../PCollectionViewTranslation.java | 2 +- .../core/construction/ParDoTranslation.java | 4 +- .../PipelineOptionsTranslation.java | 6 +- .../core/construction/ReadTranslation.java | 4 +- .../construction/TestStreamTranslation.java | 2 +- .../construction/WindowIntoTranslation.java | 2 +- .../WindowingStrategyTranslation.java | 8 +- .../construction/WriteFilesTranslation.java | 2 +- .../graph/GreedyPCollectionFusers.java | 2 +- .../construction/graph/QueryablePipeline.java | 2 +- .../core/construction/CommonCoderTest.java | 2 +- .../PipelineOptionsTranslationTest.java | 6 +- .../construction/ValidateRunnerXlangTest.java | 8 +- .../WindowIntoTranslationTest.java | 2 +- .../graph/ProtoOverridesTest.java | 2 +- runners/core-java/build.gradle | 2 +- .../core/metrics/MetricsContainerStepMap.java | 4 +- .../core/metrics/MonitoringInfoEncodings.java | 2 +- .../metrics/MonitoringInfoEncodingsTest.java | 2 +- runners/direct-java/build.gradle | 4 +- runners/flink/flink_runner.gradle | 2 +- .../FlinkBatchPortablePipelineTranslator.java | 2 +- .../beam/runners/flink/FlinkJobInvoker.java | 2 +- .../runners/flink/FlinkPipelineRunner.java | 2 +- ...nkStreamingPortablePipelineTranslator.java | 2 +- .../utils/FlinkPortableRunnerUtils.java | 2 +- .../ExecutableStageDoFnOperator.java | 4 +- .../wrappers/streaming/FlinkKeyUtils.java | 2 +- .../FlinkExecutableStageFunctionTest.java | 2 +- .../ExecutableStageDoFnOperatorTest.java | 4 +- .../wrappers/streaming/FlinkKeyUtilsTest.java | 2 +- .../google-cloud-dataflow-java/build.gradle | 2 +- .../dataflow/DataflowPipelineTranslator.java | 2 +- .../beam/runners/dataflow/DataflowRunner.java | 4 +- .../runners/dataflow/DataflowRunnerTest.java | 2 +- .../worker/build.gradle | 2 +- .../worker/legacy-worker/build.gradle | 4 +- .../dataflow/worker/ByteStringCoder.java | 2 +- .../worker/DataflowRunnerHarness.java | 2 +- .../worker/DataflowWorkerHarnessHelper.java | 2 +- .../GroupAlsoByWindowParDoFnFactory.java | 2 +- .../runners/dataflow/worker/PubsubSink.java | 2 +- .../runners/dataflow/worker/StateFetcher.java | 2 +- .../worker/StreamingDataflowWorker.java | 4 +- .../worker/StreamingModeExecutionContext.java | 2 +- .../worker/StreamingSideInputFetcher.java | 4 +- .../worker/WindmillComputationKey.java | 4 +- .../worker/WindmillNamespacePrefix.java | 2 +- .../runners/dataflow/worker/WindmillSink.java | 2 +- .../dataflow/worker/WindmillStateCache.java | 2 +- .../worker/WindmillStateInternals.java | 2 +- .../dataflow/worker/WindmillStateReader.java | 2 +- .../worker/WindmillTimerInternals.java | 2 +- .../dataflow/worker/WorkerCustomSources.java | 2 +- .../worker/fn/BeamFnControlService.java | 6 +- .../RegisterAndProcessBundleOperation.java | 4 +- .../worker/fn/data/BeamFnDataGrpcService.java | 4 +- .../fn/logging/BeamFnLoggingService.java | 4 +- .../stream/ServerStreamObserverFactory.java | 6 +- .../CreateExecutableStageNodeFunction.java | 4 +- ...FetchAndFilterStreamingSideInputNodes.java | 2 +- .../worker/graph/RegisterNodeFunction.java | 4 +- .../worker/windmill/DirectStreamObserver.java | 4 +- .../ForwardingClientResponseObserver.java | 6 +- .../worker/windmill/GrpcWindmillServer.java | 30 +-- .../windmill/StreamObserverFactory.java | 4 +- .../dataflow/harness/test/TestStreams.java | 4 +- .../dataflow/worker/DataflowMatchers.java | 2 +- .../DataflowWorkerHarnessHelperTest.java | 2 +- .../dataflow/worker/PubsubReaderTest.java | 2 +- .../dataflow/worker/PubsubSinkTest.java | 2 +- .../dataflow/worker/ReaderCacheTest.java | 2 +- .../dataflow/worker/StateFetcherTest.java | 2 +- .../worker/StreamingDataflowWorkerTest.java | 6 +- .../StreamingGroupAlsoByWindowFnsTest.java | 2 +- ...ngGroupAlsoByWindowsReshuffleDoFnTest.java | 2 +- .../StreamingModeExecutionContextTest.java | 2 +- .../StreamingSideInputDoFnRunnerTest.java | 2 +- .../worker/StreamingSideInputFetcherTest.java | 2 +- .../worker/WindmillKeyedWorkItemTest.java | 2 +- .../WindmillReaderIteratorBaseTest.java | 2 +- .../worker/WindmillStateCacheTest.java | 2 +- .../worker/WindmillStateInternalsTest.java | 2 +- .../worker/WindmillStateReaderTest.java | 4 +- .../worker/WorkerCustomSourcesTest.java | 2 +- .../worker/fn/BeamFnControlServiceTest.java | 6 +- ...RegisterAndProcessBundleOperationTest.java | 2 +- .../fn/data/BeamFnDataGrpcServiceTest.java | 32 +-- .../fn/logging/BeamFnLoggingServiceTest.java | 12 +- .../ServerStreamObserverFactoryTest.java | 4 +- ...hAndFilterStreamingSideInputNodesTest.java | 2 +- .../DataflowWorkerLoggingHandlerTest.java | 2 +- .../windmill/GrpcWindmillServerTest.java | 14 +- runners/java-fn-execution/build.gradle | 2 +- .../beam/runners/fnexecution/FnService.java | 6 +- .../GrpcContextHeaderAccessorProvider.java | 16 +- .../runners/fnexecution/GrpcFnServer.java | 2 +- .../fnexecution/InProcessServerFactory.java | 8 +- .../runners/fnexecution/ServerFactory.java | 20 +- .../artifact/ArtifactRetrievalService.java | 8 +- .../artifact/ArtifactStagingService.java | 10 +- .../control/BundleCheckpointHandlers.java | 2 +- .../control/FnApiControlClient.java | 6 +- .../FnApiControlClientPoolService.java | 6 +- .../control/ProcessBundleDescriptors.java | 2 +- .../fnexecution/data/GrpcDataService.java | 2 +- .../ExternalEnvironmentFactory.java | 2 +- .../logging/GrpcLoggingService.java | 2 +- .../fnexecution/provisioning/JobInfo.java | 2 +- .../StaticGrpcProvisionService.java | 2 +- .../fnexecution/state/GrpcStateService.java | 4 +- .../state/StateRequestHandlers.java | 2 +- .../status/BeamWorkerStatusGrpcService.java | 2 +- .../status/WorkerStatusClient.java | 2 +- .../translation/PipelineTranslatorUtils.java | 2 +- .../fnexecution/wire/ByteStringCoder.java | 2 +- ...GrpcContextHeaderAccessorProviderTest.java | 20 +- .../fnexecution/ServerFactoryTest.java | 12 +- .../ArtifactRetrievalServiceTest.java | 10 +- .../artifact/ArtifactStagingServiceTest.java | 12 +- .../control/DefaultJobBundleFactoryTest.java | 4 +- .../FnApiControlClientPoolServiceTest.java | 8 +- .../control/FnApiControlClientTest.java | 2 +- .../control/RemoteExecutionTest.java | 2 +- .../control/SdkHarnessClientTest.java | 2 +- .../fnexecution/data/GrpcDataServiceTest.java | 8 +- .../logging/GrpcLoggingServiceTest.java | 6 +- .../StaticGrpcProvisionServiceTest.java | 10 +- .../state/GrpcStateServiceTest.java | 4 +- .../state/StateRequestHandlersTest.java | 2 +- .../BeamWorkerStatusGrpcServiceTest.java | 8 +- .../status/WorkerStatusClientTest.java | 2 +- .../fnexecution/wire/ByteStringCoderTest.java | 2 +- runners/java-job-service/build.gradle | 2 +- .../jobsubmission/InMemoryJobService.java | 10 +- .../runners/jobsubmission/JobInvocation.java | 2 +- .../runners/jobsubmission/JobInvoker.java | 2 +- .../runners/jobsubmission/JobPreparation.java | 2 +- .../PortablePipelineJarCreator.java | 4 +- .../PortablePipelineJarUtils.java | 6 +- .../jobsubmission/InMemoryJobServiceTest.java | 6 +- .../jobsubmission/JobInvocationTest.java | 2 +- .../PortablePipelineJarCreatorTest.java | 2 +- runners/portability/java/build.gradle | 2 +- .../portability/ExternalWorkerService.java | 2 +- .../portability/JobServicePipelineResult.java | 2 +- .../runners/portability/PortableRunner.java | 4 +- .../portability/testing/TestJobService.java | 2 +- .../portability/PortableRunnerTest.java | 8 +- runners/samza/build.gradle | 2 +- .../runners/samza/SamzaJobServerDriver.java | 2 +- .../translation/WindowAssignTranslator.java | 2 +- .../util/SamzaPipelineTranslatorUtils.java | 2 +- runners/spark/spark_runner.gradle | 2 +- .../beam/runners/spark/SparkJobInvoker.java | 2 +- .../runners/spark/SparkPipelineRunner.java | 2 +- runners/twister2/build.gradle | 2 +- .../functions/AssignWindowsFunction.java | 2 +- .../translators/functions/DoFnFunction.java | 2 +- .../functions/GroupByWindowFunction.java | 2 +- sdks/java/core/build.gradle | 2 +- .../org/apache/beam/sdk/io/TextSource.java | 2 +- .../org/apache/beam/sdk/io/range/ByteKey.java | 4 +- .../beam/sdk/schemas/SchemaTranslation.java | 2 +- sdks/java/expansion-service/build.gradle | 2 +- .../expansion/service/ExpansionServer.java | 4 +- .../expansion/service/ExpansionService.java | 6 +- .../service/ExpansionServiceTest.java | 2 +- .../sdk/expansion/service/ExternalTest.java | 4 +- .../schemaio-expansion-service/build.gradle | 2 +- .../ExternalSchemaIOTransformRegistrar.java | 2 +- sdks/java/fn-execution/build.gradle | 2 +- .../sdk/fn/channel/ManagedChannelFactory.java | 18 +- .../sdk/fn/channel/SocketAddressFactory.java | 2 +- .../BeamFnDataBufferingOutboundObserver.java | 2 +- .../fn/data/BeamFnDataGrpcMultiplexer.java | 6 +- .../fn/data/BeamFnDataInboundObserver.java | 2 +- ...ataSizeBasedBufferingOutboundObserver.java | 4 +- ...ataTimeBasedBufferingOutboundObserver.java | 2 +- .../sdk/fn/data/DecodingFnDataReceiver.java | 2 +- .../beam/sdk/fn/data/RemoteGrpcPortRead.java | 2 +- .../beam/sdk/fn/data/RemoteGrpcPortWrite.java | 2 +- .../fn/stream/BufferingStreamObserver.java | 4 +- .../beam/sdk/fn/stream/DataStreams.java | 2 +- .../sdk/fn/stream/DirectStreamObserver.java | 4 +- .../ForwardingClientResponseObserver.java | 6 +- .../fn/stream/OutboundObserverFactory.java | 4 +- .../fn/stream/SynchronizedStreamObserver.java | 2 +- .../test/InProcessManagedChannelFactory.java | 4 +- .../apache/beam/sdk/fn/test/TestStreams.java | 4 +- .../fn/windowing/EncodedBoundedWindow.java | 2 +- .../fn/channel/ManagedChannelFactoryTest.java | 6 +- .../fn/channel/SocketAddressFactoryTest.java | 2 +- .../data/BeamFnDataGrpcMultiplexerTest.java | 2 +- ...izeBasedBufferingOutboundObserverTest.java | 2 +- ...imeBasedBufferingOutboundObserverTest.java | 2 +- .../sdk/fn/data/RemoteGrpcPortReadTest.java | 2 +- .../sdk/fn/data/RemoteGrpcPortWriteTest.java | 2 +- .../beam/sdk/fn/stream/DataStreamsTest.java | 2 +- .../ForwardingClientResponseObserverTest.java | 6 +- .../stream/OutboundObserverFactoryTest.java | 4 +- .../windowing/EncodedBoundedWindowTest.java | 2 +- sdks/java/harness/build.gradle | 2 +- .../beam/fn/harness/FnApiDoFnRunner.java | 16 +- .../org/apache/beam/fn/harness/FnHarness.java | 4 +- .../control/AddHarnessIdInterceptor.java | 8 +- .../harness/control/BeamFnControlClient.java | 4 +- .../harness/control/ProcessBundleHandler.java | 4 +- .../fn/harness/data/BeamFnDataClient.java | 2 +- .../fn/harness/data/BeamFnDataGrpcClient.java | 4 +- .../data/QueueingBeamFnDataClient.java | 2 +- .../harness/logging/BeamFnLoggingClient.java | 12 +- .../beam/fn/harness/state/BagUserState.java | 2 +- .../state/BeamFnStateGrpcClientCache.java | 4 +- .../fn/harness/state/FnApiStateAccessor.java | 2 +- .../fn/harness/state/IterableSideInput.java | 2 +- .../fn/harness/state/MultimapSideInput.java | 2 +- .../fn/harness/state/StateBackedIterable.java | 2 +- .../harness/state/StateFetchingIterators.java | 2 +- .../HarnessStreamObserverFactories.java | 2 +- .../beam/fn/harness/FnApiDoFnRunnerTest.java | 38 +-- .../apache/beam/fn/harness/FnHarnessTest.java | 8 +- .../control/BeamFnControlClientTest.java | 8 +- .../control/ProcessBundleHandlerTest.java | 4 +- .../data/BeamFnDataGrpcClientTest.java | 14 +- .../data/BeamFnDataInboundObserverTest.java | 2 +- .../data/QueueingBeamFnDataClientTest.java | 14 +- .../logging/BeamFnLoggingClientTest.java | 16 +- .../fn/harness/state/BagUserStateTest.java | 2 +- .../state/BeamFnStateGrpcClientCacheTest.java | 16 +- .../harness/state/FakeBeamFnStateClient.java | 2 +- .../harness/state/MultimapSideInputTest.java | 2 +- .../state/StateBackedIterableTest.java | 2 +- .../state/StateFetchingIteratorsTest.java | 2 +- .../HarnessStreamObserverFactoriesTest.java | 4 +- sdks/java/io/contextualtextio/build.gradle | 2 +- .../ContextualTextIOSource.java | 2 +- sdks/java/io/debezium/build.gradle | 2 +- .../beam/io/debezium/SourceRecordJson.java | 4 +- .../io/google-cloud-platform/build.gradle | 2 +- .../spanner/SpannerTransformRegistrar.java | 2 +- .../io/gcp/pubsub/PubsubIOExternalTest.java | 4 +- .../sdk/io/kafka/KafkaIOExternalTest.java | 4 +- settings.gradle.kts | 1 - vendor/grpc-1_26_0/build.gradle | 37 --- 261 files changed, 538 insertions(+), 798 deletions(-) delete mode 100644 buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy delete mode 100644 vendor/grpc-1_26_0/build.gradle diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 7e0a16b0f9efb..1546d2e7da38a 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -631,7 +631,7 @@ class BeamModulePlugin implements Plugin { testcontainers_postgresql : "org.testcontainers:postgresql:$testcontainers_version", testcontainers_gcloud : "org.testcontainers:gcloud:$testcontainers_version", vendored_bytebuddy_1_10_8 : "org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1", - vendored_grpc_1_26_0 : "org.apache.beam:beam-vendor-grpc-1_26_0:0.3", + vendored_grpc_1_36_0 : "org.apache.beam:beam-vendor-grpc-1_36_0:0.1", vendored_guava_26_0_jre : "org.apache.beam:beam-vendor-guava-26_0-jre:0.1", vendored_calcite_1_20_0 : "org.apache.beam:beam-vendor-calcite-1_20_0:0.1", woodstox_core_asl : "org.codehaus.woodstox:woodstox-core-asl:4.4.1", @@ -1856,7 +1856,7 @@ class BeamModulePlugin implements Plugin { archivesBaseName: configuration.archivesBaseName, automaticModuleName: configuration.automaticModuleName, shadowJarValidationExcludes: it.shadowJarValidationExcludes, - shadowClosure: GrpcVendoring_1_26_0.shadowClosure() << { + shadowClosure: GrpcVendoring_1_36_0.shadowClosure() << { // We perform all the code relocations but don't include // any of the actual dependencies since they will be supplied // by org.apache.beam:beam-vendor-grpc-v1p26p0:0.1 @@ -1876,14 +1876,14 @@ class BeamModulePlugin implements Plugin { project.protobuf { protoc { // The artifact spec for the Protobuf Compiler - artifact = "com.google.protobuf:protoc:${GrpcVendoring_1_26_0.protobuf_version}" } + artifact = "com.google.protobuf:protoc:${GrpcVendoring_1_36_0.protobuf_version}" } // Configure the codegen plugins plugins { // An artifact spec for a protoc plugin, with "grpc" as // the identifier, which can be referred to in the "plugins" // container of the "generateProtoTasks" closure. - grpc { artifact = "io.grpc:protoc-gen-grpc-java:${GrpcVendoring_1_26_0.grpc_version}" } + grpc { artifact = "io.grpc:protoc-gen-grpc-java:${GrpcVendoring_1_36_0.grpc_version}" } } generateProtoTasks { @@ -1897,7 +1897,7 @@ class BeamModulePlugin implements Plugin { } } - project.dependencies GrpcVendoring_1_26_0.dependenciesClosure() << { shadow project.ext.library.java.vendored_grpc_1_26_0 } + project.dependencies GrpcVendoring_1_36_0.dependenciesClosure() << { shadow project.ext.library.java.vendored_grpc_1_36_0 } } /** ***********************************************************************************************/ diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy deleted file mode 100644 index 40e7383fe47bc..0000000000000 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy +++ /dev/null @@ -1,222 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.beam.gradle - -/** - * Utilities for working with our vendored version of gRPC. - */ -class GrpcVendoring_1_26_0 { - - static def guava_version = "26.0-jre" - static def protobuf_version = "3.11.0" - static def grpc_version = "1.26.0" - static def gson_version = "2.8.6" - static def netty_version = "4.1.51.Final" - static def google_auth_version = "0.18.0" - static def proto_google_common_protos_version = "1.12.0" - static def opencensus_version = "0.24.0" - static def perfmark_version = "0.19.0" - static def lzma_java_version = "1.3" - static def protobuf_javanano_version = "3.0.0-alpha-5" - static def jzlib_version = "1.1.3" - static def compress_lzf_version = "1.0.3" - static def lz4_version = "1.3.0" - static def bouncycastle_version = "1.54" - static def conscrypt_version = "2.5.1" - static def alpn_api_version = "1.1.2.v20150522" - static def npn_api_version = "1.1.1.v20141010" - static def jboss_marshalling_version = "1.4.11.Final" - static def jboss_modules_version = "1.11.0.Final" - - /** Returns the list of compile time dependencies. */ - static List dependencies() { - return [ - "com.google.guava:guava:$guava_version", - "com.google.protobuf:protobuf-java:$protobuf_version", - "com.google.protobuf:protobuf-java-util:$protobuf_version", - "com.google.code.gson:gson:$gson_version", - "io.grpc:grpc-auth:$grpc_version", - "io.grpc:grpc-core:$grpc_version", - "io.grpc:grpc-context:$grpc_version", - "io.grpc:grpc-netty:$grpc_version", - "io.grpc:grpc-protobuf:$grpc_version", - "io.grpc:grpc-stub:$grpc_version", - "io.netty:netty-transport-native-epoll:$netty_version", - // tcnative version from https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty - "io.netty:netty-tcnative-boringssl-static:2.0.33.Final", - "io.grpc:grpc-api:$grpc_version", - "com.google.auth:google-auth-library-credentials:$google_auth_version", - "io.grpc:grpc-testing:$grpc_version", - "com.google.api.grpc:proto-google-common-protos:$proto_google_common_protos_version", - "io.opencensus:opencensus-api:$opencensus_version", - "io.opencensus:opencensus-contrib-grpc-metrics:$opencensus_version", - "io.perfmark:perfmark-api:$perfmark_version", - "com.github.jponge:lzma-java:$lzma_java_version", - "com.google.protobuf.nano:protobuf-javanano:$protobuf_javanano_version", - "com.jcraft:jzlib:$jzlib_version", - "com.ning:compress-lzf:$compress_lzf_version", - "net.jpountz.lz4:lz4:$lz4_version", - "org.bouncycastle:bcpkix-jdk15on:$bouncycastle_version", - "org.bouncycastle:bcprov-jdk15on:$bouncycastle_version", - "org.eclipse.jetty.alpn:alpn-api:$alpn_api_version", - "org.eclipse.jetty.npn:npn-api:$npn_api_version", - "org.jboss.marshalling:jboss-marshalling:$jboss_marshalling_version", - "org.jboss.modules:jboss-modules:$jboss_modules_version" - ] - } - - /** - * Returns the list of runtime time dependencies that should be exported as runtime - * dependencies within the vendored jar. - */ - static List runtimeDependencies() { - return [ - 'com.google.errorprone:error_prone_annotations:2.3.3', - 'commons-logging:commons-logging:1.2', - 'org.apache.logging.log4j:log4j-api:2.6.2', - 'org.slf4j:slf4j-api:1.7.30', - // TODO(BEAM-9288): Enable relocation for conscrypt - "org.conscrypt:conscrypt-openjdk-uber:$conscrypt_version" - ] - } - - /** - * Returns the list of test dependencies. - */ - static List testDependencies() { - return [ - 'junit:junit:4.12', - ] - } - - static Map relocations() { - // The relocation paths below specifically use gRPC and the full version string as - // the code relocation prefix. See https://lists.apache.org/thread.html/4c12db35b40a6d56e170cd6fc8bb0ac4c43a99aa3cb7dbae54176815@%3Cdev.beam.apache.org%3E - // for further details. - - // To produce the list of necessary relocations, one needs to start with a set of target - // packages that one wants to vendor, find all necessary transitive dependencies of that - // set and provide relocations for each such that all necessary packages and their - // dependencies are relocated. Any optional dependency that doesn't need relocation - // must be excluded via an 'exclude' rule. There is additional complexity of libraries that use - // JNI or reflection and have to be handled on case by case basis by learning whether - // they support relocation and how would one go about doing it by reading any documentation - // those libraries may provide. The 'validateShadedJarDoesntLeakNonOrgApacheBeamClasses' - // ensures that there are no classes outside of the 'org.apache.beam' namespace. - - String version = "v1p26p0"; - String prefix = "org.apache.beam.vendor.grpc.${version}"; - List packagesToRelocate = [ - // guava uses the com.google.common and com.google.thirdparty package namespaces - "com.google.common", - "com.google.thirdparty", - "com.google.protobuf", - "com.google.gson", - "com.google.auth", - "com.google.api", - "com.google.cloud", - "com.google.logging", - "com.google.longrunning", - "com.google.rpc", - "com.google.type", - "io.grpc", - "io.netty", - "io.opencensus", - "io.perfmark", - "com.google.protobuf.nano", - "com.jcraft", - "com.ning", - "com.sun", - "lzma", - "net.jpountz", - "org.bouncycastle", - "org.cservenak.streams", - "org.eclipse.jetty.alpn", - "org.eclipse.jetty.npn", - "org.jboss.marshalling", - "org.jboss.modules" - ] - - return packagesToRelocate.collectEntries { - [ (it): "${prefix}.${it}" ] - } + [ - // Adapted from https://github.com/grpc/grpc-java/blob/e283f70ad91f99c7fee8b31b605ef12a4f9b1690/netty/shaded/build.gradle#L41 - // We "io.netty": "${prefix}.io.netty",have to be careful with these replacements as they must not match any - // string in NativeLibraryLoader, else they cause corruption. Note that - // this includes concatenation of string literals and constants. - 'META-INF/native/libnetty': "META-INF/native/liborg_apache_beam_vendor_grpc_${version}_netty", - 'META-INF/native/netty': "META-INF/native/org_apache_beam_vendor_grpc_${version}_netty", - ] - } - - /** Returns the list of shading exclusions. */ - static List exclusions() { - return [ - // Don't include android annotations, errorprone, checkerframework, JDK8 annotations, objenesis, junit, - // commons-logging, log4j, slf4j and mockito in the vendored jar - "android/annotation/**/", - "com/google/errorprone/**", - "com/google/instrumentation/**", - "com/google/j2objc/annotations/**", - "javax/annotation/**", - "junit/**", - "module-info.class", - "org/apache/commons/logging/**", - "org/apache/log/**", - "org/apache/log4j/**", - "org/apache/logging/log4j/**", - "org/checkerframework/**", - "org/codehaus/mojo/animal_sniffer/**", - "org/conscrypt/**", - "META-INF/native/libconscrypt**", - "META-INF/native/conscrypt**", - "org/hamcrest/**", - // This Main class prevents shading (BEAM-9252) - "org/jboss/modules/Main*", - "org/junit/**", - "org/mockito/**", - "org/objenesis/**", - "org/slf4j/**", - ] - } - - /** - * Returns a closure contaning the dependencies map used for shading gRPC within the main - * Apache Beam project. - */ - static Object dependenciesClosure() { - return { - dependencies().each { compile it } - runtimeDependencies().each { shadow it } - } - } - - /** - * Returns a closure with the code relocation configuration for shading gRPC within the main - * Apache Beam project. - */ - static Object shadowClosure() { - return { - relocations().each { srcNamespace, destNamespace -> - relocate srcNamespace, destNamespace - } - exclusions().each { exclude it } - } - } -} diff --git a/examples/java/build.gradle b/examples/java/build.gradle index af0d7b80bee90..7cbc2797ee40f 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -80,7 +80,7 @@ dependencies { provided library.java.commons_io provided library.java.commons_csv runtime project(path: ":runners:direct-java", configuration: "shadow") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.vendored_guava_26_0_jre compile "com.google.api.grpc:proto-google-cloud-language-v1:1.81.4" compile ("io.confluent:kafka-avro-serializer:5.3.2") { diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/transforms/DataProtectors.java b/examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/transforms/DataProtectors.java index 5ddf706d6f2da..199b139c4b130 100644 --- a/examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/transforms/DataProtectors.java +++ b/examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/transforms/DataProtectors.java @@ -48,9 +48,9 @@ import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TupleTagList; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.gson.Gson; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.gson.JsonArray; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.gson.JsonObject; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.Gson; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.JsonArray; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.JsonObject; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Throwables; import org.apache.commons.io.IOUtils; import org.apache.http.HttpEntity; diff --git a/examples/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/kafka/consumer/Utils.java b/examples/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/kafka/consumer/Utils.java index c99fec5efe935..c30e842476015 100644 --- a/examples/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/kafka/consumer/Utils.java +++ b/examples/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/kafka/consumer/Utils.java @@ -27,8 +27,8 @@ import java.util.Map; import java.util.stream.Collectors; import org.apache.beam.examples.complete.kafkatopubsub.options.KafkaToPubsubOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.gson.JsonObject; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.gson.JsonParser; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.JsonObject; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.JsonParser; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; diff --git a/runners/core-construction-java/build.gradle b/runners/core-construction-java/build.gradle index ba7914abd9b84..92ff5aa19a943 100644 --- a/runners/core-construction-java/build.gradle +++ b/runners/core-construction-java/build.gradle @@ -54,7 +54,7 @@ dependencies { compile project(path: ":model:job-management", configuration: "shadow") compile project(path: ":sdks:java:core", configuration: "shadow") compile project(path: ":sdks:java:fn-execution") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.vendored_guava_26_0_jre compile library.java.classgraph compile library.java.jackson_core diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/BeamUrns.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/BeamUrns.java index e4fc6d76fc104..768958f95ecdc 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/BeamUrns.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/BeamUrns.java @@ -18,7 +18,7 @@ package org.apache.beam.runners.core.construction; import org.apache.beam.model.pipeline.v1.RunnerApi; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ProtocolMessageEnum; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ProtocolMessageEnum; /** Returns the standard URN of a given enum annotated with [(standard_urn)]. */ public class BeamUrns { diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslation.java index 14cf59a598dd6..39e5201d8d788 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslation.java @@ -28,7 +28,7 @@ import org.apache.beam.model.pipeline.v1.RunnerApi.FunctionSpec; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.util.SerializableUtils; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.BiMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableBiMap; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslators.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslators.java index 574b26e94d860..38763e213d923 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslators.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CoderTranslators.java @@ -35,7 +35,7 @@ import org.apache.beam.sdk.util.ShardedKey; import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.util.WindowedValue.FullWindowedValueCoder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; /** {@link CoderTranslator} implementations for known coder types. */ diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CombineTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CombineTranslation.java index aeb56fc527b99..de69abecd1264 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CombineTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CombineTranslation.java @@ -39,7 +39,7 @@ import org.apache.beam.sdk.util.SerializableUtils; import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.PCollection; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CreatePCollectionViewTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CreatePCollectionViewTranslation.java index e69151d35bb26..c6dda1d26291c 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CreatePCollectionViewTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/CreatePCollectionViewTranslation.java @@ -34,7 +34,7 @@ import org.apache.beam.sdk.util.SerializableUtils; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionView; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; /** * Utility methods for translating a {@link View} transforms to and from {@link RunnerApi} diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/DefaultExpansionServiceClientFactory.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/DefaultExpansionServiceClientFactory.java index 87826963af55c..d9b2701d21d17 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/DefaultExpansionServiceClientFactory.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/DefaultExpansionServiceClientFactory.java @@ -23,7 +23,7 @@ import org.apache.beam.model.expansion.v1.ExpansionApi; import org.apache.beam.model.expansion.v1.ExpansionServiceGrpc; import org.apache.beam.model.pipeline.v1.Endpoints; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; /** Default factory for ExpansionServiceClient used by External transform. */ public class DefaultExpansionServiceClientFactory implements ExpansionServiceClientFactory { diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/DisplayDataTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/DisplayDataTranslation.java index b2d3ebd1c9d68..7224608e7b9ff 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/DisplayDataTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/DisplayDataTranslation.java @@ -25,7 +25,7 @@ import org.apache.beam.model.pipeline.v1.RunnerApi; import org.apache.beam.model.pipeline.v1.RunnerApi.StandardDisplayData; import org.apache.beam.sdk.transforms.display.DisplayData; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java index 9997536919b26..222818d266327 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java @@ -47,8 +47,8 @@ import org.apache.beam.sdk.util.ReleaseInfo; import org.apache.beam.sdk.util.ZipFiles; import org.apache.beam.sdk.util.common.ReflectHelpers; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/External.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/External.java index 2c4eb99e4080a..df7595f6f36fe 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/External.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/External.java @@ -50,9 +50,9 @@ import org.apache.beam.sdk.values.PValue; import org.apache.beam.sdk.values.PValues; import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannelBuilder; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ModelCoders.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ModelCoders.java index ca69be9d7e432..86e1e7d287196 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ModelCoders.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ModelCoders.java @@ -26,7 +26,7 @@ import org.apache.beam.model.pipeline.v1.RunnerApi.Coder; import org.apache.beam.model.pipeline.v1.RunnerApi.FunctionSpec; import org.apache.beam.model.pipeline.v1.RunnerApi.StandardCoders; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableSet; /** Utilities and constants ot interact with coders that are part of the Beam Model. */ diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/PCollectionViewTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/PCollectionViewTranslation.java index d3e837b25b3a9..c8fe8f3098725 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/PCollectionViewTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/PCollectionViewTranslation.java @@ -29,7 +29,7 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; /** Utilities for interacting with PCollection view protos. */ public class PCollectionViewTranslation { diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ParDoTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ParDoTranslation.java index ffa86a493674f..f5101eddd2895 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ParDoTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ParDoTranslation.java @@ -77,8 +77,8 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TupleTagList; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Sets; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/PipelineOptionsTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/PipelineOptionsTranslation.java index 56e5d06979def..b31e91c319835 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/PipelineOptionsTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/PipelineOptionsTranslation.java @@ -27,9 +27,9 @@ import java.util.Map; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.util.common.ReflectHelpers; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.util.JsonFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.util.JsonFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.CaseFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ReadTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ReadTranslation.java index c82287fcab06a..0dbf7fe8445ac 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ReadTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/ReadTranslation.java @@ -36,8 +36,8 @@ import org.apache.beam.sdk.util.SerializableUtils; import org.apache.beam.sdk.values.PBegin; import org.apache.beam.sdk.values.PCollection; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; /** diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/TestStreamTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/TestStreamTranslation.java index 7f2c37f89643b..82d88105fbfcf 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/TestStreamTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/TestStreamTranslation.java @@ -36,7 +36,7 @@ import org.apache.beam.sdk.values.PBegin; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.TimestampedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.joda.time.Duration; import org.joda.time.Instant; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WindowIntoTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WindowIntoTranslation.java index 9242f3822fcfd..effa043921067 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WindowIntoTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WindowIntoTranslation.java @@ -32,7 +32,7 @@ import org.apache.beam.sdk.transforms.windowing.Window; import org.apache.beam.sdk.transforms.windowing.Window.Assign; import org.apache.beam.sdk.transforms.windowing.WindowFn; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WindowingStrategyTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WindowingStrategyTranslation.java index 8ab2d01a5df8f..464c5016ccec6 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WindowingStrategyTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WindowingStrategyTranslation.java @@ -42,10 +42,10 @@ import org.apache.beam.sdk.util.SerializableUtils; import org.apache.beam.sdk.values.WindowingStrategy; import org.apache.beam.sdk.values.WindowingStrategy.AccumulationMode; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.util.Durations; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.util.Timestamps; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.util.Durations; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.util.Timestamps; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.joda.time.Duration; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WriteFilesTranslation.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WriteFilesTranslation.java index e0f9a4adc06d1..cab628c7ce96a 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WriteFilesTranslation.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/WriteFilesTranslation.java @@ -45,7 +45,7 @@ import org.apache.beam.sdk.values.POutput; import org.apache.beam.sdk.values.PValue; import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/GreedyPCollectionFusers.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/GreedyPCollectionFusers.java index 82cecd3a20fd0..acecc4c4eeac1 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/GreedyPCollectionFusers.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/GreedyPCollectionFusers.java @@ -31,7 +31,7 @@ import org.apache.beam.runners.core.construction.graph.PipelineNode.PCollectionNode; import org.apache.beam.runners.core.construction.graph.PipelineNode.PTransformNode; import org.apache.beam.sdk.transforms.Flatten; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Maps; import org.slf4j.Logger; diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/QueryablePipeline.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/QueryablePipeline.java index e0cb973b503b1..2f2449f0cf2b5 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/QueryablePipeline.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/graph/QueryablePipeline.java @@ -61,7 +61,7 @@ import org.apache.beam.runners.core.construction.PTransformTranslation; import org.apache.beam.runners.core.construction.graph.PipelineNode.PCollectionNode; import org.apache.beam.runners.core.construction.graph.PipelineNode.PTransformNode; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableSet; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/CommonCoderTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/CommonCoderTest.java index d01fa4c95820c..6c7744ff4e531 100644 --- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/CommonCoderTest.java +++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/CommonCoderTest.java @@ -72,7 +72,7 @@ import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Splitter; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/PipelineOptionsTranslationTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/PipelineOptionsTranslationTest.java index 52e94f486c1d2..8b131fa0448fc 100644 --- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/PipelineOptionsTranslationTest.java +++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/PipelineOptionsTranslationTest.java @@ -30,9 +30,9 @@ import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.util.common.ReflectHelpers; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.NullValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Value; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.NullValue; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Value; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ValidateRunnerXlangTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ValidateRunnerXlangTest.java index 40a0946f52623..371487610f60b 100644 --- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ValidateRunnerXlangTest.java +++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/ValidateRunnerXlangTest.java @@ -47,10 +47,10 @@ import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TypeDescriptors; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ConnectivityState; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ConnectivityState; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannelBuilder; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.junit.After; import org.junit.Before; diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/WindowIntoTranslationTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/WindowIntoTranslationTest.java index 26f0ea8b16c8e..ae748ff85000e 100644 --- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/WindowIntoTranslationTest.java +++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/WindowIntoTranslationTest.java @@ -38,7 +38,7 @@ import org.apache.beam.sdk.transforms.windowing.Window; import org.apache.beam.sdk.transforms.windowing.Window.Assign; import org.apache.beam.sdk.transforms.windowing.WindowFn; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.checkerframework.checker.nullness.qual.Nullable; import org.joda.time.Duration; diff --git a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/graph/ProtoOverridesTest.java b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/graph/ProtoOverridesTest.java index 9e9e26f1eeb67..62774dda30a72 100644 --- a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/graph/ProtoOverridesTest.java +++ b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/graph/ProtoOverridesTest.java @@ -36,7 +36,7 @@ import org.apache.beam.model.pipeline.v1.RunnerApi.Pipeline; import org.apache.beam.model.pipeline.v1.RunnerApi.WindowingStrategy; import org.apache.beam.runners.core.construction.graph.ProtoOverrides.TransformReplacement; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/runners/core-java/build.gradle b/runners/core-java/build.gradle index 52583dfd20a6b..e8ef11bf1b975 100644 --- a/runners/core-java/build.gradle +++ b/runners/core-java/build.gradle @@ -46,7 +46,7 @@ dependencies { compile project(":sdks:java:fn-execution") compile library.java.vendored_guava_26_0_jre compile library.java.joda_time - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.slf4j_api testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.junit diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MetricsContainerStepMap.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MetricsContainerStepMap.java index 7ef5629ace930..f3161c0a7aac3 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MetricsContainerStepMap.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MetricsContainerStepMap.java @@ -35,8 +35,8 @@ import org.apache.beam.sdk.metrics.MetricKey; import org.apache.beam.sdk.metrics.MetricResult; import org.apache.beam.sdk.metrics.MetricResults; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.util.JsonFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.util.JsonFormat; import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MonitoringInfoEncodings.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MonitoringInfoEncodings.java index 31567c312a5fe..b5feea7e34cc8 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MonitoringInfoEncodings.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MonitoringInfoEncodings.java @@ -22,7 +22,7 @@ import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.DoubleCoder; import org.apache.beam.sdk.coders.VarLongCoder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.joda.time.Instant; /** A set of functions used to encode and decode common monitoring info types. */ diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/metrics/MonitoringInfoEncodingsTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/metrics/MonitoringInfoEncodingsTest.java index 4769976100cbb..f048c5ac39a76 100644 --- a/runners/core-java/src/test/java/org/apache/beam/runners/core/metrics/MonitoringInfoEncodingsTest.java +++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/metrics/MonitoringInfoEncodingsTest.java @@ -28,7 +28,7 @@ import static org.apache.beam.runners.core.metrics.MonitoringInfoEncodings.encodeInt64Gauge; import static org.junit.Assert.assertEquals; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.joda.time.Instant; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle index 7f531ce3d8e3f..c9f309fd2a766 100644 --- a/runners/direct-java/build.gradle +++ b/runners/direct-java/build.gradle @@ -70,7 +70,7 @@ dependencies { compile project(it) } shadow project(path: ":sdks:java:core", configuration: "shadow") - shadow library.java.vendored_grpc_1_26_0 + shadow library.java.vendored_grpc_1_36_0 shadow library.java.joda_time shadow library.java.slf4j_api shadow library.java.jackson_databind @@ -89,7 +89,7 @@ dependencies { validatesRunner project(path: ":sdks:java:core", configuration: "shadowTest") validatesRunner project(path: project.path, configuration: "shadow") validatesRunner project(path: project.path, configuration: "shadowTest") - permitUnusedDeclared library.java.vendored_grpc_1_26_0 + permitUnusedDeclared library.java.vendored_grpc_1_36_0 permitUnusedDeclared project(":runners:java-fn-execution") permitUnusedDeclared project(":sdks:java:fn-execution") } diff --git a/runners/flink/flink_runner.gradle b/runners/flink/flink_runner.gradle index 02c339c714ff9..53dc724f5ee26 100644 --- a/runners/flink/flink_runner.gradle +++ b/runners/flink/flink_runner.gradle @@ -134,7 +134,7 @@ dependencies { compile project(":runners:java-fn-execution") compile project(":runners:java-job-service") compile project(":sdks:java:extensions:google-cloud-platform-core") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.slf4j_api compile library.java.joda_time compile library.java.args4j diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkBatchPortablePipelineTranslator.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkBatchPortablePipelineTranslator.java index 32726f37ce3f5..d79884621dd96 100644 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkBatchPortablePipelineTranslator.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkBatchPortablePipelineTranslator.java @@ -75,7 +75,7 @@ import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.BiMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkJobInvoker.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkJobInvoker.java index 09140152d30b0..ce3e8696ca93c 100644 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkJobInvoker.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkJobInvoker.java @@ -28,7 +28,7 @@ import org.apache.beam.runners.jobsubmission.PortablePipelineJarCreator; import org.apache.beam.runners.jobsubmission.PortablePipelineRunner; import org.apache.beam.sdk.options.PortablePipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.ListeningExecutorService; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java index 96b8781cc0353..b9115675628b0 100644 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java @@ -43,7 +43,7 @@ import org.apache.beam.sdk.metrics.MetricsOptions; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.flink.api.common.JobExecutionResult; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingPortablePipelineTranslator.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingPortablePipelineTranslator.java index 08d5a2ac22167..8836006c9d707 100644 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingPortablePipelineTranslator.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkStreamingPortablePipelineTranslator.java @@ -91,7 +91,7 @@ import org.apache.beam.sdk.values.TypeDescriptors; import org.apache.beam.sdk.values.ValueWithRecordId; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.BiMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.HashMultiset; diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/utils/FlinkPortableRunnerUtils.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/utils/FlinkPortableRunnerUtils.java index 3e0054517f586..851a271b6800e 100644 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/utils/FlinkPortableRunnerUtils.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/utils/FlinkPortableRunnerUtils.java @@ -19,7 +19,7 @@ import org.apache.beam.model.pipeline.v1.RunnerApi; import org.apache.beam.runners.core.construction.PTransformTranslation; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; /** * Various utilies related to portability. Helps share code between portable batch and streaming diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperator.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperator.java index b73ea99f3f4fc..f952519d57b69 100644 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperator.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperator.java @@ -103,8 +103,8 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusRuntimeException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusRuntimeException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.apache.flink.api.common.state.ListStateDescriptor; diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtils.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtils.java index 3e27bb1ac1a83..6facf7cfb0d3c 100644 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtils.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtils.java @@ -32,7 +32,7 @@ import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.coders.StructuredCoder; import org.apache.beam.sdk.util.CoderUtils; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; /** * Utility functions for dealing with key encoding. Beam requires keys to be compared in binary diff --git a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/functions/FlinkExecutableStageFunctionTest.java b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/functions/FlinkExecutableStageFunctionTest.java index 06fefcb45e7e7..ce9c8a6248d4a 100644 --- a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/functions/FlinkExecutableStageFunctionTest.java +++ b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/functions/FlinkExecutableStageFunctionTest.java @@ -51,7 +51,7 @@ import org.apache.beam.sdk.transforms.join.RawUnionValue; import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.values.KV; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.flink.api.common.cache.DistributedCache; import org.apache.flink.api.common.functions.RuntimeContext; diff --git a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperatorTest.java b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperatorTest.java index 7e4f8fa705d41..1cee673ce6c25 100644 --- a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperatorTest.java +++ b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperatorTest.java @@ -100,8 +100,8 @@ import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Charsets; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java index 817b5e834b16e..26ad64d57087f 100644 --- a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java +++ b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java @@ -26,7 +26,7 @@ import org.apache.beam.sdk.coders.StringUtf8Coder; import org.apache.beam.sdk.coders.VoidCoder; import org.apache.beam.sdk.util.CoderUtils; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Charsets; import org.junit.Test; diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index 290ea94daddd1..f9bd49ef3eccc 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -92,7 +92,7 @@ dependencies { compile library.java.jackson_databind compile library.java.joda_time compile library.java.slf4j_api - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 testCompile library.java.guava_testlib testCompile library.java.junit testCompile project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntime") diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java index 23147e7ffa280..860bcfc874f47 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java @@ -108,7 +108,7 @@ import org.apache.beam.sdk.values.TimestampedValue; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Supplier; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java index c81631e6d22e6..7dbc8c03dbf27 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowRunner.java @@ -162,8 +162,8 @@ import org.apache.beam.sdk.values.TypeDescriptors; import org.apache.beam.sdk.values.ValueWithRecordId; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Joiner; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java index d7cf5ae4cb526..5aed005a5a3f8 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java @@ -153,7 +153,7 @@ import org.apache.beam.sdk.values.PValues; import org.apache.beam.sdk.values.TimestampedValue; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle b/runners/google-cloud-dataflow-java/worker/build.gradle index a5156ab9695f7..11e69c1ca918e 100644 --- a/runners/google-cloud-dataflow-java/worker/build.gradle +++ b/runners/google-cloud-dataflow-java/worker/build.gradle @@ -82,7 +82,7 @@ dependencies { compile project(":runners:java-fn-execution") compile project(":sdks:java:fn-execution") compile project(path: ":runners:google-cloud-dataflow-java:worker:windmill", configuration: "shadow") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile google_api_services_dataflow compile library.java.avro compile library.java.google_api_client diff --git a/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle b/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle index fa193c01bc2c9..6ae4a53271622 100644 --- a/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle +++ b/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle @@ -53,7 +53,7 @@ def sdk_provided_dependencies = [ library.java.jackson_databind, library.java.joda_time, library.java.slf4j_api, - library.java.vendored_grpc_1_26_0, + library.java.vendored_grpc_1_36_0, ] def sdk_provided_shaded_project_dependencies = [ @@ -222,7 +222,7 @@ dependencies { compile library.java.jackson_databind compile library.java.joda_time compile library.java.slf4j_api - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 provided library.java.error_prone_annotations runtime library.java.slf4j_jdk14 diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/ByteStringCoder.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/ByteStringCoder.java index eab920f73b949..38e64e53a529d 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/ByteStringCoder.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/ByteStringCoder.java @@ -23,7 +23,7 @@ import org.apache.beam.sdk.coders.AtomicCoder; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.util.VarInt; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.ByteStreams; /** diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowRunnerHarness.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowRunnerHarness.java index 4462c1e065bcd..dba75a94a1353 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowRunnerHarness.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowRunnerHarness.java @@ -39,7 +39,7 @@ import org.apache.beam.runners.fnexecution.state.GrpcStateService; import org.apache.beam.runners.fnexecution.status.BeamWorkerStatusGrpcService; import org.apache.beam.sdk.io.FileSystems; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelper.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelper.java index 461b7975f6bde..a6ab2b6e1e7c0 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelper.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelper.java @@ -30,7 +30,7 @@ import org.apache.beam.runners.dataflow.worker.ExperimentContext.Experiment; import org.apache.beam.runners.dataflow.worker.logging.DataflowWorkerLoggingInitializer; import org.apache.beam.runners.dataflow.worker.logging.DataflowWorkerLoggingMDC; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; import org.checkerframework.checker.nullness.qual.Nullable; import org.conscrypt.OpenSSLProvider; import org.slf4j.Logger; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupAlsoByWindowParDoFnFactory.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupAlsoByWindowParDoFnFactory.java index 6ae8b24f881dd..05459e5a6e757 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupAlsoByWindowParDoFnFactory.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/GroupAlsoByWindowParDoFnFactory.java @@ -57,7 +57,7 @@ import org.apache.beam.sdk.util.WindowedValue.WindowedValueCoder; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/PubsubSink.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/PubsubSink.java index 72e3b4c5e402b..955313e7ddad8 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/PubsubSink.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/PubsubSink.java @@ -35,7 +35,7 @@ import org.apache.beam.sdk.util.SerializableUtils; import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.util.WindowedValue.WindowedValueCoder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StateFetcher.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StateFetcher.java index aa393d2ea6af8..db5256aa886dc 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StateFetcher.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StateFetcher.java @@ -38,7 +38,7 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Optional; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Supplier; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.cache.Cache; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java index 5a586124dea6e..38261b1e5bb14 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java @@ -134,8 +134,8 @@ import org.apache.beam.sdk.util.Sleeper; import org.apache.beam.sdk.util.UserCodeException; import org.apache.beam.sdk.util.WindowedValue.WindowedValueCoder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Optional; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingModeExecutionContext.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingModeExecutionContext.java index 48b78a3a7588d..f0df410a50646 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingModeExecutionContext.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingModeExecutionContext.java @@ -53,7 +53,7 @@ import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Optional; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Supplier; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputFetcher.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputFetcher.java index e87855c3ba291..76f3885092b97 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputFetcher.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputFetcher.java @@ -48,8 +48,8 @@ import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Parser; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Parser; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillComputationKey.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillComputationKey.java index ea5111c68f0e3..b5ba9bb8c32c9 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillComputationKey.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillComputationKey.java @@ -18,8 +18,8 @@ package org.apache.beam.runners.dataflow.worker; import com.google.auto.value.AutoValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; @AutoValue public abstract class WindmillComputationKey { diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillNamespacePrefix.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillNamespacePrefix.java index 2dd70062c6346..d2aca7ef16c71 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillNamespacePrefix.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillNamespacePrefix.java @@ -17,7 +17,7 @@ */ package org.apache.beam.runners.dataflow.worker; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; /** * A prefix for a Windmill state or timer tag to separate user state and timers from system state diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillSink.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillSink.java index cd4676a9156fc..197a2d3c3686f 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillSink.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillSink.java @@ -39,7 +39,7 @@ import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.ValueWithRecordId; import org.apache.beam.sdk.values.ValueWithRecordId.ValueWithRecordIdCoder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateCache.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateCache.java index 0706b221f8db0..8ced960598956 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateCache.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateCache.java @@ -33,7 +33,7 @@ import org.apache.beam.runners.dataflow.worker.status.StatusDataProvider; import org.apache.beam.sdk.state.State; import org.apache.beam.sdk.util.Weighted; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Equivalence; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.cache.Cache; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.cache.CacheBuilder; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateInternals.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateInternals.java index 15d399bc16ebe..9ca72ccfb6d48 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateInternals.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateInternals.java @@ -82,7 +82,7 @@ import org.apache.beam.sdk.util.CombineFnUtil; import org.apache.beam.sdk.util.Weighted; import org.apache.beam.sdk.values.TimestampedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Optional; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateReader.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateReader.java index 8d727da715fc1..c877c98082bf4 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateReader.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillStateReader.java @@ -53,7 +53,7 @@ import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.util.Weighted; import org.apache.beam.sdk.values.TimestampedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Function; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillTimerInternals.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillTimerInternals.java index a102e178aea57..3308f9f03f90f 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillTimerInternals.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WindmillTimerInternals.java @@ -33,7 +33,7 @@ import org.apache.beam.sdk.util.ExposedByteArrayInputStream; import org.apache.beam.sdk.util.ExposedByteArrayOutputStream; import org.apache.beam.sdk.util.VarInt; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.HashBasedTable; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Table; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WorkerCustomSources.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WorkerCustomSources.java index 4039996b73da9..0c4a50859b2d9 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WorkerCustomSources.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/WorkerCustomSources.java @@ -60,7 +60,7 @@ import org.apache.beam.sdk.util.FluentBackoff; import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.values.ValueWithRecordId; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlService.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlService.java index ab0774714a569..02b9bde7ca406 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlService.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlService.java @@ -28,9 +28,9 @@ import org.apache.beam.runners.dataflow.worker.fn.grpc.BeamFnService; import org.apache.beam.runners.fnexecution.HeaderAccessor; import org.apache.beam.runners.fnexecution.control.FnApiControlClient; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/control/RegisterAndProcessBundleOperation.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/control/RegisterAndProcessBundleOperation.java index b9a125aa088f5..b49df39ca7591 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/control/RegisterAndProcessBundleOperation.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/control/RegisterAndProcessBundleOperation.java @@ -73,8 +73,8 @@ import org.apache.beam.sdk.transforms.windowing.GlobalWindow; import org.apache.beam.sdk.util.MoreFutures; import org.apache.beam.sdk.values.PCollectionView; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/data/BeamFnDataGrpcService.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/data/BeamFnDataGrpcService.java index 9abc49378a191..3fbacbf7938be 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/data/BeamFnDataGrpcService.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/data/BeamFnDataGrpcService.java @@ -41,8 +41,8 @@ import org.apache.beam.sdk.fn.data.LogicalEndpoint; import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/logging/BeamFnLoggingService.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/logging/BeamFnLoggingService.java index c4793e5fd42fc..75ccbb03e67a7 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/logging/BeamFnLoggingService.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/logging/BeamFnLoggingService.java @@ -28,8 +28,8 @@ import org.apache.beam.runners.dataflow.worker.fn.grpc.BeamFnService; import org.apache.beam.runners.dataflow.worker.logging.DataflowWorkerLoggingMDC; import org.apache.beam.runners.fnexecution.HeaderAccessor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/stream/ServerStreamObserverFactory.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/stream/ServerStreamObserverFactory.java index 1d82acb4df542..fff3b06c656bd 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/stream/ServerStreamObserverFactory.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/fn/stream/ServerStreamObserverFactory.java @@ -27,9 +27,9 @@ import org.apache.beam.sdk.fn.stream.ForwardingClientResponseObserver; import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ServerCallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ServerCallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * A {@link StreamObserver} factory that wraps provided {@link CallStreamObserver}s making them flow diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/CreateExecutableStageNodeFunction.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/CreateExecutableStageNodeFunction.java index d106b7591f34c..7b3dbdab03283 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/CreateExecutableStageNodeFunction.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/CreateExecutableStageNodeFunction.java @@ -83,8 +83,8 @@ import org.apache.beam.sdk.util.WindowedValue.WindowedValueCoder; import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/InsertFetchAndFilterStreamingSideInputNodes.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/InsertFetchAndFilterStreamingSideInputNodes.java index 8bc86dd3300c2..ca6d0be23c4ee 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/InsertFetchAndFilterStreamingSideInputNodes.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/InsertFetchAndFilterStreamingSideInputNodes.java @@ -36,7 +36,7 @@ import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/RegisterNodeFunction.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/RegisterNodeFunction.java index 689703d75cd39..9bed9c49eaf38 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/RegisterNodeFunction.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/RegisterNodeFunction.java @@ -77,8 +77,8 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/DirectStreamObserver.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/DirectStreamObserver.java index 7565ba260e55a..0cef13675f93c 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/DirectStreamObserver.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/DirectStreamObserver.java @@ -19,8 +19,8 @@ import java.util.concurrent.Phaser; import javax.annotation.concurrent.ThreadSafe; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * A {@link StreamObserver} which uses synchronization on the underlying {@link CallStreamObserver} diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/ForwardingClientResponseObserver.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/ForwardingClientResponseObserver.java index d7eba1f28a5c7..0446a30bc9e06 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/ForwardingClientResponseObserver.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/ForwardingClientResponseObserver.java @@ -17,9 +17,9 @@ */ package org.apache.beam.runners.dataflow.worker.windmill; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ClientCallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ClientResponseObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ClientCallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ClientResponseObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * A {@link ClientResponseObserver} which delegates all {@link StreamObserver} calls. diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/GrpcWindmillServer.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/GrpcWindmillServer.java index 64517aa8ba92b..8a76e96c56f31 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/GrpcWindmillServer.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/GrpcWindmillServer.java @@ -86,17 +86,17 @@ import org.apache.beam.sdk.util.BackOffUtils; import org.apache.beam.sdk.util.FluentBackoff; import org.apache.beam.sdk.util.Sleeper; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.CallCredentials; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Channel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusRuntimeException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.auth.MoreCallCredentials; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.netty.GrpcSslContexts; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.netty.NegotiationType; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.netty.NettyChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.CallCredentials; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Channel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusRuntimeException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.auth.MoreCallCredentials; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.netty.GrpcSslContexts; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.netty.NegotiationType; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.netty.NettyChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Splitter; @@ -264,11 +264,11 @@ private synchronized void initializeLocalHost(int port) throws IOException { */ private static class VendoredRequestMetadataCallbackAdapter implements com.google.auth.RequestMetadataCallback { - private final org.apache.beam.vendor.grpc.v1p26p0.com.google.auth.RequestMetadataCallback + private final org.apache.beam.vendor.grpc.v1p36p0.com.google.auth.RequestMetadataCallback callback; private VendoredRequestMetadataCallbackAdapter( - org.apache.beam.vendor.grpc.v1p26p0.com.google.auth.RequestMetadataCallback callback) { + org.apache.beam.vendor.grpc.v1p36p0.com.google.auth.RequestMetadataCallback callback) { this.callback = callback; } @@ -292,7 +292,7 @@ public void onFailure(Throwable exception) { * delegate to reduce maintenance burden. */ private static class VendoredCredentialsAdapter - extends org.apache.beam.vendor.grpc.v1p26p0.com.google.auth.Credentials { + extends org.apache.beam.vendor.grpc.v1p36p0.com.google.auth.Credentials { private final com.google.auth.Credentials credentials; private VendoredCredentialsAdapter(com.google.auth.Credentials credentials) { @@ -313,7 +313,7 @@ public Map> getRequestMetadata() throws IOException { public void getRequestMetadata( final URI uri, Executor executor, - final org.apache.beam.vendor.grpc.v1p26p0.com.google.auth.RequestMetadataCallback + final org.apache.beam.vendor.grpc.v1p36p0.com.google.auth.RequestMetadataCallback callback) { credentials.getRequestMetadata( uri, executor, new VendoredRequestMetadataCallbackAdapter(callback)); diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/StreamObserverFactory.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/StreamObserverFactory.java index 021676694d0ea..349460672c46f 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/StreamObserverFactory.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/StreamObserverFactory.java @@ -20,8 +20,8 @@ import java.util.function.Function; import org.apache.beam.sdk.fn.stream.AdvancingPhaser; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * Uses {@link PipelineOptions} to configure which underlying {@link StreamObserver} implementation diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/harness/test/TestStreams.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/harness/test/TestStreams.java index e88054c327ae3..8ac6ca8ce4504 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/harness/test/TestStreams.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/harness/test/TestStreams.java @@ -19,8 +19,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** Utility methods which enable testing of {@link StreamObserver}s. */ public class TestStreams { diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/DataflowMatchers.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/DataflowMatchers.java index 4b69f070df84d..ddb68c72b759d 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/DataflowMatchers.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/DataflowMatchers.java @@ -18,7 +18,7 @@ package org.apache.beam.runners.dataflow.worker; import java.io.Serializable; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelperTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelperTest.java index 6a8494119f93d..90095c0c966e5 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelperTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/DataflowWorkerHarnessHelperTest.java @@ -32,7 +32,7 @@ import org.apache.beam.runners.dataflow.worker.testing.RestoreDataflowLoggingMDC; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.testing.RestoreSystemProperties; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/PubsubReaderTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/PubsubReaderTest.java index 9cae865f5e2ed..ea2687d7721b7 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/PubsubReaderTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/PubsubReaderTest.java @@ -31,7 +31,7 @@ import org.apache.beam.sdk.coders.StringUtf8Coder; import org.apache.beam.sdk.transforms.windowing.IntervalWindow; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.joda.time.Instant; import org.junit.Before; import org.junit.Test; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/PubsubSinkTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/PubsubSinkTest.java index a01356e3b3f3b..deff0d1c4139b 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/PubsubSinkTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/PubsubSinkTest.java @@ -29,7 +29,7 @@ import org.apache.beam.sdk.coders.StringUtf8Coder; import org.apache.beam.sdk.transforms.windowing.IntervalWindow; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.joda.time.Instant; import org.junit.Before; import org.junit.Test; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/ReaderCacheTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/ReaderCacheTest.java index b9452c36d9435..7105da82af59e 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/ReaderCacheTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/ReaderCacheTest.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; import org.apache.beam.sdk.io.UnboundedSource; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Stopwatch; import org.joda.time.Duration; import org.junit.Before; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StateFetcherTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StateFetcherTest.java index 3d8b761f63eb8..867972083a8f8 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StateFetcherTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StateFetcherTest.java @@ -43,7 +43,7 @@ import org.apache.beam.sdk.transforms.View; import org.apache.beam.sdk.transforms.windowing.GlobalWindow; import org.apache.beam.sdk.values.PCollectionView; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Supplier; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.cache.Cache; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.cache.CacheBuilder; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorkerTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorkerTest.java index d68f9fe4a7ece..0a72c08149c1b 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorkerTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorkerTest.java @@ -142,9 +142,9 @@ import org.apache.beam.sdk.values.ValueWithRecordId; import org.apache.beam.sdk.values.WindowingStrategy; import org.apache.beam.sdk.values.WindowingStrategy.AccumulationMode; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString.Output; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString.Output; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Optional; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingGroupAlsoByWindowFnsTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingGroupAlsoByWindowFnsTest.java index 6f3fff27403a8..5e4abd053bdd6 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingGroupAlsoByWindowFnsTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingGroupAlsoByWindowFnsTest.java @@ -75,7 +75,7 @@ import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.joda.time.Duration; import org.joda.time.Instant; import org.junit.Before; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingGroupAlsoByWindowsReshuffleDoFnTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingGroupAlsoByWindowsReshuffleDoFnTest.java index 144496c542d5a..5021d682c7f31 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingGroupAlsoByWindowsReshuffleDoFnTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingGroupAlsoByWindowsReshuffleDoFnTest.java @@ -48,7 +48,7 @@ import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.hamcrest.Matchers; import org.joda.time.Duration; import org.joda.time.Instant; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingModeExecutionContextTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingModeExecutionContextTest.java index f682470df7630..2cc2530eb4095 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingModeExecutionContextTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingModeExecutionContextTest.java @@ -66,7 +66,7 @@ import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; import org.hamcrest.Matchers; import org.joda.time.Duration; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputDoFnRunnerTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputDoFnRunnerTest.java index 04f1819fab5c0..16d986b724863 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputDoFnRunnerTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputDoFnRunnerTest.java @@ -63,7 +63,7 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.hamcrest.Matchers; import org.joda.time.Duration; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputFetcherTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputFetcherTest.java index e6d71d9fe87d0..b525554c6f231 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputFetcherTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputFetcherTest.java @@ -49,7 +49,7 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Sets; import org.hamcrest.Matchers; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillKeyedWorkItemTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillKeyedWorkItemTest.java index 0832bb89f6a10..312ba03951de6 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillKeyedWorkItemTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillKeyedWorkItemTest.java @@ -40,7 +40,7 @@ import org.apache.beam.sdk.transforms.windowing.PaneInfo; import org.apache.beam.sdk.transforms.windowing.PaneInfo.Timing; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.hamcrest.Matchers; import org.joda.time.Instant; import org.junit.Before; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillReaderIteratorBaseTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillReaderIteratorBaseTest.java index 0b89c998e1c6f..d527be85bef16 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillReaderIteratorBaseTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillReaderIteratorBaseTest.java @@ -26,7 +26,7 @@ import java.util.List; import org.apache.beam.runners.dataflow.worker.windmill.Windmill; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateCacheTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateCacheTest.java index 210c2f733945c..985b0513e1a1e 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateCacheTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateCacheTest.java @@ -30,7 +30,7 @@ import org.apache.beam.sdk.state.State; import org.apache.beam.sdk.state.StateSpec; import org.apache.beam.sdk.transforms.windowing.IntervalWindow; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.checkerframework.checker.nullness.qual.Nullable; import org.joda.time.Instant; import org.junit.Before; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateInternalsTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateInternalsTest.java index 8366797784bc9..bbe3ae13a54a6 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateInternalsTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateInternalsTest.java @@ -71,7 +71,7 @@ import org.apache.beam.sdk.transforms.windowing.TimestampCombiner; import org.apache.beam.sdk.util.CoderUtils; import org.apache.beam.sdk.values.TimestampedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Supplier; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Range; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateReaderTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateReaderTest.java index 143bfe29176ee..da07c8dbcb9e4 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateReaderTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WindmillStateReaderTest.java @@ -35,8 +35,8 @@ import org.apache.beam.sdk.coders.VarIntCoder; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.values.TimestampedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString.Output; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString.Output; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Charsets; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Range; import org.hamcrest.Matchers; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WorkerCustomSourcesTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WorkerCustomSourcesTest.java index 6738636f18b4d..680677458e056 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WorkerCustomSourcesTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WorkerCustomSourcesTest.java @@ -108,7 +108,7 @@ import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.ValueWithRecordId; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java index 76fb6d00dfd2a..18119a46473aa 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/BeamFnControlServiceTest.java @@ -35,9 +35,9 @@ import org.apache.beam.runners.fnexecution.control.FnApiControlClient; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.testing.GrpcCleanupRule; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.testing.GrpcCleanupRule; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.net.HostAndPort; import org.junit.Before; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/control/RegisterAndProcessBundleOperationTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/control/RegisterAndProcessBundleOperationTest.java index 60b6d4b2e338c..91e8257b6e1cd 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/control/RegisterAndProcessBundleOperationTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/control/RegisterAndProcessBundleOperationTest.java @@ -78,7 +78,7 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.ValueInSingleWindow.Coder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableTable; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/data/BeamFnDataGrpcServiceTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/data/BeamFnDataGrpcServiceTest.java index 53d004d6477d6..48c15eb7f3f8f 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/data/BeamFnDataGrpcServiceTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/data/BeamFnDataGrpcServiceTest.java @@ -51,22 +51,22 @@ import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.BindableService; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.CallOptions; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Channel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ClientCall; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ClientInterceptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ForwardingClientCall.SimpleForwardingClientCall; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Metadata; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Metadata.Key; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.MethodDescriptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerInterceptors; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.BindableService; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.CallOptions; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Channel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ClientCall; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ClientInterceptor; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ForwardingClientCall.SimpleForwardingClientCall; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Metadata; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Metadata.Key; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.MethodDescriptor; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerInterceptors; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/logging/BeamFnLoggingServiceTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/logging/BeamFnLoggingServiceTest.java index 001a2a0139de3..64fc33633bd84 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/logging/BeamFnLoggingServiceTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/logging/BeamFnLoggingServiceTest.java @@ -38,12 +38,12 @@ import org.apache.beam.runners.dataflow.worker.fn.stream.ServerStreamObserverFactory; import org.apache.beam.runners.fnexecution.GrpcContextHeaderAccessorProvider; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.BindableService; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.BindableService; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.net.HostAndPort; import org.junit.After; import org.junit.Test; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/stream/ServerStreamObserverFactoryTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/stream/ServerStreamObserverFactoryTest.java index 2de68f838ccf5..e5e0171f6b453 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/stream/ServerStreamObserverFactoryTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/fn/stream/ServerStreamObserverFactoryTest.java @@ -24,8 +24,8 @@ import org.apache.beam.sdk.fn.stream.BufferingStreamObserver; import org.apache.beam.sdk.fn.stream.DirectStreamObserver; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/graph/InsertFetchAndFilterStreamingSideInputNodesTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/graph/InsertFetchAndFilterStreamingSideInputNodesTest.java index d35ac2f26bd16..b8c24d0614fce 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/graph/InsertFetchAndFilterStreamingSideInputNodesTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/graph/InsertFetchAndFilterStreamingSideInputNodesTest.java @@ -53,7 +53,7 @@ import org.apache.beam.sdk.transforms.View; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionView; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Equivalence; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Equivalence.Wrapper; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingHandlerTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingHandlerTest.java index 84adfcdb844cb..99638b0c8c5fe 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingHandlerTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingHandlerTest.java @@ -35,7 +35,7 @@ import org.apache.beam.runners.dataflow.worker.NameContextsForTests; import org.apache.beam.runners.dataflow.worker.TestOperationContext.TestDataflowExecutionState; import org.apache.beam.runners.dataflow.worker.testing.RestoreDataflowLoggingMDC; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Supplier; import org.junit.After; import org.junit.Before; diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/GrpcWindmillServerTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/GrpcWindmillServerTest.java index 3096a874a48dc..3a58685793b41 100644 --- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/GrpcWindmillServerTest.java +++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/GrpcWindmillServerTest.java @@ -58,13 +58,13 @@ import org.apache.beam.runners.dataflow.worker.windmill.WindmillServerStub.CommitWorkStream; import org.apache.beam.runners.dataflow.worker.windmill.WindmillServerStub.GetDataStream; import org.apache.beam.runners.dataflow.worker.windmill.WindmillServerStub.GetWorkStream; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusRuntimeException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.util.MutableHandlerRegistry; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusRuntimeException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.util.MutableHandlerRegistry; import org.checkerframework.checker.nullness.qual.Nullable; import org.hamcrest.Matchers; import org.joda.time.Instant; diff --git a/runners/java-fn-execution/build.gradle b/runners/java-fn-execution/build.gradle index 87fc309b31035..0ee96414dbdb8 100644 --- a/runners/java-fn-execution/build.gradle +++ b/runners/java-fn-execution/build.gradle @@ -31,7 +31,7 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:fn-execution") compile project(":runners:core-construction-java") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.slf4j_api compile project(path: ":model:job-management", configuration: "shadow") compile library.java.joda_time diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/FnService.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/FnService.java index 634657a42aca7..1a881d1ea8196 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/FnService.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/FnService.java @@ -17,7 +17,7 @@ */ package org.apache.beam.runners.fnexecution; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.BindableService; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.BindableService; /** An interface sharing common behavior with services used during execution of user Fns. */ public interface FnService extends AutoCloseable, BindableService { @@ -26,8 +26,8 @@ public interface FnService extends AutoCloseable, BindableService { * *

There should be no more calls to any service method by the time a call to {@link #close()} * begins. Specifically, this means that a {@link - * org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server} that this service is bound to should have - * completed a call to the {@link org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server#shutdown()} + * org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server} that this service is bound to should have + * completed a call to the {@link org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server#shutdown()} * method, and all future incoming calls will be rejected. */ @Override diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/GrpcContextHeaderAccessorProvider.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/GrpcContextHeaderAccessorProvider.java index fdfcc477b676c..5ba8e043370d1 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/GrpcContextHeaderAccessorProvider.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/GrpcContextHeaderAccessorProvider.java @@ -17,14 +17,14 @@ */ package org.apache.beam.runners.fnexecution; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Context; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Contexts; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Metadata; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Metadata.Key; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerCall; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerCall.Listener; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerCallHandler; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerInterceptor; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Context; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Contexts; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Metadata; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Metadata.Key; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerCall; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerCall.Listener; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerCallHandler; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerInterceptor; /** * A HeaderAccessorProvider which intercept the header in a GRPC request and expose the relevant diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/GrpcFnServer.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/GrpcFnServer.java index 7e63fc934b699..ccbc37dd655b0 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/GrpcFnServer.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/GrpcFnServer.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Lists; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/InProcessServerFactory.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/InProcessServerFactory.java index e72b0bcf77cb6..101707f36d2da 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/InProcessServerFactory.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/InProcessServerFactory.java @@ -21,10 +21,10 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.BindableService; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerInterceptors; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.BindableService; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerInterceptors; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; /** * A {@link ServerFactory} which creates {@link Server servers} with the {@link diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/ServerFactory.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/ServerFactory.java index c1b842d46a4ab..e1b90f7a560cb 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/ServerFactory.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/ServerFactory.java @@ -29,16 +29,16 @@ import java.util.function.Supplier; import org.apache.beam.model.pipeline.v1.Endpoints; import org.apache.beam.sdk.fn.channel.SocketAddressFactory; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.BindableService; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerInterceptors; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.netty.NettyServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.EpollEventLoopGroup; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.EpollServerDomainSocketChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.EpollServerSocketChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.unix.DomainSocketAddress; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.util.internal.ThreadLocalRandom; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.BindableService; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerInterceptors; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.netty.NettyServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.EpollEventLoopGroup; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.EpollServerDomainSocketChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.EpollServerSocketChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.unix.DomainSocketAddress; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.util.internal.ThreadLocalRandom; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.net.HostAndPort; /** A {@link Server gRPC server} factory. */ diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalService.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalService.java index 269f8443f6252..8e7ecf4cf2159 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalService.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalService.java @@ -30,10 +30,10 @@ import org.apache.beam.runners.core.construction.DefaultArtifactResolver; import org.apache.beam.runners.fnexecution.FnService; import org.apache.beam.sdk.io.FileSystems; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** An {@link ArtifactRetrievalService} that uses {@link FileSystems} as its backing storage. */ @SuppressWarnings({ diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingService.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingService.java index bbe650ee24ab2..7d07a9b43dd37 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingService.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingService.java @@ -51,11 +51,11 @@ import org.apache.beam.sdk.io.fs.ResolveOptions; import org.apache.beam.sdk.io.fs.ResourceId; import org.apache.beam.sdk.util.MimeTypes; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Charsets; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Splitter; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/BundleCheckpointHandlers.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/BundleCheckpointHandlers.java index 6ed6127928cde..780881d8d42c3 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/BundleCheckpointHandlers.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/BundleCheckpointHandlers.java @@ -108,7 +108,7 @@ public void onCheckpoint(ProcessBundleResponse response) { // Calculate the watermark hold for the timer. long outputTimestamp = BoundedWindow.TIMESTAMP_MAX_VALUE.getMillis(); if (!residual.getApplication().getOutputWatermarksMap().isEmpty()) { - for (org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp outputWatermark : + for (org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp outputWatermark : residual.getApplication().getOutputWatermarksMap().values()) { outputTimestamp = Math.min(outputTimestamp, outputWatermark.getSeconds() * 1000); } diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/FnApiControlClient.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/FnApiControlClient.java index ba7db0f5e3549..2e9554f1e9622 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/FnApiControlClient.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/FnApiControlClient.java @@ -29,9 +29,9 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi; import org.apache.beam.model.fnexecution.v1.BeamFnApi.InstructionRequest; import org.apache.beam.sdk.fn.stream.SynchronizedStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusRuntimeException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusRuntimeException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientPoolService.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientPoolService.java index a4e06e2a2b412..15fd030e681b1 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientPoolService.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientPoolService.java @@ -28,9 +28,9 @@ import org.apache.beam.model.fnexecution.v1.BeamFnControlGrpc; import org.apache.beam.runners.fnexecution.FnService; import org.apache.beam.runners.fnexecution.HeaderAccessor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/ProcessBundleDescriptors.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/ProcessBundleDescriptors.java index 465e793cf0cd0..ae10a801f3827 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/ProcessBundleDescriptors.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/ProcessBundleDescriptors.java @@ -58,7 +58,7 @@ import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.util.WindowedValue.FullWindowedValueCoder; import org.apache.beam.sdk.values.KV; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableTable; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/data/GrpcDataService.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/data/GrpcDataService.java index e8ad75175ebbe..19b964eb1d017 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/data/GrpcDataService.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/data/GrpcDataService.java @@ -37,7 +37,7 @@ import org.apache.beam.sdk.fn.data.LogicalEndpoint; import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.SettableFuture; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/environment/ExternalEnvironmentFactory.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/environment/ExternalEnvironmentFactory.java index 1852d61732a4f..446e0b91b274d 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/environment/ExternalEnvironmentFactory.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/environment/ExternalEnvironmentFactory.java @@ -35,7 +35,7 @@ import org.apache.beam.runners.fnexecution.provisioning.StaticGrpcProvisionService; import org.apache.beam.sdk.fn.IdGenerator; import org.apache.beam.sdk.fn.channel.ManagedChannelFactory; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/logging/GrpcLoggingService.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/logging/GrpcLoggingService.java index 631260d084d2b..4e13581b83481 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/logging/GrpcLoggingService.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/logging/GrpcLoggingService.java @@ -24,7 +24,7 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.LogControl; import org.apache.beam.model.fnexecution.v1.BeamFnLoggingGrpc; import org.apache.beam.runners.fnexecution.FnService; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/provisioning/JobInfo.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/provisioning/JobInfo.java index 95a3070aeee8e..6a6645be78876 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/provisioning/JobInfo.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/provisioning/JobInfo.java @@ -20,7 +20,7 @@ import com.google.auto.value.AutoValue; import java.io.Serializable; import org.apache.beam.model.fnexecution.v1.ProvisionApi; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; /** * A subset of {@link org.apache.beam.model.fnexecution.v1.ProvisionApi.ProvisionInfo} that diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/provisioning/StaticGrpcProvisionService.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/provisioning/StaticGrpcProvisionService.java index 05f3468e4c811..790ba150e88ef 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/provisioning/StaticGrpcProvisionService.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/provisioning/StaticGrpcProvisionService.java @@ -28,7 +28,7 @@ import org.apache.beam.model.pipeline.v1.RunnerApi; import org.apache.beam.runners.fnexecution.FnService; import org.apache.beam.runners.fnexecution.HeaderAccessor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * A {@link ProvisionServiceImplBase provision service} that returns a static response to all calls. diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/GrpcStateService.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/GrpcStateService.java index df109101e2762..2164448093110 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/GrpcStateService.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/GrpcStateService.java @@ -28,8 +28,8 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateResponse; import org.apache.beam.model.fnexecution.v1.BeamFnStateGrpc; import org.apache.beam.runners.fnexecution.FnService; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ServerCallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ServerCallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** An implementation of the Beam Fn State service. */ public class GrpcStateService extends BeamFnStateGrpc.BeamFnStateImplBase diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlers.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlers.java index e8ad54f99ce5a..1e727390bb4db 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlers.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlers.java @@ -53,7 +53,7 @@ import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.util.common.Reiterable; import org.apache.beam.sdk.values.KV; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Charsets; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/status/BeamWorkerStatusGrpcService.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/status/BeamWorkerStatusGrpcService.java index c3f9bba165048..6d41ed7b42841 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/status/BeamWorkerStatusGrpcService.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/status/BeamWorkerStatusGrpcService.java @@ -35,7 +35,7 @@ import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; import org.apache.beam.runners.fnexecution.FnService; import org.apache.beam.runners.fnexecution.HeaderAccessor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableSet; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/status/WorkerStatusClient.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/status/WorkerStatusClient.java index 0d892e518eb8a..03b48ec81b14b 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/status/WorkerStatusClient.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/status/WorkerStatusClient.java @@ -29,7 +29,7 @@ import org.apache.beam.sdk.fn.IdGenerator; import org.apache.beam.sdk.fn.IdGenerators; import org.apache.beam.sdk.fn.stream.SynchronizedStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/translation/PipelineTranslatorUtils.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/translation/PipelineTranslatorUtils.java index 61f21dd4a915b..ecfc234f885aa 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/translation/PipelineTranslatorUtils.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/translation/PipelineTranslatorUtils.java @@ -43,7 +43,7 @@ import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.BiMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableBiMap; diff --git a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/wire/ByteStringCoder.java b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/wire/ByteStringCoder.java index 90955bc1a816b..86127f72c6056 100644 --- a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/wire/ByteStringCoder.java +++ b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/wire/ByteStringCoder.java @@ -26,7 +26,7 @@ import org.apache.beam.sdk.coders.CoderException; import org.apache.beam.sdk.util.VarInt; import org.apache.beam.sdk.values.TypeDescriptor; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.ByteStreams; /** diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/GrpcContextHeaderAccessorProviderTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/GrpcContextHeaderAccessorProviderTest.java index aebc327364dac..c308d0ac707b7 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/GrpcContextHeaderAccessorProviderTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/GrpcContextHeaderAccessorProviderTest.java @@ -24,16 +24,16 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.Elements; import org.apache.beam.model.fnexecution.v1.BeamFnDataGrpc; import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.CallOptions; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Channel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ClientCall; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ClientInterceptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ForwardingClientCall.SimpleForwardingClientCall; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Metadata; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.MethodDescriptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.testing.GrpcCleanupRule; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.CallOptions; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Channel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ClientCall; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ClientInterceptor; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ForwardingClientCall.SimpleForwardingClientCall; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Metadata; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.MethodDescriptor; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.testing.GrpcCleanupRule; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.junit.Assert; import org.junit.Rule; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/ServerFactoryTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/ServerFactoryTest.java index 1adb57de06736..97e88f286f4a1 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/ServerFactoryTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/ServerFactoryTest.java @@ -43,12 +43,12 @@ import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; import org.apache.beam.sdk.fn.channel.ManagedChannelFactory; import org.apache.beam.sdk.fn.test.TestStreams; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.testing.GrpcCleanupRule; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.Epoll; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.testing.GrpcCleanupRule; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.Epoll; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.net.HostAndPort; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.Uninterruptibles; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalServiceTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalServiceTest.java index 5c0fe2dfc1836..2f936f48fc6ef 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalServiceTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalServiceTest.java @@ -29,11 +29,11 @@ import org.apache.beam.model.jobmanagement.v1.ArtifactRetrievalServiceGrpc; import org.apache.beam.model.pipeline.v1.RunnerApi; import org.apache.beam.runners.fnexecution.GrpcFnServer; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.testing.GrpcCleanupRule; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.testing.GrpcCleanupRule; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Charsets; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingServiceTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingServiceTest.java index b52106e76d47c..a23ff906d67e7 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingServiceTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingServiceTest.java @@ -29,12 +29,12 @@ import org.apache.beam.model.jobmanagement.v1.ArtifactRetrievalServiceGrpc; import org.apache.beam.model.jobmanagement.v1.ArtifactStagingServiceGrpc; import org.apache.beam.model.pipeline.v1.RunnerApi; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.testing.GrpcCleanupRule; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.testing.GrpcCleanupRule; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/DefaultJobBundleFactoryTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/DefaultJobBundleFactoryTest.java index 9e9f951846993..e9193c4128cbf 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/DefaultJobBundleFactoryTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/DefaultJobBundleFactoryTest.java @@ -68,8 +68,8 @@ import org.apache.beam.sdk.options.ExperimentalOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.options.PortablePipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.junit.Assert; import org.junit.Before; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientPoolServiceTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientPoolServiceTest.java index 3255d6d1f0eb3..3b1927d4d0f4d 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientPoolServiceTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientPoolServiceTest.java @@ -36,10 +36,10 @@ import org.apache.beam.runners.fnexecution.GrpcFnServer; import org.apache.beam.runners.fnexecution.InProcessServerFactory; import org.apache.beam.sdk.util.MoreFutures; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientTest.java index 8da26f5fe4fc5..26bb95e4f136b 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/FnApiControlClientTest.java @@ -33,7 +33,7 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.InstructionRequest; import org.apache.beam.model.fnexecution.v1.BeamFnApi.InstructionResponse; import org.apache.beam.sdk.util.MoreFutures; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/RemoteExecutionTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/RemoteExecutionTest.java index b212448ea6ec1..a8a3744b9f75b 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/RemoteExecutionTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/RemoteExecutionTest.java @@ -131,7 +131,7 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionList; import org.apache.beam.sdk.values.PCollectionView; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Optional; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/SdkHarnessClientTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/SdkHarnessClientTest.java index 922b7861d2f46..3528e99b2e1af 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/SdkHarnessClientTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/control/SdkHarnessClientTest.java @@ -83,7 +83,7 @@ import org.apache.beam.sdk.util.WindowedValue.FullWindowedValueCoder; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TupleTagList; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.junit.Before; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/data/GrpcDataServiceTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/data/GrpcDataServiceTest.java index 3358cd6ac049a..2c4bb7a1b9eea 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/data/GrpcDataServiceTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/data/GrpcDataServiceTest.java @@ -47,10 +47,10 @@ import org.apache.beam.sdk.fn.test.TestStreams; import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/logging/GrpcLoggingServiceTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/logging/GrpcLoggingServiceTest.java index 173e54d19bbf2..e2f2de00f764e 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/logging/GrpcLoggingServiceTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/logging/GrpcLoggingServiceTest.java @@ -37,9 +37,9 @@ import org.apache.beam.runners.fnexecution.GrpcFnServer; import org.apache.beam.runners.fnexecution.InProcessServerFactory; import org.apache.beam.sdk.fn.test.TestStreams; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/provisioning/StaticGrpcProvisionServiceTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/provisioning/StaticGrpcProvisionServiceTest.java index 5ef8306a3e600..f3920242d94d9 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/provisioning/StaticGrpcProvisionServiceTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/provisioning/StaticGrpcProvisionServiceTest.java @@ -28,11 +28,11 @@ import org.apache.beam.runners.fnexecution.GrpcContextHeaderAccessorProvider; import org.apache.beam.runners.fnexecution.GrpcFnServer; import org.apache.beam.runners.fnexecution.InProcessServerFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ListValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.NullValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Value; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ListValue; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.NullValue; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Value; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/state/GrpcStateServiceTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/state/GrpcStateServiceTest.java index c076e048f64b6..c9a2827a9b506 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/state/GrpcStateServiceTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/state/GrpcStateServiceTest.java @@ -31,8 +31,8 @@ import java.util.concurrent.TimeUnit; import org.apache.beam.model.fnexecution.v1.BeamFnApi; import org.apache.beam.sdk.fn.test.TestStreams; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlersTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlersTest.java index 0c0c68de27301..3fbee1fb7c1f4 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlersTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlersTest.java @@ -37,7 +37,7 @@ import org.apache.beam.runners.fnexecution.control.ProcessBundleDescriptors; import org.apache.beam.sdk.transforms.windowing.GlobalWindow; import org.apache.beam.sdk.util.CoderUtils; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/status/BeamWorkerStatusGrpcServiceTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/status/BeamWorkerStatusGrpcServiceTest.java index 9b0491430dc1a..72f01ad02a548 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/status/BeamWorkerStatusGrpcServiceTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/status/BeamWorkerStatusGrpcServiceTest.java @@ -39,10 +39,10 @@ import org.apache.beam.runners.fnexecution.GrpcContextHeaderAccessorProvider; import org.apache.beam.runners.fnexecution.GrpcFnServer; import org.apache.beam.runners.fnexecution.InProcessServerFactory; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.testing.GrpcCleanupRule; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.testing.GrpcCleanupRule; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Sets; import org.junit.After; import org.junit.Before; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/status/WorkerStatusClientTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/status/WorkerStatusClientTest.java index 5fa143e6856ec..705f209593f15 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/status/WorkerStatusClientTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/status/WorkerStatusClientTest.java @@ -26,7 +26,7 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi; import org.apache.beam.model.fnexecution.v1.BeamFnApi.WorkerStatusRequest; import org.apache.beam.model.fnexecution.v1.BeamFnApi.WorkerStatusResponse; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/wire/ByteStringCoderTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/wire/ByteStringCoderTest.java index 458351c6e3b08..5a831c2047a3a 100644 --- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/wire/ByteStringCoderTest.java +++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/wire/ByteStringCoderTest.java @@ -31,7 +31,7 @@ import org.apache.beam.sdk.testing.CoderProperties; import org.apache.beam.sdk.util.CoderUtils; import org.apache.beam.sdk.values.TypeDescriptor; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.junit.Rule; import org.junit.Test; diff --git a/runners/java-job-service/build.gradle b/runners/java-job-service/build.gradle index 0fe6f6651341b..69bc8d9a5a01c 100644 --- a/runners/java-job-service/build.gradle +++ b/runners/java-job-service/build.gradle @@ -36,7 +36,7 @@ dependencies { compile library.java.jackson_databind compile library.java.joda_time compile library.java.commons_compress - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.slf4j_api compile library.java.args4j testCompile library.java.junit diff --git a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/InMemoryJobService.java b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/InMemoryJobService.java index 01dda109e3ac6..8258721e960d2 100644 --- a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/InMemoryJobService.java +++ b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/InMemoryJobService.java @@ -56,11 +56,11 @@ import org.apache.beam.sdk.fn.stream.SynchronizedStreamObserver; import org.apache.beam.sdk.function.ThrowingConsumer; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusRuntimeException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusRuntimeException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Maps; import org.slf4j.Logger; diff --git a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobInvocation.java b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobInvocation.java index 192d009c6caa8..9cf44e302d45c 100644 --- a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobInvocation.java +++ b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobInvocation.java @@ -35,7 +35,7 @@ import org.apache.beam.model.pipeline.v1.RunnerApi.Pipeline; import org.apache.beam.runners.fnexecution.provisioning.JobInfo; import org.apache.beam.sdk.PipelineResult; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.util.Timestamps; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.util.Timestamps; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.FutureCallback; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.Futures; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.ListenableFuture; diff --git a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobInvoker.java b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobInvoker.java index 356c228d73a51..383b5a836765f 100644 --- a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobInvoker.java +++ b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobInvoker.java @@ -22,7 +22,7 @@ import java.util.concurrent.ThreadFactory; import javax.annotation.Nullable; import org.apache.beam.model.pipeline.v1.RunnerApi; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.ListeningExecutorService; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.MoreExecutors; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobPreparation.java b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobPreparation.java index 9aa9895e4dab9..a9066e1f7384f 100644 --- a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobPreparation.java +++ b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/JobPreparation.java @@ -19,7 +19,7 @@ import com.google.auto.value.AutoValue; import org.apache.beam.model.pipeline.v1.RunnerApi.Pipeline; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; /** A job that has been prepared, but not invoked. */ @AutoValue diff --git a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarCreator.java b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarCreator.java index f8f92d54377a9..07103ee439a2c 100644 --- a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarCreator.java +++ b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarCreator.java @@ -46,8 +46,8 @@ import org.apache.beam.sdk.io.ClassLoaderFileSystem; import org.apache.beam.sdk.metrics.MetricResults; import org.apache.beam.sdk.options.PortablePipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.MessageOrBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.util.JsonFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.MessageOrBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.util.JsonFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.ByteStreams; diff --git a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarUtils.java b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarUtils.java index d460ef7678a18..dc6b6760187a1 100644 --- a/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarUtils.java +++ b/runners/java-job-service/src/main/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarUtils.java @@ -27,9 +27,9 @@ import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import org.apache.beam.model.pipeline.v1.RunnerApi.Pipeline; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Message.Builder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.util.JsonFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Message.Builder; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.util.JsonFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.ByteStreams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/InMemoryJobServiceTest.java b/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/InMemoryJobServiceTest.java index 1e51721321403..f34deb56f03c8 100644 --- a/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/InMemoryJobServiceTest.java +++ b/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/InMemoryJobServiceTest.java @@ -37,9 +37,9 @@ import org.apache.beam.model.pipeline.v1.RunnerApi; import org.apache.beam.runners.fnexecution.GrpcFnServer; import org.apache.beam.runners.fnexecution.artifact.ArtifactStagingService; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.junit.Before; import org.junit.Test; diff --git a/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/JobInvocationTest.java b/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/JobInvocationTest.java index ae0a2479f18e8..165ed30d1257f 100644 --- a/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/JobInvocationTest.java +++ b/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/JobInvocationTest.java @@ -33,7 +33,7 @@ import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.PipelineResult; import org.apache.beam.sdk.metrics.MetricResults; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.ListeningExecutorService; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.MoreExecutors; import org.joda.time.Duration; diff --git a/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarCreatorTest.java b/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarCreatorTest.java index 8ab11b856f919..9c600db652fce 100644 --- a/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarCreatorTest.java +++ b/runners/java-job-service/src/test/java/org/apache/beam/runners/jobsubmission/PortablePipelineJarCreatorTest.java @@ -41,7 +41,7 @@ import java.util.jar.Manifest; import org.apache.beam.model.pipeline.v1.RunnerApi; import org.apache.beam.runners.fnexecution.artifact.ArtifactRetrievalService; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.junit.Before; import org.junit.Test; diff --git a/runners/portability/java/build.gradle b/runners/portability/java/build.gradle index bce540489463b..23a5f96cd62e7 100644 --- a/runners/portability/java/build.gradle +++ b/runners/portability/java/build.gradle @@ -35,7 +35,7 @@ dependencies { compile project(":runners:java-fn-execution") compile project(":runners:java-job-service") compile project(path: ":sdks:java:harness", configuration: "shadow") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.slf4j_api compile library.java.joda_time compile "org.hamcrest:hamcrest:2.1" diff --git a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/ExternalWorkerService.java b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/ExternalWorkerService.java index c4311a385e558..a32d5c6b19ee4 100644 --- a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/ExternalWorkerService.java +++ b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/ExternalWorkerService.java @@ -25,7 +25,7 @@ import org.apache.beam.runners.fnexecution.GrpcFnServer; import org.apache.beam.runners.fnexecution.ServerFactory; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/JobServicePipelineResult.java b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/JobServicePipelineResult.java index 35988acf3903c..ef8893952ab9f 100644 --- a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/JobServicePipelineResult.java +++ b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/JobServicePipelineResult.java @@ -33,7 +33,7 @@ import org.apache.beam.model.jobmanagement.v1.JobServiceGrpc.JobServiceBlockingStub; import org.apache.beam.sdk.PipelineResult; import org.apache.beam.sdk.metrics.MetricResults; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.checkerframework.checker.nullness.qual.Nullable; import org.joda.time.Duration; import org.slf4j.Logger; diff --git a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/PortableRunner.java b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/PortableRunner.java index 0b3df505a4850..0bed22dd22396 100644 --- a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/PortableRunner.java +++ b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/PortableRunner.java @@ -48,8 +48,8 @@ import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsValidator; import org.apache.beam.sdk.options.PortablePipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.slf4j.Logger; diff --git a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/testing/TestJobService.java b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/testing/TestJobService.java index 53578b7558500..66198b04141e7 100644 --- a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/testing/TestJobService.java +++ b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/testing/TestJobService.java @@ -27,7 +27,7 @@ import org.apache.beam.model.jobmanagement.v1.JobApi.RunJobResponse; import org.apache.beam.model.jobmanagement.v1.JobServiceGrpc.JobServiceImplBase; import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * A JobService for tests. diff --git a/runners/portability/java/src/test/java/org/apache/beam/runners/portability/PortableRunnerTest.java b/runners/portability/java/src/test/java/org/apache/beam/runners/portability/PortableRunnerTest.java index 9bd1ec6653edc..652ec3be73f6f 100644 --- a/runners/portability/java/src/test/java/org/apache/beam/runners/portability/PortableRunnerTest.java +++ b/runners/portability/java/src/test/java/org/apache/beam/runners/portability/PortableRunnerTest.java @@ -45,10 +45,10 @@ import org.apache.beam.sdk.options.PortablePipelineOptions; import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.transforms.windowing.GlobalWindow; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.testing.GrpcCleanupRule; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.testing.GrpcCleanupRule; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.ByteStreams; import org.joda.time.Duration; diff --git a/runners/samza/build.gradle b/runners/samza/build.gradle index c4b7cf7492e59..fe99792da5393 100644 --- a/runners/samza/build.gradle +++ b/runners/samza/build.gradle @@ -64,7 +64,7 @@ dependencies { compile "org.apache.samza:samza-kv-inmemory_2.11:$samza_version" compile "org.apache.samza:samza-yarn_2.11:$samza_version" runtimeOnly "org.apache.kafka:kafka-clients:2.0.1" - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile project(path: ":model:job-management", configuration: "shadow") compile project(path: ":model:pipeline", configuration: "shadow") compile project(":sdks:java:fn-execution") diff --git a/runners/samza/src/main/java/org/apache/beam/runners/samza/SamzaJobServerDriver.java b/runners/samza/src/main/java/org/apache/beam/runners/samza/SamzaJobServerDriver.java index 222d829c32efb..9b5b11411bca6 100644 --- a/runners/samza/src/main/java/org/apache/beam/runners/samza/SamzaJobServerDriver.java +++ b/runners/samza/src/main/java/org/apache/beam/runners/samza/SamzaJobServerDriver.java @@ -34,7 +34,7 @@ import org.apache.beam.sdk.expansion.service.ExpansionServer; import org.apache.beam.sdk.expansion.service.ExpansionService; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.ListeningExecutorService; import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; diff --git a/runners/samza/src/main/java/org/apache/beam/runners/samza/translation/WindowAssignTranslator.java b/runners/samza/src/main/java/org/apache/beam/runners/samza/translation/WindowAssignTranslator.java index a8790c54fd8ed..54000412c0be6 100644 --- a/runners/samza/src/main/java/org/apache/beam/runners/samza/translation/WindowAssignTranslator.java +++ b/runners/samza/src/main/java/org/apache/beam/runners/samza/translation/WindowAssignTranslator.java @@ -28,7 +28,7 @@ import org.apache.beam.sdk.transforms.windowing.Window; import org.apache.beam.sdk.transforms.windowing.WindowFn; import org.apache.beam.sdk.values.PCollection; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.samza.operators.MessageStream; /** diff --git a/runners/samza/src/main/java/org/apache/beam/runners/samza/util/SamzaPipelineTranslatorUtils.java b/runners/samza/src/main/java/org/apache/beam/runners/samza/util/SamzaPipelineTranslatorUtils.java index 08117fc084e42..814aeafba72de 100644 --- a/runners/samza/src/main/java/org/apache/beam/runners/samza/util/SamzaPipelineTranslatorUtils.java +++ b/runners/samza/src/main/java/org/apache/beam/runners/samza/util/SamzaPipelineTranslatorUtils.java @@ -28,7 +28,7 @@ import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; /** Utilities for pipeline translation. */ diff --git a/runners/spark/spark_runner.gradle b/runners/spark/spark_runner.gradle index b411307ab6b28..fdc60ead90269 100644 --- a/runners/spark/spark_runner.gradle +++ b/runners/spark/spark_runner.gradle @@ -160,7 +160,7 @@ dependencies { compile project(path: ":model:fn-execution", configuration: "shadow") compile project(path: ":model:job-management", configuration: "shadow") compile project(":sdks:java:fn-execution") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.vendored_guava_26_0_jre provided "org.apache.spark:spark-core_$spark_scala_version:$spark_version" provided "org.apache.spark:spark-network-common_$spark_scala_version:$spark_version" diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkJobInvoker.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkJobInvoker.java index dd57a6cdaa2d1..cb5bee3223a63 100644 --- a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkJobInvoker.java +++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkJobInvoker.java @@ -26,7 +26,7 @@ import org.apache.beam.runners.jobsubmission.PortablePipelineJarCreator; import org.apache.beam.runners.jobsubmission.PortablePipelineRunner; import org.apache.beam.sdk.options.PortablePipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.ListeningExecutorService; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java index 5547f325231fc..16966c1be1317 100644 --- a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java +++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java @@ -55,7 +55,7 @@ import org.apache.beam.sdk.metrics.MetricsEnvironment; import org.apache.beam.sdk.metrics.MetricsOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.scheduler.EventLoggingListener; diff --git a/runners/twister2/build.gradle b/runners/twister2/build.gradle index fc2bf93cd53a8..f9621277395fc 100644 --- a/runners/twister2/build.gradle +++ b/runners/twister2/build.gradle @@ -41,7 +41,7 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.jackson_annotations compile library.java.joda_time - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.slf4j_api compile "org.mortbay.jetty:jetty-util:6.1.26" compile "org.twister2:comms-api-java:$twister2_version" diff --git a/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/AssignWindowsFunction.java b/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/AssignWindowsFunction.java index 9655a87dd5bdd..e974a121df960 100644 --- a/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/AssignWindowsFunction.java +++ b/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/AssignWindowsFunction.java @@ -35,7 +35,7 @@ import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.transforms.windowing.WindowFn; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; /** Assign Windows function. */ @SuppressWarnings({ diff --git a/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/DoFnFunction.java b/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/DoFnFunction.java index 9488399a7f6b4..5d979877b9227 100644 --- a/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/DoFnFunction.java +++ b/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/DoFnFunction.java @@ -59,7 +59,7 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; /** DoFn function. */ @SuppressWarnings({ diff --git a/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/GroupByWindowFunction.java b/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/GroupByWindowFunction.java index 5b677f440a07b..e0228db3a314c 100644 --- a/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/GroupByWindowFunction.java +++ b/runners/twister2/src/main/java/org/apache/beam/runners/twister2/translators/functions/GroupByWindowFunction.java @@ -52,7 +52,7 @@ import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.joda.time.Instant; /** GroupBy window function. */ diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle index 773d538bb7115..ba80f6ba963e1 100644 --- a/sdks/java/core/build.gradle +++ b/sdks/java/core/build.gradle @@ -76,7 +76,7 @@ dependencies { shadow project(path: ":model:pipeline", configuration: "shadow") shadow project(path: ":model:job-management", configuration: "shadow") shadow library.java.vendored_bytebuddy_1_10_8 - shadow library.java.vendored_grpc_1_26_0 + shadow library.java.vendored_grpc_1_36_0 shadow library.java.vendored_guava_26_0_jre compile library.java.antlr_runtime compile library.java.commons_compress diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextSource.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextSource.java index fbe6389152e64..76fe11ecf87c5 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextSource.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextSource.java @@ -30,7 +30,7 @@ import org.apache.beam.sdk.io.fs.MatchResult; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.ValueProvider; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/range/ByteKey.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/range/ByteKey.java index 0cf62dcce1fc8..eef8252ddd423 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/range/ByteKey.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/range/ByteKey.java @@ -22,8 +22,8 @@ import java.io.Serializable; import java.nio.ByteBuffer; import javax.annotation.Nonnull; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString.ByteIterator; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString.ByteIterator; import org.checkerframework.checker.nullness.qual.Nullable; /** diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/SchemaTranslation.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/SchemaTranslation.java index 9ed2ce4fc144a..ca959a70a46f3 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/SchemaTranslation.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/SchemaTranslation.java @@ -39,7 +39,7 @@ import org.apache.beam.sdk.schemas.logicaltypes.MicrosInstant; import org.apache.beam.sdk.util.SerializableUtils; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/sdks/java/expansion-service/build.gradle b/sdks/java/expansion-service/build.gradle index 7681cd3b84192..a6263036a2bad 100644 --- a/sdks/java/expansion-service/build.gradle +++ b/sdks/java/expansion-service/build.gradle @@ -38,7 +38,7 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile project(path: ":runners:core-construction-java") compile project(path: ":runners:java-fn-execution") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.vendored_guava_26_0_jre compile library.java.slf4j_api runtimeOnly library.java.slf4j_jdk14 diff --git a/sdks/java/expansion-service/src/main/java/org/apache/beam/sdk/expansion/service/ExpansionServer.java b/sdks/java/expansion-service/src/main/java/org/apache/beam/sdk/expansion/service/ExpansionServer.java index 373e219b3121a..f7926dc03900c 100644 --- a/sdks/java/expansion-service/src/main/java/org/apache/beam/sdk/expansion/service/ExpansionServer.java +++ b/sdks/java/expansion-service/src/main/java/org/apache/beam/sdk/expansion/service/ExpansionServer.java @@ -21,8 +21,8 @@ import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; import org.apache.beam.runners.fnexecution.artifact.ArtifactRetrievalService; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.netty.NettyServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.netty.NettyServerBuilder; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; /** A {@link Server gRPC Server} for an ExpansionService. */ diff --git a/sdks/java/expansion-service/src/main/java/org/apache/beam/sdk/expansion/service/ExpansionService.java b/sdks/java/expansion-service/src/main/java/org/apache/beam/sdk/expansion/service/ExpansionService.java index 71c99e472581d..72e73848b389a 100644 --- a/sdks/java/expansion-service/src/main/java/org/apache/beam/sdk/expansion/service/ExpansionService.java +++ b/sdks/java/expansion-service/src/main/java/org/apache/beam/sdk/expansion/service/ExpansionService.java @@ -63,9 +63,9 @@ import org.apache.beam.sdk.values.POutput; import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.CaseFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Converter; diff --git a/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java b/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java index 860739d744218..5e2a243dbd6ff 100644 --- a/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java +++ b/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java @@ -54,7 +54,7 @@ import org.apache.beam.sdk.transforms.Count; import org.apache.beam.sdk.transforms.Impulse; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Charsets; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExternalTest.java b/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExternalTest.java index eb0c1f82fbda5..a18c51502224e 100644 --- a/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExternalTest.java +++ b/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExternalTest.java @@ -42,8 +42,8 @@ import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TupleTagList; import org.apache.beam.sdk.values.TypeDescriptors; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerBuilder; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.RequiresNonNull; diff --git a/sdks/java/extensions/schemaio-expansion-service/build.gradle b/sdks/java/extensions/schemaio-expansion-service/build.gradle index 9c8ff82548b6f..7691d479c201f 100644 --- a/sdks/java/extensions/schemaio-expansion-service/build.gradle +++ b/sdks/java/extensions/schemaio-expansion-service/build.gradle @@ -38,7 +38,7 @@ dependencies { permitUnusedDeclared library.java.postgres // BEAM-11761 compile project(path: ":model:pipeline", configuration: "shadow") compile project(path: ":sdks:java:core", configuration: "shadow") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.vendored_guava_26_0_jre testCompile library.java.junit testCompile library.java.mockito_core diff --git a/sdks/java/extensions/schemaio-expansion-service/src/main/java/org/apache/beam/sdk/extensions/schemaio/expansion/ExternalSchemaIOTransformRegistrar.java b/sdks/java/extensions/schemaio-expansion-service/src/main/java/org/apache/beam/sdk/extensions/schemaio/expansion/ExternalSchemaIOTransformRegistrar.java index c120164891a15..4f3ab302d38a6 100644 --- a/sdks/java/extensions/schemaio-expansion-service/src/main/java/org/apache/beam/sdk/extensions/schemaio/expansion/ExternalSchemaIOTransformRegistrar.java +++ b/sdks/java/extensions/schemaio-expansion-service/src/main/java/org/apache/beam/sdk/extensions/schemaio/expansion/ExternalSchemaIOTransformRegistrar.java @@ -37,7 +37,7 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PDone; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/sdks/java/fn-execution/build.gradle b/sdks/java/fn-execution/build.gradle index ae98dee4c1586..24a81a86c0e6a 100644 --- a/sdks/java/fn-execution/build.gradle +++ b/sdks/java/fn-execution/build.gradle @@ -29,7 +29,7 @@ dependencies { compile project(path: ":model:pipeline", configuration: "shadow") compile project(path: ":model:fn-execution", configuration: "shadow") compile project(path: ":sdks:java:core", configuration: "shadow") - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.vendored_guava_26_0_jre compile library.java.slf4j_api compile library.java.joda_time diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/channel/ManagedChannelFactory.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/channel/ManagedChannelFactory.java index c6180a3da30f6..5fc604f6ba66b 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/channel/ManagedChannelFactory.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/channel/ManagedChannelFactory.java @@ -20,14 +20,14 @@ import java.net.SocketAddress; import java.util.List; import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ClientInterceptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.netty.NettyChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.EpollDomainSocketChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.EpollEventLoopGroup; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.EpollSocketChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.unix.DomainSocketAddress; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ClientInterceptor; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.netty.NettyChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.EpollDomainSocketChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.EpollEventLoopGroup; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.EpollSocketChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.unix.DomainSocketAddress; /** A Factory which creates an underlying {@link ManagedChannel} implementation. */ public abstract class ManagedChannelFactory { @@ -36,7 +36,7 @@ public static ManagedChannelFactory createDefault() { } public static ManagedChannelFactory createEpoll() { - org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.Epoll.ensureAvailability(); + org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.Epoll.ensureAvailability(); return new Epoll(); } diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/channel/SocketAddressFactory.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/channel/SocketAddressFactory.java index b7d9d7674dde3..06b2a37dc6038 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/channel/SocketAddressFactory.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/channel/SocketAddressFactory.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.net.SocketAddress; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.unix.DomainSocketAddress; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.unix.DomainSocketAddress; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.net.HostAndPort; /** Creates a {@link SocketAddress} based upon a supplied string. */ diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataBufferingOutboundObserver.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataBufferingOutboundObserver.java index e741c7e9c7933..7e3b615a2be4e 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataBufferingOutboundObserver.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataBufferingOutboundObserver.java @@ -23,7 +23,7 @@ import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.options.ExperimentalOptions; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; /** diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataGrpcMultiplexer.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataGrpcMultiplexer.java index 29e1b3b775f01..e6b3facce60fe 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataGrpcMultiplexer.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataGrpcMultiplexer.java @@ -27,9 +27,9 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.Elements; import org.apache.beam.model.pipeline.v1.Endpoints; import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataInboundObserver.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataInboundObserver.java index ed1f178d37b5f..d2f64de925c4f 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataInboundObserver.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataInboundObserver.java @@ -18,7 +18,7 @@ package org.apache.beam.sdk.fn.data; import java.util.function.BiConsumer; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataSizeBasedBufferingOutboundObserver.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataSizeBasedBufferingOutboundObserver.java index 420772789b882..d3af45290df4b 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataSizeBasedBufferingOutboundObserver.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataSizeBasedBufferingOutboundObserver.java @@ -20,8 +20,8 @@ import java.io.IOException; import org.apache.beam.model.fnexecution.v1.BeamFnApi; import org.apache.beam.sdk.coders.Coder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataTimeBasedBufferingOutboundObserver.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataTimeBasedBufferingOutboundObserver.java index 7da539b85fcf1..e45e5d6da3bf6 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataTimeBasedBufferingOutboundObserver.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/BeamFnDataTimeBasedBufferingOutboundObserver.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; import org.apache.beam.model.fnexecution.v1.BeamFnApi; import org.apache.beam.sdk.coders.Coder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/DecodingFnDataReceiver.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/DecodingFnDataReceiver.java index 6723d8dd6aa64..fd2f4e41e1274 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/DecodingFnDataReceiver.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/DecodingFnDataReceiver.java @@ -19,7 +19,7 @@ import java.io.InputStream; import org.apache.beam.sdk.coders.Coder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; /** A receiver of encoded data, decoding it and passing it onto a downstream consumer. */ public class DecodingFnDataReceiver implements FnDataReceiver { diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortRead.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortRead.java index 1e205b19cdef4..79c48a76f90ab 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortRead.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortRead.java @@ -23,7 +23,7 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.RemoteGrpcPort; import org.apache.beam.model.pipeline.v1.RunnerApi.FunctionSpec; import org.apache.beam.model.pipeline.v1.RunnerApi.PTransform; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; /** diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortWrite.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortWrite.java index 2b736599ec0fe..79db97f48ecf5 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortWrite.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortWrite.java @@ -24,7 +24,7 @@ import org.apache.beam.model.pipeline.v1.RunnerApi.FunctionSpec; import org.apache.beam.model.pipeline.v1.RunnerApi.PCollection; import org.apache.beam.model.pipeline.v1.RunnerApi.PTransform; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; /** diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/BufferingStreamObserver.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/BufferingStreamObserver.java index 02abd388f7fb8..4ec5f9e71921f 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/BufferingStreamObserver.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/BufferingStreamObserver.java @@ -27,8 +27,8 @@ import java.util.concurrent.Phaser; import java.util.concurrent.TimeUnit; import javax.annotation.concurrent.ThreadSafe; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; /** diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/DataStreams.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/DataStreams.java index f18921174fe0d..e105c2b473f1f 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/DataStreams.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/DataStreams.java @@ -27,7 +27,7 @@ import java.util.NoSuchElementException; import java.util.concurrent.BlockingQueue; import org.apache.beam.sdk.coders.Coder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.ByteStreams; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.CountingInputStream; diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/DirectStreamObserver.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/DirectStreamObserver.java index f60ea4b1ff316..709953290e29f 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/DirectStreamObserver.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/DirectStreamObserver.java @@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javax.annotation.concurrent.ThreadSafe; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/ForwardingClientResponseObserver.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/ForwardingClientResponseObserver.java index 016cb1109eec0..43570188d0546 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/ForwardingClientResponseObserver.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/ForwardingClientResponseObserver.java @@ -17,9 +17,9 @@ */ package org.apache.beam.sdk.fn.stream; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ClientCallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ClientResponseObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ClientCallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ClientResponseObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * A {@link ClientResponseObserver} which delegates all {@link StreamObserver} calls. diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/OutboundObserverFactory.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/OutboundObserverFactory.java index 6693fee943ece..0467cfd8b7eeb 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/OutboundObserverFactory.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/OutboundObserverFactory.java @@ -18,8 +18,8 @@ package org.apache.beam.sdk.fn.stream; import java.util.concurrent.ExecutorService; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * Creates factories which determine an underlying {@link StreamObserver} implementation to use in diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/SynchronizedStreamObserver.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/SynchronizedStreamObserver.java index 31e9af2663bc1..d6a7a1e62e9e3 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/SynchronizedStreamObserver.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/stream/SynchronizedStreamObserver.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.fn.stream; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * A {@link StreamObserver} which provides synchronous access access to an underlying {@link diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/test/InProcessManagedChannelFactory.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/test/InProcessManagedChannelFactory.java index aad1fd1aa2e54..406561f361f21 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/test/InProcessManagedChannelFactory.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/test/InProcessManagedChannelFactory.java @@ -19,8 +19,8 @@ import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; import org.apache.beam.sdk.fn.channel.ManagedChannelFactory; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; /** * A {@link ManagedChannelFactory} that uses in-process channels. diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/test/TestStreams.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/test/TestStreams.java index cd8b9773d3a08..9279a12f99e73 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/test/TestStreams.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/test/TestStreams.java @@ -19,8 +19,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** Utility methods which enable testing of {@link StreamObserver}s. */ public class TestStreams { diff --git a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/windowing/EncodedBoundedWindow.java b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/windowing/EncodedBoundedWindow.java index 3e9b21c553415..5a7da5ffd4e2b 100644 --- a/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/windowing/EncodedBoundedWindow.java +++ b/sdks/java/fn-execution/src/main/java/org/apache/beam/sdk/fn/windowing/EncodedBoundedWindow.java @@ -25,7 +25,7 @@ import org.apache.beam.sdk.coders.CoderException; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.util.VarInt; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.ByteStreams; import org.joda.time.Instant; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/channel/ManagedChannelFactoryTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/channel/ManagedChannelFactoryTest.java index fc0c8138f8b0c..5bac643cd4800 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/channel/ManagedChannelFactoryTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/channel/ManagedChannelFactoryTest.java @@ -21,7 +21,7 @@ import static org.junit.Assume.assumeTrue; import org.apache.beam.model.pipeline.v1.Endpoints; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -45,7 +45,7 @@ public void testDefaultChannel() { @Test public void testEpollHostPortChannel() { - assumeTrue(org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.Epoll.isAvailable()); + assumeTrue(org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.Epoll.isAvailable()); Endpoints.ApiServiceDescriptor apiServiceDescriptor = Endpoints.ApiServiceDescriptor.newBuilder().setUrl("localhost:123").build(); ManagedChannel channel = @@ -56,7 +56,7 @@ public void testEpollHostPortChannel() { @Test public void testEpollDomainSocketChannel() throws Exception { - assumeTrue(org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.epoll.Epoll.isAvailable()); + assumeTrue(org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.epoll.Epoll.isAvailable()); Endpoints.ApiServiceDescriptor apiServiceDescriptor = Endpoints.ApiServiceDescriptor.newBuilder() .setUrl("unix://" + tmpFolder.newFile().getAbsolutePath()) diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/channel/SocketAddressFactoryTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/channel/SocketAddressFactoryTest.java index 0922e2b3dcf5c..b464dcfeb41d1 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/channel/SocketAddressFactoryTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/channel/SocketAddressFactoryTest.java @@ -23,7 +23,7 @@ import java.io.File; import java.net.InetSocketAddress; import java.net.SocketAddress; -import org.apache.beam.vendor.grpc.v1p26p0.io.netty.channel.unix.DomainSocketAddress; +import org.apache.beam.vendor.grpc.v1p36p0.io.netty.channel.unix.DomainSocketAddress; import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataGrpcMultiplexerTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataGrpcMultiplexerTest.java index 303372f030296..e14d44858a30a 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataGrpcMultiplexerTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataGrpcMultiplexerTest.java @@ -32,7 +32,7 @@ import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; import org.apache.beam.sdk.fn.test.TestStreams; import org.apache.beam.sdk.values.KV; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.Uninterruptibles; import org.junit.Test; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataSizeBasedBufferingOutboundObserverTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataSizeBasedBufferingOutboundObserverTest.java index 0ad35e76f8abc..e4b9ba978ace4 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataSizeBasedBufferingOutboundObserverTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataSizeBasedBufferingOutboundObserverTest.java @@ -38,7 +38,7 @@ import org.apache.beam.sdk.options.ExperimentalOptions; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataTimeBasedBufferingOutboundObserverTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataTimeBasedBufferingOutboundObserverTest.java index 48ee7532db4ca..89a1e86c18181 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataTimeBasedBufferingOutboundObserverTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/BeamFnDataTimeBasedBufferingOutboundObserverTest.java @@ -36,7 +36,7 @@ import org.apache.beam.sdk.options.ExperimentalOptions; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortReadTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortReadTest.java index a5f2342cf764b..9cf32e29bd9ba 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortReadTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortReadTest.java @@ -24,7 +24,7 @@ import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; import org.apache.beam.model.pipeline.v1.Endpoints.AuthenticationSpec; import org.apache.beam.model.pipeline.v1.RunnerApi.PTransform; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortWriteTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortWriteTest.java index 6ac755dba7f31..e3168f080635c 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortWriteTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/data/RemoteGrpcPortWriteTest.java @@ -24,7 +24,7 @@ import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; import org.apache.beam.model.pipeline.v1.Endpoints.AuthenticationSpec; import org.apache.beam.model.pipeline.v1.RunnerApi.PTransform; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/DataStreamsTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/DataStreamsTest.java index a22669bfbfd0f..dd79c90765010 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/DataStreamsTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/DataStreamsTest.java @@ -41,7 +41,7 @@ import org.apache.beam.sdk.fn.stream.DataStreams.DataStreamDecoder; import org.apache.beam.sdk.fn.stream.DataStreams.ElementDelimitedOutputStream; import org.apache.beam.sdk.transforms.windowing.GlobalWindow; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterators; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.ByteStreams; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.CountingOutputStream; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/ForwardingClientResponseObserverTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/ForwardingClientResponseObserverTest.java index 5e0e4b5afbb0e..5ce6e553084ab 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/ForwardingClientResponseObserverTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/ForwardingClientResponseObserverTest.java @@ -21,9 +21,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ClientCallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ClientResponseObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ClientCallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ClientResponseObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/OutboundObserverFactoryTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/OutboundObserverFactoryTest.java index a436bdf9eb67a..0bcb624efd472 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/OutboundObserverFactoryTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/stream/OutboundObserverFactoryTest.java @@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals; import java.util.concurrent.Executors; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/windowing/EncodedBoundedWindowTest.java b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/windowing/EncodedBoundedWindowTest.java index ecf5bc114324d..1f3b5d5adae1e 100644 --- a/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/windowing/EncodedBoundedWindowTest.java +++ b/sdks/java/fn-execution/src/test/java/org/apache/beam/sdk/fn/windowing/EncodedBoundedWindowTest.java @@ -19,7 +19,7 @@ import org.apache.beam.sdk.fn.windowing.EncodedBoundedWindow.Coder; import org.apache.beam.sdk.testing.CoderProperties; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/sdks/java/harness/build.gradle b/sdks/java/harness/build.gradle index 093504aea049f..50ea8c150497c 100644 --- a/sdks/java/harness/build.gradle +++ b/sdks/java/harness/build.gradle @@ -66,7 +66,7 @@ dependencies { shadowTest library.java.powermock_mockito compile library.java.joda_time compile library.java.slf4j_api - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 testCompile library.java.junit testCompile library.java.mockito_core testCompile project(path: ":sdks:java:core", configuration: "shadowTest") diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnApiDoFnRunner.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnApiDoFnRunner.java index fb3259494c674..b660770802675 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnApiDoFnRunner.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnApiDoFnRunner.java @@ -111,8 +111,8 @@ import org.apache.beam.sdk.values.Row; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.WindowingStrategy; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.util.Durations; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.util.Durations; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableListMultimap; @@ -1503,11 +1503,11 @@ static HandlesSplits.SplitResult constructSplitResult .setElement(bytesOut.toByteString()); // We don't want to change the output watermarks or set the checkpoint resume time since // that applies to the current window. - Map + Map outputWatermarkMapForUnprocessedWindows = new HashMap<>(); if (!initialWatermark.equals(GlobalWindow.TIMESTAMP_MIN_VALUE)) { - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp outputWatermark = - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp outputWatermark = + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp.newBuilder() .setSeconds(initialWatermark.getMillis() / 1000) .setNanos((int) (initialWatermark.getMillis() % 1000) * 1000000) .build(); @@ -1547,11 +1547,11 @@ static HandlesSplits.SplitResult constructSplitResult .setTransformId(pTransformId) .setInputId(mainInputId) .setElement(residualBytes.toByteString()); - Map + Map outputWatermarkMap = new HashMap<>(); if (!watermarkAndState.getKey().equals(GlobalWindow.TIMESTAMP_MIN_VALUE)) { - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp outputWatermark = - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp outputWatermark = + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp.newBuilder() .setSeconds(watermarkAndState.getKey().getMillis() / 1000) .setNanos((int) (watermarkAndState.getKey().getMillis() % 1000) * 1000000) .build(); diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java index 3a7b741b5b89c..6b246dd070634 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java @@ -47,8 +47,8 @@ import org.apache.beam.sdk.io.FileSystems; import org.apache.beam.sdk.options.ExperimentalOptions; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.cache.CacheBuilder; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.cache.CacheLoader; diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/AddHarnessIdInterceptor.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/AddHarnessIdInterceptor.java index f94971648d2c4..3d1117c6369a0 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/AddHarnessIdInterceptor.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/AddHarnessIdInterceptor.java @@ -19,10 +19,10 @@ import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ClientInterceptor; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Metadata; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Metadata.Key; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.MetadataUtils; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ClientInterceptor; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Metadata; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Metadata.Key; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.MetadataUtils; /** A {@link ClientInterceptor} that attaches a provided SDK Harness ID to outgoing messages. */ public class AddHarnessIdInterceptor { diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/BeamFnControlClient.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/BeamFnControlClient.java index bb5eeee9458b7..66eeb83cec4ff 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/BeamFnControlClient.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/BeamFnControlClient.java @@ -32,8 +32,8 @@ import org.apache.beam.sdk.fn.channel.ManagedChannelFactory; import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; import org.apache.beam.sdk.function.ThrowingFunction; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.Uninterruptibles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/ProcessBundleHandler.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/ProcessBundleHandler.java index 2c20cc29aca95..c68c4f68ed701 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/ProcessBundleHandler.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/ProcessBundleHandler.java @@ -72,8 +72,8 @@ import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.transforms.DoFn.BundleFinalizer; import org.apache.beam.sdk.util.common.ReflectHelpers; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Message; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Message; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.cache.CacheBuilder; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.cache.CacheLoader; diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/BeamFnDataClient.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/BeamFnDataClient.java index 1d0ad35eed297..af5eb61935eed 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/BeamFnDataClient.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/BeamFnDataClient.java @@ -25,7 +25,7 @@ import org.apache.beam.sdk.fn.data.FnDataReceiver; import org.apache.beam.sdk.fn.data.InboundDataClient; import org.apache.beam.sdk.fn.data.LogicalEndpoint; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; /** * The {@link BeamFnDataClient} is able to forward inbound elements to a {@link FnDataReceiver} and diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClient.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClient.java index f9242613c6895..e611e46980d78 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClient.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClient.java @@ -33,8 +33,8 @@ import org.apache.beam.sdk.fn.data.LogicalEndpoint; import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/QueueingBeamFnDataClient.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/QueueingBeamFnDataClient.java index 634ea2a6033b6..ebc5233ba5c14 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/QueueingBeamFnDataClient.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/data/QueueingBeamFnDataClient.java @@ -28,7 +28,7 @@ import org.apache.beam.sdk.fn.data.FnDataReceiver; import org.apache.beam.sdk.fn.data.InboundDataClient; import org.apache.beam.sdk.fn.data.LogicalEndpoint; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClient.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClient.java index 8d33ff236fe8a..71d3b8e79fc20 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClient.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClient.java @@ -50,12 +50,12 @@ import org.apache.beam.sdk.extensions.gcp.options.GcsOptions; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.SdkHarnessOptions; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ClientCallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.ClientResponseObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ClientCallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.ClientResponseObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.MoreObjects; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/BagUserState.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/BagUserState.java index 3c96e42a51784..df98308ff5a44 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/BagUserState.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/BagUserState.java @@ -27,7 +27,7 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateRequest; import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.fn.stream.DataStreams; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; /** diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/BeamFnStateGrpcClientCache.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/BeamFnStateGrpcClientCache.java index 5ae859f7b2c83..633db1d99b6c9 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/BeamFnStateGrpcClientCache.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/BeamFnStateGrpcClientCache.java @@ -30,8 +30,8 @@ import org.apache.beam.model.pipeline.v1.Endpoints.ApiServiceDescriptor; import org.apache.beam.sdk.fn.IdGenerator; import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/FnApiStateAccessor.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/FnApiStateAccessor.java index cff5bf2b92671..4faf9892df361 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/FnApiStateAccessor.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/FnApiStateAccessor.java @@ -53,7 +53,7 @@ import org.apache.beam.sdk.util.CombineFnUtil; import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Maps; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/IterableSideInput.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/IterableSideInput.java index c4ee0b47973f8..f6ff8ee31de87 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/IterableSideInput.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/IterableSideInput.java @@ -21,7 +21,7 @@ import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.fn.stream.DataStreams; import org.apache.beam.sdk.transforms.Materializations.IterableView; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; /** * An implementation of a iterable side input that utilizes the Beam Fn State API to fetch values. diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/MultimapSideInput.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/MultimapSideInput.java index 0f5bd4f584a72..66a52b86e9c19 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/MultimapSideInput.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/MultimapSideInput.java @@ -22,7 +22,7 @@ import org.apache.beam.sdk.coders.Coder; import org.apache.beam.sdk.fn.stream.DataStreams; import org.apache.beam.sdk.transforms.Materializations.MultimapView; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; /** * An implementation of a multimap side input that utilizes the Beam Fn State API to fetch values. diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/StateBackedIterable.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/StateBackedIterable.java index 8df1cfa6592cb..a052b461bcd57 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/StateBackedIterable.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/StateBackedIterable.java @@ -37,7 +37,7 @@ import org.apache.beam.sdk.fn.stream.DataStreams; import org.apache.beam.sdk.util.BufferedElementCountingOutputStream; import org.apache.beam.sdk.util.VarInt; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/StateFetchingIterators.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/StateFetchingIterators.java index dda5cd6b249bb..0d40370ad5c98 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/StateFetchingIterators.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/state/StateFetchingIterators.java @@ -24,7 +24,7 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateGetRequest; import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateRequest; import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateResponse; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Throwables; /** diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/stream/HarnessStreamObserverFactories.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/stream/HarnessStreamObserverFactories.java index 8707c3be9e670..23346753dad16 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/stream/HarnessStreamObserverFactories.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/stream/HarnessStreamObserverFactories.java @@ -22,7 +22,7 @@ import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; import org.apache.beam.sdk.options.ExperimentalOptions; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; /** * Uses {@link PipelineOptions} to configure which underlying {@link StreamObserver} implementation diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnApiDoFnRunnerTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnApiDoFnRunnerTest.java index c698d6b1541c7..b88490f847994 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnApiDoFnRunnerTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnApiDoFnRunnerTest.java @@ -139,8 +139,8 @@ import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TupleTag; import org.apache.beam.sdk.values.TupleTagList; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.util.Durations; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.util.Durations; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Suppliers; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; @@ -1759,13 +1759,13 @@ public void testProcessElementForSizedElementAndRestriction() throws Exception { assertEquals( ImmutableMap.of( "output", - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp.newBuilder() .setSeconds(expectedOutputWatermark.getMillis() / 1000) .setNanos((int) (expectedOutputWatermark.getMillis() % 1000) * 1000000) .build()), residualRoot.getApplication().getOutputWatermarksMap()); assertEquals( - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Duration.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Duration.newBuilder() .setSeconds(54) .setNanos(321000000) .build(), @@ -1895,7 +1895,7 @@ public void testProcessElementForSizedElementAndRestriction() throws Exception { assertEquals( ImmutableMap.of( "output", - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp.newBuilder() .setSeconds(expectedOutputWatermark.getMillis() / 1000) .setNanos((int) (expectedOutputWatermark.getMillis() % 1000) * 1000000) .build()), @@ -2079,27 +2079,27 @@ public void testProcessElementForWindowedSizedElementAndRestriction() throws Exc residualRoot.getApplication().getInputId()); assertEquals(TEST_TRANSFORM_ID, residualRoot.getApplication().getTransformId()); Instant expectedOutputWatermark = GlobalWindow.TIMESTAMP_MIN_VALUE.plus(7); - Map + Map expectedOutputWatmermarkMap = ImmutableMap.of( "output", - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp.newBuilder() .setSeconds(expectedOutputWatermark.getMillis() / 1000) .setNanos((int) (expectedOutputWatermark.getMillis() % 1000) * 1000000) .build()); Instant initialWatermark = GlobalWindow.TIMESTAMP_MIN_VALUE.plus(1); - Map + Map expectedOutputWatmermarkMapForUnprocessedWindows = ImmutableMap.of( "output", - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp.newBuilder() .setSeconds(initialWatermark.getMillis() / 1000) .setNanos((int) (initialWatermark.getMillis() % 1000) * 1000000) .build()); assertEquals( expectedOutputWatmermarkMap, residualRoot.getApplication().getOutputWatermarksMap()); assertEquals( - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Duration.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Duration.newBuilder() .setSeconds(54) .setNanos(321000000) .build(), @@ -2297,19 +2297,19 @@ public void testProcessElementForWindowedSizedElementAndRestriction() throws Exc residualRootInUnprocessedWindows.getRequestedTimeDelay()); Instant initialWatermark = GlobalWindow.TIMESTAMP_MIN_VALUE.plus(1); Instant expectedOutputWatermark = GlobalWindow.TIMESTAMP_MIN_VALUE.plus(2); - Map + Map expectedOutputWatermarkMapInUnprocessedResiduals = ImmutableMap.of( "output", - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp.newBuilder() .setSeconds(initialWatermark.getMillis() / 1000) .setNanos((int) (initialWatermark.getMillis() % 1000) * 1000000) .build()); - Map + Map expectedOutputWatermarkMap = ImmutableMap.of( "output", - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp.newBuilder() + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp.newBuilder() .setSeconds(expectedOutputWatermark.getMillis() / 1000) .setNanos((int) (expectedOutputWatermark.getMillis() % 1000) * 1000000) .build()); @@ -4777,9 +4777,9 @@ private HandlesSplits.SplitResult getProcessElementSplit(String transformId, Str .build())); } - private org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp toTimestamp( + private org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp toTimestamp( Instant time) { - return org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp.newBuilder() + return org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp.newBuilder() .setSeconds(time.getMillis() / 1000) .setNanos((int) (time.getMillis() % 1000) * 1000000) .build(); @@ -4885,7 +4885,7 @@ public void testConstructSplitResultWithOnlyWindowSplits() throws Exception { assertEquals(1, result.getResidualRoots().size()); DelayedBundleApplication residualRoot = result.getResidualRoots().get(0); assertEquals( - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Duration.getDefaultInstance(), + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Duration.getDefaultInstance(), residualRoot.getRequestedTimeDelay()); assertEquals(PROCESS_TRANSFORM_ID, residualRoot.getApplication().getTransformId()); assertEquals(PROCESS_INPUT_ID, residualRoot.getApplication().getInputId()); @@ -4940,7 +4940,7 @@ public void testConstructSplitResultWithElementAndWindowSplitFromProcess() throw DelayedBundleApplication windowResidual = result.getResidualRoots().get(0); DelayedBundleApplication elementResidual = result.getResidualRoots().get(1); assertEquals( - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Duration.getDefaultInstance(), + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Duration.getDefaultInstance(), windowResidual.getRequestedTimeDelay()); assertEquals(PROCESS_TRANSFORM_ID, windowResidual.getApplication().getTransformId()); assertEquals(PROCESS_INPUT_ID, windowResidual.getApplication().getInputId()); @@ -4998,7 +4998,7 @@ public void testConstructSplitResultWithElementAndWindowSplitFromTruncate() thro DelayedBundleApplication windowResidual = result.getResidualRoots().get(0); DelayedBundleApplication elementResidual = result.getResidualRoots().get(1); assertEquals( - org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Duration.getDefaultInstance(), + org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Duration.getDefaultInstance(), windowResidual.getRequestedTimeDelay()); assertEquals(TRUNCATE_TRANSFORM_ID, windowResidual.getApplication().getTransformId()); assertEquals(TRUNCATE_INPUT_ID, windowResidual.getApplication().getInputId()); diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnHarnessTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnHarnessTest.java index bf442710fbe76..0b70e908315c1 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnHarnessTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/FnHarnessTest.java @@ -43,10 +43,10 @@ import org.apache.beam.sdk.harness.JvmInitializer; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.TextFormat; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.TextFormat; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.Uninterruptibles; import org.junit.Rule; import org.junit.Test; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/BeamFnControlClientTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/BeamFnControlClientTest.java index fddb6b2c3e3a0..e6441e84a6c6b 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/BeamFnControlClientTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/BeamFnControlClientTest.java @@ -43,10 +43,10 @@ import org.apache.beam.sdk.fn.test.InProcessManagedChannelFactory; import org.apache.beam.sdk.fn.test.TestStreams; import org.apache.beam.sdk.function.ThrowingFunction; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.Uninterruptibles; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java index 17f37d7c646a2..e0a35a4849afd 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/control/ProcessBundleHandlerTest.java @@ -90,8 +90,8 @@ import org.apache.beam.sdk.util.SerializableUtils; import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Message; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Message; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Maps; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClientTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClientTest.java index e41b019170793..8ce60b314265d 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClientTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataGrpcClientTest.java @@ -46,13 +46,13 @@ import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.transforms.windowing.GlobalWindow; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataInboundObserverTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataInboundObserverTest.java index 8218bea4c9c5c..aae1b119b4074 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataInboundObserverTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/BeamFnDataInboundObserverTest.java @@ -37,7 +37,7 @@ import org.apache.beam.sdk.fn.data.LogicalEndpoint; import org.apache.beam.sdk.transforms.windowing.GlobalWindow; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/QueueingBeamFnDataClientTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/QueueingBeamFnDataClientTest.java index 535b4258e2646..4f467417ccc3e 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/QueueingBeamFnDataClientTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/data/QueueingBeamFnDataClientTest.java @@ -47,13 +47,13 @@ import org.apache.beam.sdk.options.PipelineOptionsFactory; import org.apache.beam.sdk.transforms.windowing.GlobalWindow; import org.apache.beam.sdk.util.WindowedValue; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClientTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClientTest.java index c645acf687b33..f77798ace7f15 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClientTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/logging/BeamFnLoggingClientTest.java @@ -39,14 +39,14 @@ import org.apache.beam.model.pipeline.v1.Endpoints; import org.apache.beam.sdk.fn.test.TestStreams; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Timestamp; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Timestamp; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/BagUserStateTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/BagUserStateTest.java index dbf98859a18c0..0edc9ea7f3a3e 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/BagUserStateTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/BagUserStateTest.java @@ -25,7 +25,7 @@ import java.io.IOException; import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateKey; import org.apache.beam.sdk.coders.StringUtf8Coder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.junit.Rule; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/BeamFnStateGrpcClientCacheTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/BeamFnStateGrpcClientCacheTest.java index 8d6af928f6a5c..75a871ab6eb6c 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/BeamFnStateGrpcClientCacheTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/BeamFnStateGrpcClientCacheTest.java @@ -36,14 +36,14 @@ import org.apache.beam.sdk.fn.IdGenerators; import org.apache.beam.sdk.fn.stream.OutboundObserverFactory; import org.apache.beam.sdk.fn.test.TestStreams; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.ManagedChannel; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Server; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.Status; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.StatusRuntimeException; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessChannelBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.inprocess.InProcessServerBuilder; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.ManagedChannel; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Server; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.Status; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.StatusRuntimeException; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessChannelBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.inprocess.InProcessServerBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.util.concurrent.Uninterruptibles; import org.junit.After; import org.junit.Before; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/FakeBeamFnStateClient.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/FakeBeamFnStateClient.java index e6346523ea914..56f8718b5182e 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/FakeBeamFnStateClient.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/FakeBeamFnStateClient.java @@ -32,7 +32,7 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateRequest; import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateRequest.RequestCase; import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateResponse; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; /** A fake implementation of a {@link BeamFnStateClient} to aid with testing. */ public class FakeBeamFnStateClient implements BeamFnStateClient { diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/MultimapSideInputTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/MultimapSideInputTest.java index 635c111f4d96d..2bb7f156072e6 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/MultimapSideInputTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/MultimapSideInputTest.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateKey; import org.apache.beam.sdk.coders.StringUtf8Coder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.junit.Test; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/StateBackedIterableTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/StateBackedIterableTest.java index 1a9d9024b051c..e2461c2a2b96a 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/StateBackedIterableTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/StateBackedIterableTest.java @@ -30,7 +30,7 @@ import java.util.Random; import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateKey; import org.apache.beam.sdk.coders.StringUtf8Coder; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.FluentIterable; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/StateFetchingIteratorsTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/StateFetchingIteratorsTest.java index d184ca2c4daa1..90fdd539f7f4f 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/StateFetchingIteratorsTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/state/StateFetchingIteratorsTest.java @@ -24,7 +24,7 @@ import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateGetResponse; import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateRequest; import org.apache.beam.model.fnexecution.v1.BeamFnApi.StateResponse; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterators; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/stream/HarnessStreamObserverFactoriesTest.java b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/stream/HarnessStreamObserverFactoriesTest.java index 5d905872172e9..b828b36f92650 100644 --- a/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/stream/HarnessStreamObserverFactoriesTest.java +++ b/sdks/java/harness/src/test/java/org/apache/beam/fn/harness/stream/HarnessStreamObserverFactoriesTest.java @@ -25,8 +25,8 @@ import org.apache.beam.sdk.fn.stream.DirectStreamObserver; import org.apache.beam.sdk.fn.stream.ForwardingClientResponseObserver; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.CallStreamObserver; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.CallStreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sdks/java/io/contextualtextio/build.gradle b/sdks/java/io/contextualtextio/build.gradle index dc242e0476a21..340e994a37f3a 100644 --- a/sdks/java/io/contextualtextio/build.gradle +++ b/sdks/java/io/contextualtextio/build.gradle @@ -30,7 +30,7 @@ dependencies { permitUnusedDeclared library.java.protobuf_java // BEAM-11761 compile library.java.slf4j_api compile library.java.vendored_guava_26_0_jre - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.guava_testlib diff --git a/sdks/java/io/contextualtextio/src/main/java/org/apache/beam/sdk/io/contextualtextio/ContextualTextIOSource.java b/sdks/java/io/contextualtextio/src/main/java/org/apache/beam/sdk/io/contextualtextio/ContextualTextIOSource.java index de70291f8b218..2a95120513fe9 100644 --- a/sdks/java/io/contextualtextio/src/main/java/org/apache/beam/sdk/io/contextualtextio/ContextualTextIOSource.java +++ b/sdks/java/io/contextualtextio/src/main/java/org/apache/beam/sdk/io/contextualtextio/ContextualTextIOSource.java @@ -30,7 +30,7 @@ import org.apache.beam.sdk.options.ValueProvider; import org.apache.beam.sdk.schemas.SchemaCoder; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.annotations.VisibleForTesting; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/sdks/java/io/debezium/build.gradle b/sdks/java/io/debezium/build.gradle index ff7e81036a499..722528f42c702 100644 --- a/sdks/java/io/debezium/build.gradle +++ b/sdks/java/io/debezium/build.gradle @@ -32,7 +32,7 @@ ext.summary = "Library to work with Debezium data." dependencies { compile library.java.vendored_guava_26_0_jre - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.slf4j_api compile library.java.joda_time diff --git a/sdks/java/io/debezium/src/main/java/org/apache/beam/io/debezium/SourceRecordJson.java b/sdks/java/io/debezium/src/main/java/org/apache/beam/io/debezium/SourceRecordJson.java index 10bcb143ed4f2..e61884fa49bab 100644 --- a/sdks/java/io/debezium/src/main/java/org/apache/beam/io/debezium/SourceRecordJson.java +++ b/sdks/java/io/debezium/src/main/java/org/apache/beam/io/debezium/SourceRecordJson.java @@ -20,8 +20,8 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.gson.Gson; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.gson.GsonBuilder; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.Gson; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.gson.GsonBuilder; import org.apache.kafka.connect.data.Field; import org.apache.kafka.connect.data.Struct; import org.apache.kafka.connect.errors.DataException; diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 35809ba44171b..579a35231ffd8 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -117,7 +117,7 @@ dependencies { compile library.java.protobuf_java compile library.java.protobuf_java_util compile library.java.slf4j_api - compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_grpc_1_36_0 compile library.java.vendored_guava_26_0_jre compile "org.threeten:threetenbp:1.4.4" diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerTransformRegistrar.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerTransformRegistrar.java index 891dd3702f4c2..42bb0a487a1b4 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerTransformRegistrar.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/SpannerTransformRegistrar.java @@ -38,7 +38,7 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PDone; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.InvalidProtocolBufferException; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIOExternalTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIOExternalTest.java index b5691f8c02403..7e7e2e244123d 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIOExternalTest.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubIOExternalTest.java @@ -40,8 +40,8 @@ import org.apache.beam.sdk.transforms.Impulse; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; import org.checkerframework.checker.nullness.qual.Nullable; import org.hamcrest.Matchers; diff --git a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOExternalTest.java b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOExternalTest.java index d7674ff0b6916..091f2ea5deda2 100644 --- a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOExternalTest.java +++ b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOExternalTest.java @@ -46,8 +46,8 @@ import org.apache.beam.sdk.transforms.WithKeys; import org.apache.beam.sdk.values.KV; import org.apache.beam.sdk.values.Row; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.ByteString; -import org.apache.beam.vendor.grpc.v1p26p0.io.grpc.stub.StreamObserver; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.ByteString; +import org.apache.beam.vendor.grpc.v1p36p0.io.grpc.stub.StreamObserver; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableMap; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Iterables; diff --git a/settings.gradle.kts b/settings.gradle.kts index 14619a4304a45..a0f917821d030 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -206,7 +206,6 @@ include(":sdks:python:test-suites:tox:pycommon") include(":sdks:python:test-suites:tox:py36") include(":sdks:python:test-suites:tox:py37") include(":sdks:python:test-suites:tox:py38") -include(":vendor:grpc-1_26_0") include(":vendor:grpc-1_36_0") include(":vendor:bytebuddy-1_10_8") include(":vendor:calcite-1_26_0") diff --git a/vendor/grpc-1_26_0/build.gradle b/vendor/grpc-1_26_0/build.gradle deleted file mode 100644 index 88c622f7db747..0000000000000 --- a/vendor/grpc-1_26_0/build.gradle +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.apache.beam.gradle.GrpcVendoring_1_26_0 - -plugins { id 'org.apache.beam.vendor-java' } - -description = "Apache Beam :: Vendored Dependencies :: gRPC :: 1.26.0" - -group = "org.apache.beam" -version = "0.3" - -vendorJava( - dependencies: GrpcVendoring_1_26_0.dependencies(), - runtimeDependencies: GrpcVendoring_1_26_0.runtimeDependencies(), - testDependencies: GrpcVendoring_1_26_0.testDependencies(), - relocations: GrpcVendoring_1_26_0.relocations(), - exclusions: GrpcVendoring_1_26_0.exclusions(), - artifactId: "beam-vendor-grpc-1_26_0", - groupId: group, - version: version, -)