[beam] branch release-2.36.0 updated: [release-2.36.0][BEAM-13430] Fix provided configuration (#16704)

[em...@apache.org]

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

emilyye pushed a commit to branch release-2.36.0
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/release-2.36.0 by this push:
     new 3819f2a  [release-2.36.0][BEAM-13430] Fix provided configuration (#16704)
3819f2a is described below

commit 3819f2ad7ef3366fdce13fba090a3e6ed874261f
Author: emily <em...@google.com>
AuthorDate: Wed Feb 2 13:00:06 2022 -0800

    [release-2.36.0][BEAM-13430] Fix provided configuration (#16704)
---
 .../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy     | 3 ++-
 runners/flink/flink_runner.gradle                                      | 1 +
 runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle   | 2 ++
 sdks/java/extensions/sql/build.gradle                                  | 2 ++
 sdks/java/extensions/sql/datacatalog/build.gradle                      | 2 ++
 sdks/java/io/hadoop-common/build.gradle                                | 2 ++
 sdks/java/io/hadoop-format/build.gradle                                | 3 +++
 sdks/java/io/hcatalog/build.gradle                                     | 1 +
 8 files changed, 15 insertions(+), 1 deletion(-)

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 008a4cb..f3fab89 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -810,7 +810,8 @@ class BeamModulePlugin implements Plugin<Project> {
       // Provided configuration to match Maven provided scope
       project.configurations {
         provided
-        implementation.extendsFrom(provided)
+        compileOnly.extendsFrom(provided)
+        runtimeOnly.extendsFrom(provided)
       }
 
       // Configure the Java compiler source language and target compatibility levels. Also ensure that
diff --git a/runners/flink/flink_runner.gradle b/runners/flink/flink_runner.gradle
index a0a76dd..85b0e11 100644
--- a/runners/flink/flink_runner.gradle
+++ b/runners/flink/flink_runner.gradle
@@ -151,6 +151,7 @@ dependencies {
   implementation "org.apache.flink:flink-streaming-java_2.11:$flink_version"
   // RocksDB state backend (included in the Flink distribution)
   provided "org.apache.flink:flink-statebackend-rocksdb_2.11:$flink_version"
+  testImplementation "org.apache.flink:flink-statebackend-rocksdb_2.11:$flink_version"
   testImplementation project(path: ":sdks:java:core", configuration: "shadowTest")
   // FlinkStateInternalsTest extends abstract StateInternalsTest
   testImplementation project(path: ":runners:core-java", configuration: "testRuntimeMigration")
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 a21ed6a..b747239 100644
--- a/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle
+++ b/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle
@@ -190,12 +190,14 @@ dependencies {
     // there.
     sdk_provided_dependencies.each {
         provided(it)
+        testImplementation(it)
     }
     sdk_provided_shaded_project_dependencies.each {
         provided project(path: it, configuration: "shadow")
     }
     sdk_provided_project_dependencies.each {
         provided project(path: it)
+        testImplementation project(path: it)
     }
 
     implementation project(path: ":model:fn-execution", configuration: "shadow")
diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle
index b06541f..e6f0218 100644
--- a/sdks/java/extensions/sql/build.gradle
+++ b/sdks/java/extensions/sql/build.gradle
@@ -120,6 +120,8 @@ dependencies {
   testImplementation library.java.proto_google_cloud_bigtable_admin_v2
   testImplementation library.java.proto_google_cloud_datastore_v1
   testImplementation library.java.google_cloud_datastore_v1_proto_client
+  testImplementation library.java.kafka_clients
+  testImplementation project(":sdks:java:io:kafka")
   testImplementation project(path: ":sdks:java:io:mongodb", configuration: "testRuntimeMigration")
   testImplementation project(path: ":sdks:java:io:thrift", configuration: "testRuntimeMigration")
   testImplementation project(path: ":sdks:java:extensions:protobuf", configuration: "testRuntimeMigration")
diff --git a/sdks/java/extensions/sql/datacatalog/build.gradle b/sdks/java/extensions/sql/datacatalog/build.gradle
index 834b103..73d4ff5 100644
--- a/sdks/java/extensions/sql/datacatalog/build.gradle
+++ b/sdks/java/extensions/sql/datacatalog/build.gradle
@@ -46,8 +46,10 @@ dependencies {
   permitUnusedDeclared project(":sdks:java:io:google-cloud-platform")
   implementation library.java.slf4j_api
 
+  testImplementation project(":sdks:java:extensions:sql")
   testImplementation project(":sdks:java:extensions:sql:zetasql")
   testImplementation project(":runners:direct-java")
+  testImplementation project(":sdks:java:io:google-cloud-platform")
   testImplementation library.java.google_api_services_bigquery
   testImplementation library.java.junit
   testRuntimeOnly library.java.slf4j_simple
diff --git a/sdks/java/io/hadoop-common/build.gradle b/sdks/java/io/hadoop-common/build.gradle
index ddf0fa0..86e345a 100644
--- a/sdks/java/io/hadoop-common/build.gradle
+++ b/sdks/java/io/hadoop-common/build.gradle
@@ -40,6 +40,8 @@ dependencies {
   provided library.java.hadoop_common
   provided library.java.hadoop_mapreduce_client_core
   testImplementation library.java.junit
+  testImplementation library.java.hadoop_common
+  testImplementation library.java.hadoop_mapreduce_client_core
   testImplementation library.java.hamcrest
   hadoopVersions.each {kv ->
     "hadoopVersion$kv.key" "org.apache.hadoop:hadoop-client:$kv.value"
diff --git a/sdks/java/io/hadoop-format/build.gradle b/sdks/java/io/hadoop-format/build.gradle
index 22fff85..cb9623a 100644
--- a/sdks/java/io/hadoop-format/build.gradle
+++ b/sdks/java/io/hadoop-format/build.gradle
@@ -104,6 +104,9 @@ dependencies {
   testImplementation library.java.cassandra_driver_core
   testImplementation library.java.cassandra_driver_mapping
   testImplementation "org.apache.cassandra:cassandra-all:3.11.8"
+  testImplementation library.java.hadoop_common
+  testImplementation library.java.hadoop_hdfs
+  testImplementation library.java.hadoop_mapreduce_client_core
   testImplementation library.java.postgres
   testImplementation library.java.junit
   testImplementation library.java.hamcrest
diff --git a/sdks/java/io/hcatalog/build.gradle b/sdks/java/io/hcatalog/build.gradle
index 434be97..2a98548 100644
--- a/sdks/java/io/hcatalog/build.gradle
+++ b/sdks/java/io/hcatalog/build.gradle
@@ -96,6 +96,7 @@ dependencies {
   testImplementation "org.apache.hive:hive-exec:$hive_version"
   testImplementation "org.apache.hive:hive-common:$hive_version"
   testImplementation "org.apache.hive:hive-cli:$hive_version"
+  testImplementation "org.apache.hive.hcatalog:hive-hcatalog-core:$hive_version"
   testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
   hadoopVersions.each {kv ->
     "hadoopVersion$kv.key" "org.apache.hadoop:hadoop-common:$kv.value"