From 813764743a849c36e62907345fb2bfdf6ea74779 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Fri, 22 Jan 2021 02:44:12 -0800 Subject: [PATCH 01/16] strict dependency checking for sdks/io/gcp --- .../io/google-cloud-platform/build.gradle | 38 ++++++++++--------- .../expansion-service/build.gradle | 3 +- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 7ac6878eae80..3a8fd50c3fa4 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -20,7 +20,7 @@ import groovy.json.JsonOutput plugins { id 'org.apache.beam.module' } applyJavaNature( - + //enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.gcp', enableSpotbugs: false, ) @@ -31,7 +31,7 @@ ext.summary = "IO library to read and write Google Cloud Platform systems from B dependencies { compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile project(path: ":sdks:java:core", configuration: "shadow") - compile project(":sdks:java:expansion-service") + testCompile project(":sdks:java:expansion-service") compile project(":sdks:java:extensions:google-cloud-platform-core") compile project(":sdks:java:extensions:protobuf") compile library.java.avro @@ -50,9 +50,6 @@ dependencies { exclude group: 'io.grpc', module: 'grpc-grpclb' } compile library.java.google_cloud_core - compile(library.java.google_cloud_core_grpc) { - exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version - } compile library.java.google_cloud_datastore_v1_proto_client compile library.java.google_cloud_pubsublite // GCP PubSub client is used in TestPubSub @@ -60,32 +57,40 @@ dependencies { compile library.java.google_cloud_spanner compile library.java.google_http_client compile library.java.google_http_client_jackson2 - compile library.java.grpc_alts compile library.java.grpc_auth - compile library.java.grpc_core - compile library.java.grpc_context - compile library.java.grpc_grpclb + testImplementation 'io.grpc:grpc-core:1.27.2' compile library.java.grpc_netty - compile library.java.grpc_netty_shaded - compile library.java.grpc_stub compile library.java.grpc_google_cloud_pubsub_v1 - compile library.java.grpc_google_cloud_pubsublite_v1 compile library.java.guava - compile library.java.hamcrest_core compile library.java.jackson_databind compile library.java.joda_time compile library.java.junit compile library.java.netty_handler - compile library.java.netty_tcnative_boringssl_static - compile library.java.proto_google_cloud_bigquery_storage_v1beta1 compile library.java.proto_google_cloud_bigtable_v2 compile library.java.proto_google_cloud_datastore_v1 compile library.java.proto_google_cloud_pubsub_v1 compile library.java.proto_google_cloud_pubsublite_v1 - compile library.java.proto_google_cloud_spanner_admin_database_v1 compile library.java.proto_google_common_protos compile library.java.protobuf_java compile library.java.slf4j_api + compile "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0" + compile "com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0" + compile "com.google.api.grpc:proto-google-cloud-spanner-v1:1.59.0" + compile "com.google.api:api-common:1.8.1" + compile "com.google.apis:google-api-services-storage:v1-rev20200611-1.30.10" + compile "com.google.code.gson:gson:2.8.6" + compile "com.google.errorprone:error_prone_annotations:2.3.3" + compile "com.google.protobuf:protobuf-java-util:3.11.1" + compile "io.grpc:grpc-api:1.27.2" + compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1" + compile "org.apache.httpcomponents:httpclient:4.5.12" + compile "org.apache.httpcomponents:httpcore:4.4.13" + compile "org.checkerframework:checker-qual:2.0.0" + compile library.java.jackson_core + compile "org.hamcrest:hamcrest:2.1" + compile "org.threeten:threetenbp:1.4.4" + compile "org.apache.beam:beam-vendor-grpc-1_26_0:0.3" + compile project(path: ":model:pipeline", configuration: "shadow") testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntime") testCompile project(path: ":runners:direct-java", configuration: "shadow") @@ -93,7 +98,6 @@ dependencies { testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") // For testing Cross-language transforms testCompile project(":runners:core-construction-java") - testCompile library.java.hamcrest_library testCompile library.java.mockito_core testCompile library.java.powermock testCompile library.java.powermock_mockito diff --git a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle index 2d1799762761..9a1bd41084e4 100644 --- a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle +++ b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle @@ -21,6 +21,7 @@ apply plugin: 'application' mainClassName = "org.apache.beam.sdk.expansion.service.ExpansionService" applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.gcp.expansion.service', exportJavadoc: false, validateShadowJar: false, @@ -31,7 +32,5 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform :: Exp ext.summary = "Expansion service serving GCP Java IOs" dependencies { - compile project(":sdks:java:expansion-service") - compile project(":sdks:java:io:google-cloud-platform") runtime library.java.slf4j_jdk14 } From b3639e35c43fa1de973ae441e356aa9a3dc78a15 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 27 Jan 2021 05:05:07 -0800 Subject: [PATCH 02/16] add compile(runners:core-java) since it was usedUndeclared --- sdks/java/io/google-cloud-platform/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 3a8fd50c3fa4..b36e06d00319 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -20,7 +20,7 @@ import groovy.json.JsonOutput plugins { id 'org.apache.beam.module' } applyJavaNature( - //enableStrictDependencies:true, + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.gcp', enableSpotbugs: false, ) @@ -91,6 +91,7 @@ dependencies { compile "org.threeten:threetenbp:1.4.4" compile "org.apache.beam:beam-vendor-grpc-1_26_0:0.3" compile project(path: ":model:pipeline", configuration: "shadow") + compile project(":runners:core-java") testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntime") testCompile project(path: ":runners:direct-java", configuration: "shadow") From 89e3567c5e4b8b0f4178b5ed20ba4f94bee1dbe2 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 27 Jan 2021 17:39:04 -0800 Subject: [PATCH 03/16] [BEAM-10961] suggested changes: better use of existing library variables, remove testImplementation line --- .../beam/gradle/BeamModulePlugin.groovy | 1 + .../io/google-cloud-platform/build.gradle | 29 ++++++++++--------- 2 files changed, 16 insertions(+), 14 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 c70c405ae62f..c444aecedc88 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -566,6 +566,7 @@ class BeamModulePlugin implements Plugin { hadoop_minicluster : "org.apache.hadoop:hadoop-minicluster:$hadoop_version", hadoop_hdfs : "org.apache.hadoop:hadoop-hdfs:$hadoop_version", hadoop_hdfs_tests : "org.apache.hadoop:hadoop-hdfs:$hadoop_version:tests", + hamcrest : "org.hamcrest:hamcrest:$hamcrest_version", hamcrest_core : "org.hamcrest:hamcrest-core:$hamcrest_version", hamcrest_library : "org.hamcrest:hamcrest-library:$hamcrest_version", http_client : "org.apache.httpcomponents:httpclient:$httpclient_version", diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index b36e06d00319..806999249a12 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -36,12 +36,15 @@ dependencies { compile project(":sdks:java:extensions:protobuf") compile library.java.avro compile library.java.bigdataoss_util + compile library.java.error_prone_annotations compile library.java.gax compile library.java.gax_grpc compile library.java.google_api_client + compile library.java.google_api_common compile library.java.google_api_services_bigquery compile library.java.google_api_services_healthcare compile library.java.google_api_services_pubsub + compile library.java.google_api_services_storage compile library.java.google_auth_library_credentials compile library.java.google_auth_library_oauth2_http compile library.java.google_cloud_bigquery_storage @@ -55,13 +58,18 @@ dependencies { // GCP PubSub client is used in TestPubSub compile library.java.google_cloud_pubsub compile library.java.google_cloud_spanner + compile library.java.google_code_gson compile library.java.google_http_client compile library.java.google_http_client_jackson2 + compile library.java.grpc_api compile library.java.grpc_auth - testImplementation 'io.grpc:grpc-core:1.27.2' compile library.java.grpc_netty compile library.java.grpc_google_cloud_pubsub_v1 compile library.java.guava + compile library.java.hamcrest + compile library.java.http_client + compile library.java.http_core + compile library.java.jackson_core compile library.java.jackson_databind compile library.java.joda_time compile library.java.junit @@ -72,26 +80,19 @@ dependencies { compile library.java.proto_google_cloud_pubsublite_v1 compile library.java.proto_google_common_protos 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_guava_26_0_jre + compile "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0" compile "com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0" compile "com.google.api.grpc:proto-google-cloud-spanner-v1:1.59.0" - compile "com.google.api:api-common:1.8.1" - compile "com.google.apis:google-api-services-storage:v1-rev20200611-1.30.10" - compile "com.google.code.gson:gson:2.8.6" - compile "com.google.errorprone:error_prone_annotations:2.3.3" - compile "com.google.protobuf:protobuf-java-util:3.11.1" - compile "io.grpc:grpc-api:1.27.2" - compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1" - compile "org.apache.httpcomponents:httpclient:4.5.12" - compile "org.apache.httpcomponents:httpcore:4.4.13" - compile "org.checkerframework:checker-qual:2.0.0" - compile library.java.jackson_core - compile "org.hamcrest:hamcrest:2.1" compile "org.threeten:threetenbp:1.4.4" - compile "org.apache.beam:beam-vendor-grpc-1_26_0:0.3" + compile project(path: ":model:pipeline", configuration: "shadow") compile project(":runners:core-java") + testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntime") testCompile project(path: ":runners:direct-java", configuration: "shadow") From a556379080ecb4d1a6f4b63bc662398bfff9105f Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 27 Jan 2021 20:36:39 -0800 Subject: [PATCH 04/16] reintroduce some dependencies but as runtimeOnly --- .../io/google-cloud-platform/expansion-service/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle index 9a1bd41084e4..fc33d91fe298 100644 --- a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle +++ b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle @@ -32,5 +32,7 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform :: Exp ext.summary = "Expansion service serving GCP Java IOs" dependencies { + runtimeOnly project(":sdks:java:expansion-service") + runtimeOnly project(":sdks:java:io:google-cloud-platform") runtime library.java.slf4j_jdk14 } From b06b9f129f113c08eddc3c1caa838756ba55a3c4 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 27 Jan 2021 20:40:30 -0800 Subject: [PATCH 05/16] remove stray space --- .../io/google-cloud-platform/expansion-service/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle index fc33d91fe298..15ad8efd623a 100644 --- a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle +++ b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle @@ -33,6 +33,6 @@ ext.summary = "Expansion service serving GCP Java IOs" dependencies { runtimeOnly project(":sdks:java:expansion-service") - runtimeOnly project(":sdks:java:io:google-cloud-platform") + runtimeOnly project(":sdks:java:io:google-cloud-platform") runtime library.java.slf4j_jdk14 } From bef61dfe4f6344c53516b6895443da97eb311ace Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sat, 6 Feb 2021 05:19:34 -0800 Subject: [PATCH 06/16] [BEAM-10961] create variables for some grpc libraries --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 3 +++ sdks/java/io/google-cloud-platform/build.gradle | 6 +++--- 2 files changed, 6 insertions(+), 3 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 c444aecedc88..ac414af8633e 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -601,11 +601,14 @@ class BeamModulePlugin implements Plugin { powermock_mockito : "org.powermock:powermock-api-mockito2:$powermock_version", protobuf_java : "com.google.protobuf:protobuf-java:$protobuf_version", protobuf_java_util : "com.google.protobuf:protobuf-java-util:$protobuf_version", + proto_google_cloud_bigquery_storage_v1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1", // google_cloud_platform_libraries_bom sets version proto_google_cloud_bigquery_storage_v1beta1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1", // google_cloud_platform_libraries_bom sets version + proto_google_cloud_bigtable_admin_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-admin-v2", // google_cloud_platform_libraries_bom sets version proto_google_cloud_bigtable_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-v2", // google_cloud_platform_libraries_bom sets version proto_google_cloud_datastore_v1 : "com.google.api.grpc:proto-google-cloud-datastore-v1", // google_cloud_platform_libraries_bom sets version proto_google_cloud_pubsub_v1 : "com.google.api.grpc:proto-google-cloud-pubsub-v1", // google_cloud_platform_libraries_bom sets version proto_google_cloud_pubsublite_v1 : "com.google.api.grpc:proto-google-cloud-pubsublite-v1:$google_cloud_pubsublite_version", + proto_google_cloud_spanner_v1: "com.google.api.grpc:proto-google-cloud-spanner-v1", // google_cloud_platform_libraries_bom sets version proto_google_cloud_spanner_admin_database_v1: "com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1", // google_cloud_platform_libraries_bom sets version proto_google_common_protos : "com.google.api.grpc:proto-google-common-protos", // google_cloud_platform_libraries_bom sets version slf4j_api : "org.slf4j:slf4j-api:$slf4j_version", diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 806999249a12..baf475ae61f6 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -85,9 +85,9 @@ dependencies { compile library.java.vendored_grpc_1_26_0 compile library.java.vendored_guava_26_0_jre - compile "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1:0.90.0" - compile "com.google.api.grpc:proto-google-cloud-bigtable-admin-v2:1.14.0" - compile "com.google.api.grpc:proto-google-cloud-spanner-v1:1.59.0" + compile library.java.proto_google_cloud_bigquery_storage_v1 + compile library.java.proto_google_cloud_bigtable_admin_v2 + compile library.java.proto_google_cloud_spanner_v1 compile "org.threeten:threetenbp:1.4.4" compile project(path: ":model:pipeline", configuration: "shadow") From 8fcd7464c13b6670796bad5c7a0eb0bb1aeed13d Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sat, 6 Feb 2021 05:55:59 -0800 Subject: [PATCH 07/16] [BEAM-10961] add back compile+permitUnusedDeclared lines --- .../io/google-cloud-platform/build.gradle | 41 ++++++++++++++++--- .../expansion-service/build.gradle | 6 ++- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index baf475ae61f6..379078fd7401 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -20,7 +20,7 @@ import groovy.json.JsonOutput plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, +// enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.gcp', enableSpotbugs: false, ) @@ -28,10 +28,16 @@ applyJavaNature( description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform" ext.summary = "IO library to read and write Google Cloud Platform systems from Beam." +// Needed to add permitUnusedDeclared (to pair with compile lines) due to BEAM-11732. +// These lines should be removed. See https://issues.apache.org/jira/browse/BEAM-11761 +// Some permitUnusedDeclared lines that were intended to be addded needed to be commented out +// because of build errors when running: gradlew analyzeDependencies + dependencies { compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile project(path: ":sdks:java:core", configuration: "shadow") - testCompile project(":sdks:java:expansion-service") + compile project(":sdks:java:expansion-service") + permitUnusedDeclared project(":sdks:java:expansion-service") compile project(":sdks:java:extensions:google-cloud-platform-core") compile project(":sdks:java:extensions:protobuf") compile library.java.avro @@ -53,6 +59,9 @@ dependencies { exclude group: 'io.grpc', module: 'grpc-grpclb' } compile library.java.google_cloud_core + compile(library.java.google_cloud_core_grpc) { + exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version + } compile library.java.google_cloud_datastore_v1_proto_client compile library.java.google_cloud_pubsublite // GCP PubSub client is used in TestPubSub @@ -61,23 +70,48 @@ dependencies { compile library.java.google_code_gson compile library.java.google_http_client compile library.java.google_http_client_jackson2 + compile library.java.grpc_alts + //permitUnusedDeclared library.java.grpc_alts compile library.java.grpc_api compile library.java.grpc_auth + compile library.java.grpc_core + //permitUnusedDeclared library.java.grpc_core + compile library.java.grpc_context + //permitUnusedDeclared library.java.grpc_context + compile library.java.grpc_grpclb + //permitUnusedDeclared library.java.grpc_grpclb compile library.java.grpc_netty + compile library.java.grpc_netty_shaded + //permitUnusedDeclared library.java.grpc_netty_shaded + compile library.java.grpc_stub + //permitUnusedDeclared library.java.grpc_stub compile library.java.grpc_google_cloud_pubsub_v1 + compile library.java.grpc_google_cloud_pubsublite_v1 + permitUnusedDeclared library.java.grpc_google_cloud_pubsublite_v1 compile library.java.guava compile library.java.hamcrest compile library.java.http_client + compile library.java.hamcrest_core + permitUnusedDeclared library.java.hamcrest_core compile library.java.http_core compile library.java.jackson_core compile library.java.jackson_databind compile library.java.joda_time compile library.java.junit compile library.java.netty_handler + compile library.java.netty_tcnative_boringssl_static + permitUnusedDeclared library.java.netty_tcnative_boringssl_static + compile library.java.proto_google_cloud_bigquery_storage_v1 + compile library.java.proto_google_cloud_bigquery_storage_v1beta1 +// permitUnusedDeclared library.java.proto_google_cloud_bigquery_storage_v1beta1 + compile library.java.proto_google_cloud_bigtable_admin_v2 compile library.java.proto_google_cloud_bigtable_v2 compile library.java.proto_google_cloud_datastore_v1 compile library.java.proto_google_cloud_pubsub_v1 compile library.java.proto_google_cloud_pubsublite_v1 + compile library.java.proto_google_cloud_spanner_admin_database_v1 +// permitUnusedDeclared library.java.proto_google_cloud_spanner_admin_database_v1 + compile library.java.proto_google_cloud_spanner_v1 compile library.java.proto_google_common_protos compile library.java.protobuf_java compile library.java.protobuf_java_util @@ -85,9 +119,6 @@ dependencies { compile library.java.vendored_grpc_1_26_0 compile library.java.vendored_guava_26_0_jre - compile library.java.proto_google_cloud_bigquery_storage_v1 - compile library.java.proto_google_cloud_bigtable_admin_v2 - compile library.java.proto_google_cloud_spanner_v1 compile "org.threeten:threetenbp:1.4.4" compile project(path: ":model:pipeline", configuration: "shadow") diff --git a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle index 15ad8efd623a..87655fd03ad9 100644 --- a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle +++ b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle @@ -32,7 +32,9 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform :: Exp ext.summary = "Expansion service serving GCP Java IOs" dependencies { - runtimeOnly project(":sdks:java:expansion-service") - runtimeOnly project(":sdks:java:io:google-cloud-platform") + compile project(":sdks:java:expansion-service") + permitUnusedDeclared project(":sdks:java:expansion-service") + compile project(":sdks:java:io:google-cloud-platform") + permitUnusedDeclared project(":sdks:java:io:google-cloud-platform") runtime library.java.slf4j_jdk14 } From 6346e90d60a77f9ec8892a7e5dcd3b113790d79d Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sat, 6 Feb 2021 06:03:57 -0800 Subject: [PATCH 08/16] [BEAM-10961] fix whitespace in comment block and uncomment enableStrictDependencies=true --- sdks/java/io/google-cloud-platform/build.gradle | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 379078fd7401..984b091d8f0e 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -20,7 +20,7 @@ import groovy.json.JsonOutput plugins { id 'org.apache.beam.module' } applyJavaNature( -// enableStrictDependencies:true, + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.gcp', enableSpotbugs: false, ) @@ -28,10 +28,11 @@ applyJavaNature( description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform" ext.summary = "IO library to read and write Google Cloud Platform systems from Beam." -// Needed to add permitUnusedDeclared (to pair with compile lines) due to BEAM-11732. -// These lines should be removed. See https://issues.apache.org/jira/browse/BEAM-11761 -// Some permitUnusedDeclared lines that were intended to be addded needed to be commented out -// because of build errors when running: gradlew analyzeDependencies +/* Needed to add permitUnusedDeclared (to pair with compile lines) due to BEAM-11732. + * These lines should be removed. See https://issues.apache.org/jira/browse/BEAM-11761 + * Some permitUnusedDeclared lines that were intended to be addded needed to be commented out + * because of build errors when running: gradlew analyzeDependencies + */ dependencies { compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) From 7604e0cf3cde374e3548b2159bd8e7caae216623 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sat, 6 Feb 2021 06:18:16 -0800 Subject: [PATCH 09/16] [BEAM-10961] uncomment out permitUnusedDeclared - to show error in PR --- .../java/io/google-cloud-platform/build.gradle | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 984b091d8f0e..43a6096bf6b9 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -30,8 +30,6 @@ ext.summary = "IO library to read and write Google Cloud Platform systems from B /* Needed to add permitUnusedDeclared (to pair with compile lines) due to BEAM-11732. * These lines should be removed. See https://issues.apache.org/jira/browse/BEAM-11761 - * Some permitUnusedDeclared lines that were intended to be addded needed to be commented out - * because of build errors when running: gradlew analyzeDependencies */ dependencies { @@ -72,20 +70,20 @@ dependencies { compile library.java.google_http_client compile library.java.google_http_client_jackson2 compile library.java.grpc_alts - //permitUnusedDeclared library.java.grpc_alts + permitUnusedDeclared library.java.grpc_alts compile library.java.grpc_api compile library.java.grpc_auth compile library.java.grpc_core - //permitUnusedDeclared library.java.grpc_core + permitUnusedDeclared library.java.grpc_core compile library.java.grpc_context - //permitUnusedDeclared library.java.grpc_context + permitUnusedDeclared library.java.grpc_context compile library.java.grpc_grpclb - //permitUnusedDeclared library.java.grpc_grpclb + permitUnusedDeclared library.java.grpc_grpclb compile library.java.grpc_netty compile library.java.grpc_netty_shaded - //permitUnusedDeclared library.java.grpc_netty_shaded + permitUnusedDeclared library.java.grpc_netty_shaded compile library.java.grpc_stub - //permitUnusedDeclared library.java.grpc_stub + permitUnusedDeclared library.java.grpc_stub compile library.java.grpc_google_cloud_pubsub_v1 compile library.java.grpc_google_cloud_pubsublite_v1 permitUnusedDeclared library.java.grpc_google_cloud_pubsublite_v1 @@ -104,14 +102,14 @@ dependencies { permitUnusedDeclared library.java.netty_tcnative_boringssl_static compile library.java.proto_google_cloud_bigquery_storage_v1 compile library.java.proto_google_cloud_bigquery_storage_v1beta1 -// permitUnusedDeclared library.java.proto_google_cloud_bigquery_storage_v1beta1 + permitUnusedDeclared library.java.proto_google_cloud_bigquery_storage_v1beta1 compile library.java.proto_google_cloud_bigtable_admin_v2 compile library.java.proto_google_cloud_bigtable_v2 compile library.java.proto_google_cloud_datastore_v1 compile library.java.proto_google_cloud_pubsub_v1 compile library.java.proto_google_cloud_pubsublite_v1 compile library.java.proto_google_cloud_spanner_admin_database_v1 -// permitUnusedDeclared library.java.proto_google_cloud_spanner_admin_database_v1 + permitUnusedDeclared library.java.proto_google_cloud_spanner_admin_database_v1 compile library.java.proto_google_cloud_spanner_v1 compile library.java.proto_google_common_protos compile library.java.protobuf_java From 226969b4be83d366c1cf2ed946605f6632cc8206 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sat, 6 Feb 2021 06:23:36 -0800 Subject: [PATCH 10/16] remove trailing whitespace --- sdks/java/io/google-cloud-platform/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 43a6096bf6b9..440c44654365 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -29,7 +29,7 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform" ext.summary = "IO library to read and write Google Cloud Platform systems from Beam." /* Needed to add permitUnusedDeclared (to pair with compile lines) due to BEAM-11732. - * These lines should be removed. See https://issues.apache.org/jira/browse/BEAM-11761 + * These lines should be removed. See https://issues.apache.org/jira/browse/BEAM-11761 */ dependencies { From 9b13f14fc5e08d71d220486fc9ec793910402386 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sat, 6 Feb 2021 06:53:37 -0800 Subject: [PATCH 11/16] [BEAM-10961] hardcode dependency in permitUnusedDeclared lines --- sdks/java/io/google-cloud-platform/build.gradle | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 440c44654365..5feeef15ecc2 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -61,6 +61,7 @@ dependencies { compile(library.java.google_cloud_core_grpc) { exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version } + permitUnusedDeclared "com.google.cloud:google-cloud-core-grpc:1.93.9" compile library.java.google_cloud_datastore_v1_proto_client compile library.java.google_cloud_pubsublite // GCP PubSub client is used in TestPubSub @@ -70,20 +71,20 @@ dependencies { compile library.java.google_http_client compile library.java.google_http_client_jackson2 compile library.java.grpc_alts - permitUnusedDeclared library.java.grpc_alts + permitUnusedDeclared "io.grpc:grpc-alts:1.32.2" compile library.java.grpc_api compile library.java.grpc_auth compile library.java.grpc_core - permitUnusedDeclared library.java.grpc_core + permitUnusedDeclared "io.grpc:grpc-core:1.32.2" compile library.java.grpc_context - permitUnusedDeclared library.java.grpc_context + permitUnusedDeclared "io.grpc:grpc-context:1.32.2" compile library.java.grpc_grpclb - permitUnusedDeclared library.java.grpc_grpclb + permitUnusedDeclared "io.grpc:grpc-grpclb:1.32.2" compile library.java.grpc_netty compile library.java.grpc_netty_shaded - permitUnusedDeclared library.java.grpc_netty_shaded + permitUnusedDeclared "io.grpc:grpc-netty-shaded:1.32.2" compile library.java.grpc_stub - permitUnusedDeclared library.java.grpc_stub + permitUnusedDeclared "io.grpc:grpc-stub:1.32.2" compile library.java.grpc_google_cloud_pubsub_v1 compile library.java.grpc_google_cloud_pubsublite_v1 permitUnusedDeclared library.java.grpc_google_cloud_pubsublite_v1 @@ -102,14 +103,14 @@ dependencies { permitUnusedDeclared library.java.netty_tcnative_boringssl_static compile library.java.proto_google_cloud_bigquery_storage_v1 compile library.java.proto_google_cloud_bigquery_storage_v1beta1 - permitUnusedDeclared library.java.proto_google_cloud_bigquery_storage_v1beta1 + permitUnusedDeclared "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5" compile library.java.proto_google_cloud_bigtable_admin_v2 compile library.java.proto_google_cloud_bigtable_v2 compile library.java.proto_google_cloud_datastore_v1 compile library.java.proto_google_cloud_pubsub_v1 compile library.java.proto_google_cloud_pubsublite_v1 compile library.java.proto_google_cloud_spanner_admin_database_v1 - permitUnusedDeclared library.java.proto_google_cloud_spanner_admin_database_v1 + permitUnusedDeclared "com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2" compile library.java.proto_google_cloud_spanner_v1 compile library.java.proto_google_common_protos compile library.java.protobuf_java From 3d089961bcf2c2c014adb01348cf5f658534d8b9 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sat, 13 Feb 2021 00:40:05 -0800 Subject: [PATCH 12/16] [BEAM-10961] make commenting for BEAM-11761 consistent with other PRs --- .../io/google-cloud-platform/build.gradle | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 5feeef15ecc2..4d3273ce2759 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -28,15 +28,11 @@ applyJavaNature( description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform" ext.summary = "IO library to read and write Google Cloud Platform systems from Beam." -/* Needed to add permitUnusedDeclared (to pair with compile lines) due to BEAM-11732. - * These lines should be removed. See https://issues.apache.org/jira/browse/BEAM-11761 - */ - dependencies { compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:expansion-service") - permitUnusedDeclared project(":sdks:java:expansion-service") + permitUnusedDeclared project(":sdks:java:expansion-service") // BEAM-11761 compile project(":sdks:java:extensions:google-cloud-platform-core") compile project(":sdks:java:extensions:protobuf") compile library.java.avro @@ -61,7 +57,7 @@ dependencies { compile(library.java.google_cloud_core_grpc) { exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version } - permitUnusedDeclared "com.google.cloud:google-cloud-core-grpc:1.93.9" + permitUnusedDeclared "com.google.cloud:google-cloud-core-grpc:1.93.9" // BEAM-11761 compile library.java.google_cloud_datastore_v1_proto_client compile library.java.google_cloud_pubsublite // GCP PubSub client is used in TestPubSub @@ -71,28 +67,28 @@ dependencies { compile library.java.google_http_client compile library.java.google_http_client_jackson2 compile library.java.grpc_alts - permitUnusedDeclared "io.grpc:grpc-alts:1.32.2" + permitUnusedDeclared "io.grpc:grpc-alts:1.32.2" // BEAM-11761 compile library.java.grpc_api compile library.java.grpc_auth compile library.java.grpc_core - permitUnusedDeclared "io.grpc:grpc-core:1.32.2" + permitUnusedDeclared "io.grpc:grpc-core:1.32.2" // BEAM-11761 compile library.java.grpc_context - permitUnusedDeclared "io.grpc:grpc-context:1.32.2" + permitUnusedDeclared "io.grpc:grpc-context:1.32.2" // BEAM-11761 compile library.java.grpc_grpclb - permitUnusedDeclared "io.grpc:grpc-grpclb:1.32.2" + permitUnusedDeclared "io.grpc:grpc-grpclb:1.32.2" // BEAM-11761 compile library.java.grpc_netty compile library.java.grpc_netty_shaded - permitUnusedDeclared "io.grpc:grpc-netty-shaded:1.32.2" + permitUnusedDeclared "io.grpc:grpc-netty-shaded:1.32.2" // BEAM-11761 compile library.java.grpc_stub - permitUnusedDeclared "io.grpc:grpc-stub:1.32.2" + permitUnusedDeclared "io.grpc:grpc-stub:1.32.2" // BEAM-11761 compile library.java.grpc_google_cloud_pubsub_v1 compile library.java.grpc_google_cloud_pubsublite_v1 - permitUnusedDeclared library.java.grpc_google_cloud_pubsublite_v1 + permitUnusedDeclared library.java.grpc_google_cloud_pubsublite_v1 // BEAM-11761 compile library.java.guava compile library.java.hamcrest compile library.java.http_client compile library.java.hamcrest_core - permitUnusedDeclared library.java.hamcrest_core + permitUnusedDeclared library.java.hamcrest_core // BEAM-11761 compile library.java.http_core compile library.java.jackson_core compile library.java.jackson_databind @@ -100,17 +96,17 @@ dependencies { compile library.java.junit compile library.java.netty_handler compile library.java.netty_tcnative_boringssl_static - permitUnusedDeclared library.java.netty_tcnative_boringssl_static + permitUnusedDeclared library.java.netty_tcnative_boringssl_static // BEAM-11761 compile library.java.proto_google_cloud_bigquery_storage_v1 compile library.java.proto_google_cloud_bigquery_storage_v1beta1 - permitUnusedDeclared "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5" + permitUnusedDeclared "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5" // BEAM-11761 compile library.java.proto_google_cloud_bigtable_admin_v2 compile library.java.proto_google_cloud_bigtable_v2 compile library.java.proto_google_cloud_datastore_v1 compile library.java.proto_google_cloud_pubsub_v1 compile library.java.proto_google_cloud_pubsublite_v1 compile library.java.proto_google_cloud_spanner_admin_database_v1 - permitUnusedDeclared "com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2" + permitUnusedDeclared "com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2" // BEAM-11761 compile library.java.proto_google_cloud_spanner_v1 compile library.java.proto_google_common_protos compile library.java.protobuf_java From 09525a1a2899895ec0285e92da97ca3a22b15ebe Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 17 Feb 2021 19:35:44 -0800 Subject: [PATCH 13/16] [BEAM-10961] use enforcedPlatform dependency to allow permitUnusedDeclared to support library.java.* variables --- .../io/google-cloud-platform/build.gradle | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 4d3273ce2759..0cb3cb4d41a5 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -30,6 +30,7 @@ ext.summary = "IO library to read and write Google Cloud Platform systems from B dependencies { compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) + permitUnusedDeclared enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:expansion-service") permitUnusedDeclared project(":sdks:java:expansion-service") // BEAM-11761 @@ -57,7 +58,7 @@ dependencies { compile(library.java.google_cloud_core_grpc) { exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version } - permitUnusedDeclared "com.google.cloud:google-cloud-core-grpc:1.93.9" // BEAM-11761 + permitUnusedDeclared library.java.google_cloud_core_grpc // BEAM-11761 compile library.java.google_cloud_datastore_v1_proto_client compile library.java.google_cloud_pubsublite // GCP PubSub client is used in TestPubSub @@ -67,20 +68,20 @@ dependencies { compile library.java.google_http_client compile library.java.google_http_client_jackson2 compile library.java.grpc_alts - permitUnusedDeclared "io.grpc:grpc-alts:1.32.2" // BEAM-11761 + permitUnusedDeclared library.java.grpc_alts // BEAM-11761 compile library.java.grpc_api compile library.java.grpc_auth compile library.java.grpc_core - permitUnusedDeclared "io.grpc:grpc-core:1.32.2" // BEAM-11761 + permitUnusedDeclared library.java.grpc_core // BEAM-11761 compile library.java.grpc_context - permitUnusedDeclared "io.grpc:grpc-context:1.32.2" // BEAM-11761 + permitUnusedDeclared library.java.grpc_context // BEAM-11761 compile library.java.grpc_grpclb - permitUnusedDeclared "io.grpc:grpc-grpclb:1.32.2" // BEAM-11761 + permitUnusedDeclared library.java.grpc_grpclb // BEAM-11761 compile library.java.grpc_netty compile library.java.grpc_netty_shaded - permitUnusedDeclared "io.grpc:grpc-netty-shaded:1.32.2" // BEAM-11761 + permitUnusedDeclared library.java.grpc_netty_shaded // BEAM-11761 compile library.java.grpc_stub - permitUnusedDeclared "io.grpc:grpc-stub:1.32.2" // BEAM-11761 + permitUnusedDeclared library.java.grpc_stub // BEAM-11761 compile library.java.grpc_google_cloud_pubsub_v1 compile library.java.grpc_google_cloud_pubsublite_v1 permitUnusedDeclared library.java.grpc_google_cloud_pubsublite_v1 // BEAM-11761 @@ -99,14 +100,14 @@ dependencies { permitUnusedDeclared library.java.netty_tcnative_boringssl_static // BEAM-11761 compile library.java.proto_google_cloud_bigquery_storage_v1 compile library.java.proto_google_cloud_bigquery_storage_v1beta1 - permitUnusedDeclared "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.105.5" // BEAM-11761 + permitUnusedDeclared library.java.proto_google_cloud_bigquery_storage_v1beta1 // BEAM-11761 compile library.java.proto_google_cloud_bigtable_admin_v2 compile library.java.proto_google_cloud_bigtable_v2 compile library.java.proto_google_cloud_datastore_v1 compile library.java.proto_google_cloud_pubsub_v1 compile library.java.proto_google_cloud_pubsublite_v1 compile library.java.proto_google_cloud_spanner_admin_database_v1 - permitUnusedDeclared "com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:2.0.2" // BEAM-11761 + permitUnusedDeclared library.java.proto_google_cloud_spanner_admin_database_v1 // BEAM-11761 compile library.java.proto_google_cloud_spanner_v1 compile library.java.proto_google_common_protos compile library.java.protobuf_java From feac6283d03e6b90dc46349213e0532133f91438 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 24 Feb 2021 21:50:21 -0800 Subject: [PATCH 14/16] [BEAM-10961] (1) add reference to BEAM-11761 (2) fix spacing (3) permitUnusedDeclared library.java.proto_google_cloud_bigquerybeta2_storage_v1 --- sdks/java/io/google-cloud-platform/build.gradle | 3 ++- .../io/google-cloud-platform/expansion-service/build.gradle | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 9a745ceea7b6..80443a1fb530 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -20,7 +20,7 @@ import groovy.json.JsonOutput plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, + enableStrictDependencies: true, automaticModuleName: 'org.apache.beam.sdk.io.gcp', enableSpotbugs: false, ) @@ -102,6 +102,7 @@ dependencies { compile library.java.proto_google_cloud_bigquery_storage_v1beta1 permitUnusedDeclared library.java.proto_google_cloud_bigquery_storage_v1beta1 // BEAM-11761 compile library.java.proto_google_cloud_bigquerybeta2_storage_v1 + permitUnusedDeclared library.java.proto_google_cloud_bigquerybeta2_storage_v1 // BEAM-11761 compile library.java.proto_google_cloud_bigtable_admin_v2 compile library.java.proto_google_cloud_bigtable_v2 compile library.java.proto_google_cloud_datastore_v1 diff --git a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle index 87655fd03ad9..e54988327411 100644 --- a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle +++ b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'application' mainClassName = "org.apache.beam.sdk.expansion.service.ExpansionService" applyJavaNature( - enableStrictDependencies:true, + enableStrictDependencies: true, automaticModuleName: 'org.apache.beam.sdk.io.gcp.expansion.service', exportJavadoc: false, validateShadowJar: false, @@ -33,8 +33,8 @@ ext.summary = "Expansion service serving GCP Java IOs" dependencies { compile project(":sdks:java:expansion-service") - permitUnusedDeclared project(":sdks:java:expansion-service") + permitUnusedDeclared project(":sdks:java:expansion-service") // BEAM-11761 compile project(":sdks:java:io:google-cloud-platform") - permitUnusedDeclared project(":sdks:java:io:google-cloud-platform") + permitUnusedDeclared project(":sdks:java:io:google-cloud-platform") // BEAM-11761 runtime library.java.slf4j_jdk14 } From 5d28a06090915442dfa6fb74d8ef2de06e67bc8e Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Thu, 25 Feb 2021 13:40:26 -0800 Subject: [PATCH 15/16] [BEAM-10961] (1) remove stray compile/permitUnusedDeclared pair added earlier (2) group compile project() declarations --- sdks/java/io/google-cloud-platform/build.gradle | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 80443a1fb530..09deb85faccf 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -31,6 +31,8 @@ ext.summary = "IO library to read and write Google Cloud Platform systems from B dependencies { compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) permitUnusedDeclared enforcedPlatform(library.java.google_cloud_platform_libraries_bom) + compile project(path: ":model:pipeline", configuration: "shadow") + compile project(":runners:core-java") compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:expansion-service") permitUnusedDeclared project(":sdks:java:expansion-service") // BEAM-11761 @@ -99,8 +101,6 @@ dependencies { compile library.java.netty_tcnative_boringssl_static permitUnusedDeclared library.java.netty_tcnative_boringssl_static // BEAM-11761 compile library.java.proto_google_cloud_bigquery_storage_v1 - compile library.java.proto_google_cloud_bigquery_storage_v1beta1 - permitUnusedDeclared library.java.proto_google_cloud_bigquery_storage_v1beta1 // BEAM-11761 compile library.java.proto_google_cloud_bigquerybeta2_storage_v1 permitUnusedDeclared library.java.proto_google_cloud_bigquerybeta2_storage_v1 // BEAM-11761 compile library.java.proto_google_cloud_bigtable_admin_v2 @@ -120,9 +120,6 @@ dependencies { compile "org.threeten:threetenbp:1.4.4" - compile project(path: ":model:pipeline", configuration: "shadow") - compile project(":runners:core-java") - testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntime") testCompile project(path: ":runners:direct-java", configuration: "shadow") From 2187c9ab25f09f297d906a8058843484092be952 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Thu, 25 Feb 2021 14:25:01 -0800 Subject: [PATCH 16/16] [BEAM-10961] remove proto_google_cloud_bigquery_storage_v1beta1 --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 1 - 1 file changed, 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 8734f63ff744..f60fe8f30bf5 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -602,7 +602,6 @@ class BeamModulePlugin implements Plugin { protobuf_java : "com.google.protobuf:protobuf-java:$protobuf_version", protobuf_java_util : "com.google.protobuf:protobuf-java-util:$protobuf_version", proto_google_cloud_bigquery_storage_v1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1", // google_cloud_platform_libraries_bom sets version - proto_google_cloud_bigquery_storage_v1beta1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1", // google_cloud_platform_libraries_bom sets version proto_google_cloud_bigquerybeta2_storage_v1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2", // google_cloud_platform_libraries_bom sets version proto_google_cloud_bigtable_admin_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-admin-v2", // google_cloud_platform_libraries_bom sets version proto_google_cloud_bigtable_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-v2", // google_cloud_platform_libraries_bom sets version