Skip to content

Commit

Permalink
Remove testRuntimeMigration for sdk dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Abacn committed Jul 2, 2024
1 parent 8f2bd97 commit 1297b2e
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions it/google-cloud-platform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ dependencies {
provided 'com.google.api.grpc:proto-google-cloud-secretmanager-v1'

testImplementation project(path: ":sdks:java:io:google-cloud-platform")
testImplementation project(path: ":sdks:java:extensions:protobuf", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:protobuf")
testImplementation project(path: ":sdks:java:io:synthetic")
testImplementation library.java.mockito_inline
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core")
testImplementation project(path: ":runners:direct-java", configuration: "shadow")
testRuntimeOnly library.java.slf4j_simple
}
Expand Down
2 changes: 1 addition & 1 deletion it/kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
testImplementation project(path: ":runners:direct-java")
testImplementation project(path: ":runners:google-cloud-dataflow-java")
testImplementation project(path: ":sdks:java:testing:test-utils")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core")
testImplementation library.java.google_api_services_dataflow
}

Expand Down
8 changes: 4 additions & 4 deletions runners/google-cloud-dataflow-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,11 @@ dependencies {
implementation library.java.vendored_grpc_1_60_1
testImplementation library.java.guava_testlib
testImplementation library.java.junit
testImplementation project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:io:google-cloud-platform")
testImplementation project(path: ":sdks:java:core", configuration: "shadowTest")
testImplementation project(path: ":sdks:java:extensions:avro")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:python", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core")
testImplementation project(path: ":sdks:java:extensions:python")
testImplementation library.java.google_cloud_dataflow_java_proto_library_all
testImplementation library.java.jackson_dataformat_yaml
testImplementation library.java.mockito_core
Expand All @@ -135,7 +135,7 @@ dependencies {
examplesJavaIntegrationTest project(project.path)
examplesJavaIntegrationTest project(path: ":examples:java", configuration: "testRuntimeMigration")
googleCloudPlatformIntegrationTest project(project.path)
googleCloudPlatformIntegrationTest project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntimeMigration")
googleCloudPlatformIntegrationTest project(path: ":sdks:java:io:google-cloud-platform")
}

def dataflowProject = project.findProperty('dataflowProject') ?: 'apache-beam-testing'
Expand Down
2 changes: 1 addition & 1 deletion runners/google-cloud-dataflow-java/worker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ dependencies {
testImplementation(library.java.truth) {
exclude group: 'com.google.guava', module: 'guava'
}
shadowTest project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntimeMigration")
shadowTest project(path: ":sdks:java:extensions:google-cloud-platform-core")
shadowTest project(path: ":runners:direct-java", configuration: "shadow")
shadowTest project(path: ":sdks:java:harness", configuration: "shadowTest")
shadowTest project(path: ":sdks:java:core", configuration: "shadowTest")
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/extensions/ml/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dependencies {
testImplementation 'com.google.cloud:google-cloud-recommendations-ai:0.3.7'
testImplementation 'com.google.cloud:google-cloud-video-intelligence:1.2.0'
testImplementation 'com.google.cloud:google-cloud-dlp:1.1.4'
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core")
testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow")
testRuntimeOnly project(":runners:google-cloud-dataflow-java")
}
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/extensions/sql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ dependencies {
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")
testImplementation project(path: ":sdks:java:extensions:protobuf")
testCompileOnly project(":sdks:java:extensions:sql:udf-test-provider")
testRuntimeOnly library.java.slf4j_jdk14
hadoopVersions.each {kv ->
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/extensions/sql/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies {
implementation library.java.vendored_guava_32_1_2_jre
implementation library.java.vendored_calcite_1_28_0
permitUnusedDeclared library.java.vendored_calcite_1_28_0
testImplementation project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:io:google-cloud-platform")
testImplementation library.java.junit
// Depending on outputs so integrationTest can run with only test dependencies.
// This enables us to test the JDBC jar being loaded on a custom classloader.
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/extensions/sql/perf-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: SQL :: IO Performanc
ext.summary = "Performance tests for SQL IO sources"

dependencies {
testImplementation project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:io:google-cloud-platform")
testImplementation project(path: ":sdks:java:extensions:sql", configuration: "testRuntimeMigration")
}

Expand Down
4 changes: 2 additions & 2 deletions sdks/java/io/bigquery-io-perf-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ dependencies {
testImplementation library.java.google_api_services_bigquery
testImplementation project(path: ":sdks:java:core", configuration: "shadowTest")
testImplementation project(path: ":sdks:java:testing:test-utils")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core")
testImplementation project(path: ":sdks:java:io:common")
testImplementation project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:io:google-cloud-platform")
testImplementation project(":sdks:java:io:synthetic")
testImplementation library.java.junit
}
4 changes: 2 additions & 2 deletions sdks/java/io/google-cloud-platform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ dependencies {
exclude group: 'org.slf4j', module: 'slf4j-api'
}
testImplementation project(path: ":sdks:java:core", configuration: "shadowTest")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:protobuf", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:google-cloud-platform-core")
testImplementation project(path: ":sdks:java:extensions:protobuf")
testImplementation project(path: ":runners:direct-java", configuration: "shadow")
testImplementation project(path: ":sdks:java:io:common")
testImplementation project(path: ":sdks:java:testing:test-utils")
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/io/kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ dependencies {
testImplementation project(path: ":sdks:java:core", configuration: "shadowTest")
testImplementation project(":sdks:java:io:synthetic")
testImplementation project(":sdks:java:managed")
testImplementation project(path: ":sdks:java:extensions:protobuf", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:extensions:protobuf")
testImplementation project(path: ":sdks:java:io:common")
testImplementation project(path: ":sdks:java:testing:test-utils")
// For testing Cross-language transforms
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/testing/nexmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ dependencies {
implementation library.java.kafka_clients
compileOnly library.java.error_prone_annotations
testRuntimeOnly library.java.slf4j_jdk14
testImplementation project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:io:google-cloud-platform")
testImplementation project(path: ":sdks:java:testing:test-utils")
gradleRun project(project.path)
gradleRun project(path: nexmarkRunnerDependency, configuration: runnerConfiguration)
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/testing/tpcds/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ dependencies {
implementation project(":runners:google-cloud-dataflow-java")
implementation project(path: ":sdks:java:core", configuration: "shadow")
testRuntimeOnly library.java.slf4j_jdk14
testImplementation project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntimeMigration")
testImplementation project(path: ":sdks:java:io:google-cloud-platform")
testImplementation project(path: ":sdks:java:testing:test-utils")
gradleRun project(project.path)
gradleRun project(path: tpcdsRunnerDependency, configuration: runnerConfiguration)
Expand Down

0 comments on commit 1297b2e

Please sign in to comment.