This is an automated email from the ASF dual-hosted git repository.

lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new f82d940  [BEAM-6058] Use vendored gRPC 1.13.1 dependency. (#7105)
f82d940 is described below

commit f82d9404a6da3012b9b7d881507973fc0e0f4dff
Author: Lukasz Cwik <lc...@google.com>
AuthorDate: Wed Nov 21 14:21:03 2018 -0800

    [BEAM-6058] Use vendored gRPC 1.13.1 dependency. (#7105)
---
 .../org/apache/beam/gradle/BeamModulePlugin.groovy |  8 ++---
 runners/core-construction-java/build.gradle        |  2 +-
 runners/direct-java/build.gradle                   |  2 +-
 runners/flink/build.gradle                         |  2 +-
 runners/google-cloud-dataflow-java/build.gradle    |  2 +-
 .../google-cloud-dataflow-java/worker/build.gradle |  2 +-
 .../worker/legacy-worker/build.gradle              |  2 +-
 runners/java-fn-execution/build.gradle             |  2 +-
 runners/reference/java/build.gradle                |  2 +-
 sdks/java/fn-execution/build.gradle                |  2 +-
 sdks/java/harness/build.gradle                     |  4 +--
 settings.gradle                                    |  3 --
 vendor/grpc-v1_13_1/build.gradle                   | 36 ----------------------
 13 files changed, 15 insertions(+), 54 deletions(-)

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 9c3fec6..8d96480 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -434,6 +434,8 @@ class BeamModulePlugin implements Plugin<Project> {
         spark_network_common                        : 
"org.apache.spark:spark-network-common_2.11:$spark_version",
         spark_streaming                             : 
"org.apache.spark:spark-streaming_2.11:$spark_version",
         stax2_api                                   : 
"org.codehaus.woodstox:stax2-api:3.1.4",
+        vendored_grpc_1_13_1                        : 
"org.apache.beam:beam-vendor-grpc-1_13_1:0.1",
+        vendored_guava_20_0                         : 
"org.apache.beam:beam-vendor-guava-20_0:0.1",
         woodstox_core_asl                           : 
"org.codehaus.woodstox:woodstox-core-asl:4.4.1",
         quickcheck_core                             : 
"com.pholser:junit-quickcheck-core:$quickcheck_version",
       ],
@@ -1357,7 +1359,7 @@ artifactId=${project.name}
       project.ext.applyJavaNature(enableFindbugs: false, shadowClosure: 
GrpcVendoring.shadowClosure() << {
         // We perform all the code relocations but don't include
         // any of the actual dependencies since they will be supplied
-        // by beam-vendor-grpc-v1_13_1
+        // by org.apache.beam:beam-vendor-grpc-v1_13_1:0.1
         dependencies {
           exclude(dependency(".*:.*"))
         }
@@ -1394,9 +1396,7 @@ artifactId=${project.name}
         }
       }
 
-      project.dependencies GrpcVendoring.dependenciesClosure() << {
-        shadow it.project(path: ":beam-vendor-grpc-v1_13_1", configuration: 
"shadow")
-      }
+      project.dependencies GrpcVendoring.dependenciesClosure() << { shadow 
'org.apache.beam:beam-vendor-grpc-1_13_1:0.1' }
 
       project.task('validateShadedJarDoesntExportVendoredDependencies', 
dependsOn: 'shadowJar') {
         ext.outFile = project.file("${project.reportsDir}/${name}.out")
diff --git a/runners/core-construction-java/build.gradle 
b/runners/core-construction-java/build.gradle
index a079f95..ed7d585 100644
--- a/runners/core-construction-java/build.gradle
+++ b/runners/core-construction-java/build.gradle
@@ -37,7 +37,7 @@ dependencies {
   shadow project(path: ":beam-model-pipeline", configuration: "shadow")
   shadow project(path: ":beam-model-job-management", configuration: "shadow")
   shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
-  shadow project(path: ":beam-vendor-grpc-v1_13_1", configuration: "shadow")
+  shadow library.java.vendored_grpc_1_13_1
   shadow library.java.jackson_core
   shadow library.java.jackson_databind
   shadow library.java.joda_time
diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle
index 592adf7..5fe6411 100644
--- a/runners/direct-java/build.gradle
+++ b/runners/direct-java/build.gradle
@@ -64,7 +64,7 @@ dependencies {
     compile project(path: it, configuration: "shadow")
   }
   shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
-  shadow project(path: ":beam-vendor-grpc-v1_13_1", configuration: "shadow")
+  shadow library.java.vendored_grpc_1_13_1
   shadow library.java.joda_time
   shadow library.java.slf4j_api
   shadow library.java.args4j
diff --git a/runners/flink/build.gradle b/runners/flink/build.gradle
index d1e731a..87c827d 100644
--- a/runners/flink/build.gradle
+++ b/runners/flink/build.gradle
@@ -54,7 +54,7 @@ dependencies {
   shadow project(path: ":beam-runners-core-java", configuration: "shadow")
   shadow project(path: ":beam-runners-core-construction-java", configuration: 
"shadow")
   shadow project(path: ":beam-runners-java-fn-execution", configuration: 
"shadow")
-  shadow project(path: ":beam-vendor-grpc-v1_13_1", configuration: "shadow")
+  shadow library.java.vendored_grpc_1_13_1
   shadow library.java.jackson_annotations
   shadow library.java.slf4j_api
   shadow library.java.joda_time
diff --git a/runners/google-cloud-dataflow-java/build.gradle 
b/runners/google-cloud-dataflow-java/build.gradle
index a5c7bc8..875fecf 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -63,7 +63,7 @@ dependencies {
   shadow project(path: 
":beam-sdks-java-extensions-google-cloud-platform-core", configuration: 
"shadow")
   shadow project(path: ":beam-sdks-java-io-google-cloud-platform", 
configuration: "shadow")
   shadow project(path: ":beam-runners-core-construction-java", configuration: 
"shadow")
-  shadow project(path: ":beam-vendor-grpc-v1_13_1", configuration: "shadow")
+  shadow library.java.vendored_grpc_1_13_1
   shadow library.java.google_api_client
   shadow library.java.google_http_client
   shadow library.java.google_http_client_jackson2
diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle 
b/runners/google-cloud-dataflow-java/worker/build.gradle
index 475175a..c8e2795 100644
--- a/runners/google-cloud-dataflow-java/worker/build.gradle
+++ b/runners/google-cloud-dataflow-java/worker/build.gradle
@@ -89,7 +89,6 @@ def common_compile_project_dependencies = [
     ":beam-runners-java-fn-execution",
     ":beam-sdks-java-fn-execution",
     ":beam-runners-google-cloud-dataflow-java-windmill",
-    ":beam-vendor-grpc-v1_13_1",
 ]
 
 def common_test_compile_project_dependencies = [
@@ -112,6 +111,7 @@ dependencies {
 
   compile library.java.guava
   compile library.java.slf4j_api
+  compile library.java.vendored_grpc_1_13_1
   compile "javax.servlet:javax.servlet-api:3.1.0"
   compile "org.conscrypt:conscrypt-openjdk:1.1.3:linux-x86_64"
   compile "org.eclipse.jetty:jetty-server:9.2.10.v20150310"
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 5c1b8f3..8055876 100644
--- a/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle
+++ b/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle
@@ -156,7 +156,6 @@ def common_compile_project_dependencies = [
         ":beam-runners-java-fn-execution",
         ":beam-sdks-java-fn-execution",
         ":beam-runners-google-cloud-dataflow-java-windmill",
-        ":beam-vendor-grpc-v1_13_1",
 ]
 
 def common_test_compile_project_dependencies = [
@@ -189,6 +188,7 @@ dependencies {
 
     compile library.java.guava
     compile library.java.slf4j_api
+    compile library.java.vendored_grpc_1_13_1
     compile "javax.servlet:javax.servlet-api:3.1.0"
     compile "org.conscrypt:conscrypt-openjdk:1.1.3:linux-x86_64"
     compile "org.eclipse.jetty:jetty-server:9.2.10.v20150310"
diff --git a/runners/java-fn-execution/build.gradle 
b/runners/java-fn-execution/build.gradle
index 3da42a4..8514657 100644
--- a/runners/java-fn-execution/build.gradle
+++ b/runners/java-fn-execution/build.gradle
@@ -30,7 +30,7 @@ dependencies {
   shadow project(path: ":beam-sdks-java-fn-execution", configuration: "shadow")
   shadow project(path: ":beam-runners-core-construction-java", configuration: 
"shadow")
   shadow project(path: ":beam-vendor-sdks-java-extensions-protobuf", 
configuration: "shadow")
-  shadow project(path: ":beam-vendor-grpc-v1_13_1", configuration: "shadow")
+  shadow library.java.vendored_grpc_1_13_1
   shadow library.java.slf4j_api
   testCompile project(":beam-sdks-java-harness")
   testCompile project(path: ":beam-runners-core-construction-java", 
configuration: "shadow")
diff --git a/runners/reference/java/build.gradle 
b/runners/reference/java/build.gradle
index e22fc69..78ef5b0 100644
--- a/runners/reference/java/build.gradle
+++ b/runners/reference/java/build.gradle
@@ -34,7 +34,7 @@ dependencies {
   shadow project(path: ":beam-model-pipeline", configuration: "shadow")
   shadow project(path: ":beam-runners-core-construction-java", configuration: 
"shadow")
   shadow project(path: ":beam-sdks-java-fn-execution", configuration: "shadow")
-  shadow project(path: ":beam-vendor-grpc-v1_13_1", configuration: "shadow")
+  shadow library.java.vendored_grpc_1_13_1
   shadow library.java.slf4j_api
   shadowTest project(path: ":beam-runners-core-construction-java", 
configuration: "shadowTest")
   shadowTest library.java.guava
diff --git a/sdks/java/fn-execution/build.gradle 
b/sdks/java/fn-execution/build.gradle
index 6e0b5b9..477c24d 100644
--- a/sdks/java/fn-execution/build.gradle
+++ b/sdks/java/fn-execution/build.gradle
@@ -28,7 +28,7 @@ dependencies {
   shadow project(path: ":beam-model-pipeline", configuration: "shadow")
   shadow project(path: ":beam-model-fn-execution", configuration: "shadow")
   shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
-  shadow project(path: ":beam-vendor-grpc-v1_13_1", configuration: "shadow")
+  shadow library.java.vendored_grpc_1_13_1
   shadow library.java.slf4j_api
   shadow library.java.joda_time
   provided library.java.junit
diff --git a/sdks/java/harness/build.gradle b/sdks/java/harness/build.gradle
index 9c73191..0680551 100644
--- a/sdks/java/harness/build.gradle
+++ b/sdks/java/harness/build.gradle
@@ -23,8 +23,7 @@
 def dependOnProjects = [":beam-model-pipeline", ":beam-model-fn-execution", 
":beam-sdks-java-core",
                         ":beam-sdks-java-fn-execution",
                         
":beam-sdks-java-extensions-google-cloud-platform-core",
-                        ":beam-runners-core-java", 
":beam-runners-core-construction-java",
-                        ":beam-vendor-grpc-v1_13_1",]
+                        ":beam-runners-core-java", 
":beam-runners-core-construction-java",]
 
 apply plugin: org.apache.beam.gradle.BeamModulePlugin
 applyJavaNature(validateShadowJar: false, shadowClosure: 
DEFAULT_SHADOW_CLOSURE <<
@@ -54,6 +53,7 @@ dependencies {
   compile library.java.guava
   compile library.java.joda_time
   compile library.java.slf4j_api
+  compile library.java.vendored_grpc_1_13_1
   provided library.java.error_prone_annotations
   testCompile library.java.hamcrest_core
   testCompile library.java.hamcrest_library
diff --git a/settings.gradle b/settings.gradle
index 8b2d4d3..7c21cdc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -180,9 +180,6 @@ include "beam-sdks-python-container"
 project(":beam-sdks-python-container").dir = file("sdks/python/container")
 include "beam-sdks-python-container-py3"
 project(":beam-sdks-python-container-py3").dir = 
file("sdks/python/container/py3")
-// Temporary version that will be deleted once we migrate to using the 
published version.
-include "beam-vendor-grpc-v1_13_1"
-project(":beam-vendor-grpc-v1_13_1").dir = file("vendor/grpc-v1_13_1")
 include "beam-vendor-grpc-1_13_1"
 project(":beam-vendor-grpc-1_13_1").dir = file("vendor/grpc-1_13_1")
 include "beam-sdks-java-test-utils"
diff --git a/vendor/grpc-v1_13_1/build.gradle b/vendor/grpc-v1_13_1/build.gradle
deleted file mode 100644
index 853993b..0000000
--- a/vendor/grpc-v1_13_1/build.gradle
+++ /dev/null
@@ -1,36 +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
-
-description = "Apache Beam :: Vendored Dependencies :: Java :: gRPC :: v1"
-ext.summary = "Add support to Apache Beam for Vendored gRPC V1."
-
-apply plugin: org.apache.beam.gradle.BeamModulePlugin
-applyJavaNature(enableFindbugs: false, shadowClosure: 
GrpcVendoring.shadowClosure())
-
-// Don't force modules here because we don't want to take the shared 
declarations in build_rules.gradle
-// because we would like to have the freedom to choose which versions of 
dependencies we
-// are using for the portability APIs separate from what is being used inside 
other modules such as GCP.
-configurations.all { config ->
-  config.resolutionStrategy { forcedModules = []}
-}
-
-dependencies GrpcVendoring.dependenciesClosure()
-
-// TODO(BEAM-4544): Integrate intellij support into this.

Reply via email to