From 87b6bfe1a0d253b8a218909b6e6039a0a949ce0b Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Thu, 25 Feb 2021 11:44:52 -0800 Subject: [PATCH 1/4] [BEAM-10961] enable strict dependency checking for sdks/java/extensions/euphoria --- sdks/java/extensions/euphoria/build.gradle | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdks/java/extensions/euphoria/build.gradle b/sdks/java/extensions/euphoria/build.gradle index 92cbb6766173..1fe6c7765fb5 100644 --- a/sdks/java/extensions/euphoria/build.gradle +++ b/sdks/java/extensions/euphoria/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies: true, exportJavadoc: false, automaticModuleName: 'org.apache.beam.sdk.extensions.euphoria', ) @@ -26,7 +27,10 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: Euphoria Java 8 DSL" dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") - testCompile library.java.mockito_core + compile library.java.jackson_annotations + compile library.java.joda_time + compile library.java.slf4j_api + compile library.java.vendored_guava_26_0_jre testCompile project(":sdks:java:extensions:kryo") testCompile library.java.slf4j_api testCompile library.java.hamcrest_core From b022f56911addba4415ebd8b6fa979482ae26afd Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Thu, 25 Feb 2021 11:47:58 -0800 Subject: [PATCH 2/4] [BEAM-10961] enable strict dependency checking for sdks/java/extensions/google-cloud-platform-core --- .../google-cloud-platform-core/build.gradle | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sdks/java/extensions/google-cloud-platform-core/build.gradle b/sdks/java/extensions/google-cloud-platform-core/build.gradle index efb4d731fdad..d7661f6d372b 100644 --- a/sdks/java/extensions/google-cloud-platform-core/build.gradle +++ b/sdks/java/extensions/google-cloud-platform-core/build.gradle @@ -20,7 +20,7 @@ import groovy.json.JsonOutput plugins { id 'org.apache.beam.module' } applyJavaNature( - + enableStrictDependencies: true, automaticModuleName: 'org.apache.beam.sdk.extensions.gcp') description = "Apache Beam :: SDKs :: Java :: Extensions :: Google Cloud Platform Core" @@ -40,23 +40,25 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile project(path: ":runners:core-java") + compile library.java.bigdataoss_gcsio + compile library.java.bigdataoss_util compile library.java.google_http_client_jackson2 compile library.java.google_auth_library_oauth2_http compile library.java.google_api_client - compile library.java.bigdataoss_gcsio - compile library.java.bigdataoss_util compile library.java.google_api_services_cloudresourcemanager compile library.java.google_api_services_storage compile library.java.google_auth_library_credentials compile library.java.google_http_client - compile library.java.slf4j_api - compile library.java.joda_time + compile library.java.http_core + compile library.java.http_client compile library.java.jackson_annotations compile library.java.jackson_databind + permitUnusedDeclared library.java.jackson_databind // BEAM-11761 + compile library.java.joda_time + compile library.java.slf4j_api provided library.java.hamcrest_core provided library.java.junit testCompile project(path: ":sdks:java:core", configuration: "shadowTest") - testCompile library.java.hamcrest_library testCompile library.java.mockito_core testRuntimeOnly library.java.slf4j_jdk14 } From 04658c2f9861ad8afa246e36770da5fef813a786 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Thu, 25 Feb 2021 11:51:36 -0800 Subject: [PATCH 3/4] [BEAM-10961] undo line moves (originally intended for alphabeticization) --- .../extensions/google-cloud-platform-core/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdks/java/extensions/google-cloud-platform-core/build.gradle b/sdks/java/extensions/google-cloud-platform-core/build.gradle index d7661f6d372b..b7fe283b5897 100644 --- a/sdks/java/extensions/google-cloud-platform-core/build.gradle +++ b/sdks/java/extensions/google-cloud-platform-core/build.gradle @@ -40,22 +40,22 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile project(path: ":runners:core-java") - compile library.java.bigdataoss_gcsio - compile library.java.bigdataoss_util compile library.java.google_http_client_jackson2 compile library.java.google_auth_library_oauth2_http compile library.java.google_api_client + compile library.java.bigdataoss_gcsio + compile library.java.bigdataoss_util compile library.java.google_api_services_cloudresourcemanager compile library.java.google_api_services_storage compile library.java.google_auth_library_credentials compile library.java.google_http_client + compile library.java.slf4j_api + compile library.java.joda_time compile library.java.http_core compile library.java.http_client compile library.java.jackson_annotations compile library.java.jackson_databind permitUnusedDeclared library.java.jackson_databind // BEAM-11761 - compile library.java.joda_time - compile library.java.slf4j_api provided library.java.hamcrest_core provided library.java.junit testCompile project(path: ":sdks:java:core", configuration: "shadowTest") From 25b892f8710c3e213212490b13dfc9c7c5c09057 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Thu, 25 Feb 2021 12:40:12 -0800 Subject: [PATCH 4/4] [BEAM-10961] remove unintentionally added euphoria/build.gradle --- sdks/java/extensions/euphoria/build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sdks/java/extensions/euphoria/build.gradle b/sdks/java/extensions/euphoria/build.gradle index 1fe6c7765fb5..92cbb6766173 100644 --- a/sdks/java/extensions/euphoria/build.gradle +++ b/sdks/java/extensions/euphoria/build.gradle @@ -18,7 +18,6 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies: true, exportJavadoc: false, automaticModuleName: 'org.apache.beam.sdk.extensions.euphoria', ) @@ -27,10 +26,7 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: Euphoria Java 8 DSL" dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") - compile library.java.jackson_annotations - compile library.java.joda_time - compile library.java.slf4j_api - compile library.java.vendored_guava_26_0_jre + testCompile library.java.mockito_core testCompile project(":sdks:java:extensions:kryo") testCompile library.java.slf4j_api testCompile library.java.hamcrest_core