Skip to content

Commit 3819f2a

Browse files
authored
[release-2.36.0][BEAM-13430] Fix provided configuration (#16704)
1 parent 36a5b0f commit 3819f2a

8 files changed

Lines changed: 15 additions & 1 deletion

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,8 @@ class BeamModulePlugin implements Plugin<Project> {
810810
// Provided configuration to match Maven provided scope
811811
project.configurations {
812812
provided
813-
implementation.extendsFrom(provided)
813+
compileOnly.extendsFrom(provided)
814+
runtimeOnly.extendsFrom(provided)
814815
}
815816

816817
// Configure the Java compiler source language and target compatibility levels. Also ensure that

runners/flink/flink_runner.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ dependencies {
151151
implementation "org.apache.flink:flink-streaming-java_2.11:$flink_version"
152152
// RocksDB state backend (included in the Flink distribution)
153153
provided "org.apache.flink:flink-statebackend-rocksdb_2.11:$flink_version"
154+
testImplementation "org.apache.flink:flink-statebackend-rocksdb_2.11:$flink_version"
154155
testImplementation project(path: ":sdks:java:core", configuration: "shadowTest")
155156
// FlinkStateInternalsTest extends abstract StateInternalsTest
156157
testImplementation project(path: ":runners:core-java", configuration: "testRuntimeMigration")

runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,14 @@ dependencies {
190190
// there.
191191
sdk_provided_dependencies.each {
192192
provided(it)
193+
testImplementation(it)
193194
}
194195
sdk_provided_shaded_project_dependencies.each {
195196
provided project(path: it, configuration: "shadow")
196197
}
197198
sdk_provided_project_dependencies.each {
198199
provided project(path: it)
200+
testImplementation project(path: it)
199201
}
200202

201203
implementation project(path: ":model:fn-execution", configuration: "shadow")

sdks/java/extensions/sql/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ dependencies {
120120
testImplementation library.java.proto_google_cloud_bigtable_admin_v2
121121
testImplementation library.java.proto_google_cloud_datastore_v1
122122
testImplementation library.java.google_cloud_datastore_v1_proto_client
123+
testImplementation library.java.kafka_clients
124+
testImplementation project(":sdks:java:io:kafka")
123125
testImplementation project(path: ":sdks:java:io:mongodb", configuration: "testRuntimeMigration")
124126
testImplementation project(path: ":sdks:java:io:thrift", configuration: "testRuntimeMigration")
125127
testImplementation project(path: ":sdks:java:extensions:protobuf", configuration: "testRuntimeMigration")

sdks/java/extensions/sql/datacatalog/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ dependencies {
4646
permitUnusedDeclared project(":sdks:java:io:google-cloud-platform")
4747
implementation library.java.slf4j_api
4848

49+
testImplementation project(":sdks:java:extensions:sql")
4950
testImplementation project(":sdks:java:extensions:sql:zetasql")
5051
testImplementation project(":runners:direct-java")
52+
testImplementation project(":sdks:java:io:google-cloud-platform")
5153
testImplementation library.java.google_api_services_bigquery
5254
testImplementation library.java.junit
5355
testRuntimeOnly library.java.slf4j_simple

sdks/java/io/hadoop-common/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ dependencies {
4040
provided library.java.hadoop_common
4141
provided library.java.hadoop_mapreduce_client_core
4242
testImplementation library.java.junit
43+
testImplementation library.java.hadoop_common
44+
testImplementation library.java.hadoop_mapreduce_client_core
4345
testImplementation library.java.hamcrest
4446
hadoopVersions.each {kv ->
4547
"hadoopVersion$kv.key" "org.apache.hadoop:hadoop-client:$kv.value"

sdks/java/io/hadoop-format/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ dependencies {
104104
testImplementation library.java.cassandra_driver_core
105105
testImplementation library.java.cassandra_driver_mapping
106106
testImplementation "org.apache.cassandra:cassandra-all:3.11.8"
107+
testImplementation library.java.hadoop_common
108+
testImplementation library.java.hadoop_hdfs
109+
testImplementation library.java.hadoop_mapreduce_client_core
107110
testImplementation library.java.postgres
108111
testImplementation library.java.junit
109112
testImplementation library.java.hamcrest

sdks/java/io/hcatalog/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ dependencies {
9696
testImplementation "org.apache.hive:hive-exec:$hive_version"
9797
testImplementation "org.apache.hive:hive-common:$hive_version"
9898
testImplementation "org.apache.hive:hive-cli:$hive_version"
99+
testImplementation "org.apache.hive.hcatalog:hive-hcatalog-core:$hive_version"
99100
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
100101
hadoopVersions.each {kv ->
101102
"hadoopVersion$kv.key" "org.apache.hadoop:hadoop-common:$kv.value"

0 commit comments

Comments
 (0)