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 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 } diff --git a/sdks/java/extensions/jackson/build.gradle b/sdks/java/extensions/jackson/build.gradle index b36343c37dbe..d05ebd4845f0 100644 --- a/sdks/java/extensions/jackson/build.gradle +++ b/sdks/java/extensions/jackson/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies: true, automaticModuleName: 'org.apache.beam.sdk.extensions.jackson', archivesBaseName: 'beam-sdks-java-extensions-json-jackson' ) @@ -26,11 +27,10 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: Jackson" ext.summary = "Jackson extension provides PTransforms for deserializing and generating JSON strings." dependencies { - compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.jackson_databind - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library + compile library.java.jackson_core + compile library.java.vendored_guava_26_0_jre testCompile library.java.junit testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/extensions/join-library/build.gradle b/sdks/java/extensions/join-library/build.gradle index 1257f8f690c0..45255c3a6f8f 100644 --- a/sdks/java/extensions/join-library/build.gradle +++ b/sdks/java/extensions/join-library/build.gradle @@ -17,15 +17,16 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.joinlibrary') +applyJavaNature( + enableStrictDependencies: true, + automaticModuleName: 'org.apache.beam.sdk.extensions.joinlibrary' +) description = "Apache Beam :: SDKs :: Java :: Extensions :: Join library" dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/extensions/kryo/build.gradle b/sdks/java/extensions/kryo/build.gradle index 50a2ae54d685..8cedc0e4697e 100644 --- a/sdks/java/extensions/kryo/build.gradle +++ b/sdks/java/extensions/kryo/build.gradle @@ -23,6 +23,7 @@ ext { } applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.kryo', + enableStrictDependencies: true, exportJavadoc: false, shadowClosure: { dependencies { @@ -39,7 +40,10 @@ applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.kryo', description = 'Apache Beam :: SDKs :: Java :: Extensions :: Kryo' dependencies { + compile library.java.jackson_annotations + compile library.java.vendored_guava_26_0_jre compile "com.esotericsoftware:kryo:${kryoVersion}" + compile "org.objenesis:objenesis:2.5.1" shadow project(path: ':sdks:java:core', configuration: 'shadow') testCompile project(path: ':sdks:java:core', configuration: 'shadowTest') testRuntimeOnly project(path: ':runners:direct-java', configuration: 'shadow') diff --git a/sdks/java/extensions/ml/build.gradle b/sdks/java/extensions/ml/build.gradle index d7ab4caabb5e..c6fd78e3daf0 100644 --- a/sdks/java/extensions/ml/build.gradle +++ b/sdks/java/extensions/ml/build.gradle @@ -21,25 +21,33 @@ import groovy.json.JsonOutput */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.ml') +applyJavaNature( + enableStrictDependencies: true, + automaticModuleName: 'org.apache.beam.sdk.extensions.ml' +) description = 'Apache Beam :: SDKs :: Java :: Extensions :: ML' dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:expansion-service") + permitUnusedDeclared project(":sdks:java:expansion-service") // BEAM-11761 compile 'com.google.cloud:google-cloud-video-intelligence:1.2.0' compile 'com.google.cloud:google-cloud-dlp:1.1.4' compile 'com.google.cloud:google-cloud-language:1.99.4' + compile 'com.google.api.grpc:proto-google-cloud-dlp-v2:1.1.4' + compile 'com.google.api.grpc:proto-google-cloud-language-v1:1.81.4' + compile 'com.google.api.grpc:proto-google-cloud-video-intelligence-v1:1.2.0' + compile 'com.google.api.grpc:proto-google-cloud-vision-v1:1.81.3' + compile library.java.gax + compile library.java.protobuf_java + compile library.java.slf4j_api provided library.java.junit testCompile project(path: ':sdks:java:core', configuration: 'shadowTest') compile 'com.google.cloud:google-cloud-vision:1.99.3' + permitUsedUndeclared "com.google.auto.value:auto-value-annotations:1.7" testCompile library.java.mockito_core - testCompile 'com.google.cloud:google-cloud-video-intelligence:1.2.0' - testCompile 'com.google.cloud:google-cloud-dlp:1.1.4' testCompile project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntime") - testCompile 'com.google.cloud:google-cloud-language:1.99.4' - testCompile 'com.google.cloud:google-cloud-vision:1.99.3' testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") testRuntimeOnly project(":runners:google-cloud-dataflow-java") } diff --git a/sdks/java/extensions/protobuf/build.gradle b/sdks/java/extensions/protobuf/build.gradle index 1ed48f3cfc1c..377d692ae752 100644 --- a/sdks/java/extensions/protobuf/build.gradle +++ b/sdks/java/extensions/protobuf/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies: true, generatedClassPatterns: [ /^org\.apache\.beam\.sdk\.extensions\.protobuf\.PayloadMessages/, /^org\.apache\.beam\.sdk\.extensions\.protobuf\.Proto2CoderTestMessages/, @@ -33,13 +34,11 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: Protobuf" ext.summary = "Add support to Apache Beam for Google Protobuf." dependencies { - compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") + compile library.java.vendored_guava_26_0_jre compile library.java.protobuf_java + compile library.java.vendored_bytebuddy_1_10_8 testCompile project(path: ":sdks:java:core", configuration: "shadowTest") - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library - testCompile library.java.mockito_core testCompile library.java.junit testRuntimeOnly library.java.slf4j_jdk14 } diff --git a/sdks/java/extensions/schemaio-expansion-service/build.gradle b/sdks/java/extensions/schemaio-expansion-service/build.gradle index be1d37295ef5..b6a1f7ef5a23 100644 --- a/sdks/java/extensions/schemaio-expansion-service/build.gradle +++ b/sdks/java/extensions/schemaio-expansion-service/build.gradle @@ -31,11 +31,15 @@ applyJavaNature( dependencies { compile project(path: ":sdks:java:expansion-service") + permitUnusedDeclared project(path: ":sdks:java:expansion-service") compile project(":sdks:java:io:jdbc") + permitUnusedDeclared project(":sdks:java:io:jdbc") compile library.java.postgres + permitUnusedDeclared library.java.postgres + compile project(path: ":model:pipeline", configuration: "shadow") + compile project(path: ":sdks:java:core", configuration: "shadow") + compile library.java.vendored_grpc_1_26_0 + compile library.java.vendored_guava_26_0_jre testCompile library.java.junit - testCompile library.java.powermock_mockito testCompile library.java.mockito_core - // TODO(BEAM-10632): remove this dependency - testCompile "org.checkerframework:checker-qual:3.10.0" } diff --git a/sdks/java/extensions/sketching/build.gradle b/sdks/java/extensions/sketching/build.gradle index 84e6f29231ce..83a93f6167ef 100644 --- a/sdks/java/extensions/sketching/build.gradle +++ b/sdks/java/extensions/sketching/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies: true, automaticModuleName: 'org.apache.beam.sdk.extensions.sketching') description = "Apache Beam :: SDKs :: Java :: Extensions :: Sketching" @@ -30,11 +31,8 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile "com.clearspring.analytics:stream:$streamlib_version" compile "com.tdunning:t-digest:$tdigest_version" - compile library.java.slf4j_api testCompile library.java.avro testCompile project(path: ":sdks:java:core", configuration: "shadowTest") - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/extensions/sorter/build.gradle b/sdks/java/extensions/sorter/build.gradle index f6f0dc6cd0b7..52b95c62d138 100644 --- a/sdks/java/extensions/sorter/build.gradle +++ b/sdks/java/extensions/sorter/build.gradle @@ -20,6 +20,7 @@ import java.util.stream.Collectors plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies: true, automaticModuleName: 'org.apache.beam.sdk.extensions.sorter') description = "Apache Beam :: SDKs :: Java :: Extensions :: Sorter" @@ -36,10 +37,9 @@ hadoopVersions.each {kv -> configurations.create("hadoopVersion$kv.key")} dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.vendored_guava_26_0_jre + compile library.java.slf4j_api provided library.java.hadoop_mapreduce_client_core provided library.java.hadoop_common - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.mockito_core testCompile library.java.junit testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/extensions/zetasketch/build.gradle b/sdks/java/extensions/zetasketch/build.gradle index ab1f7bf7a444..4edd0c8469a5 100644 --- a/sdks/java/extensions/zetasketch/build.gradle +++ b/sdks/java/extensions/zetasketch/build.gradle @@ -20,6 +20,7 @@ import groovy.json.JsonOutput plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies: true, automaticModuleName: 'org.apache.beam.sdk.extensions.zetasketch') description = "Apache Beam :: SDKs :: Java :: Extensions :: ZetaSketch" @@ -32,6 +33,7 @@ dependencies { compile library.java.slf4j_api compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") + compile "com.google.auto.value:auto-value-annotations:1.6.3" compile "com.google.zetasketch:zetasketch:$zetasketch_version" testCompile library.java.junit testCompile project(":sdks:java:io:google-cloud-platform")