From 6c9550c23f1c4ae0f88b3ffecb281d81da21e970 Mon Sep 17 00:00:00 2001 From: Sonam Ramchand Date: Thu, 7 Jan 2021 13:43:22 +0500 Subject: [PATCH 1/9] Enabled strict dependency on sdks-extensions --- sdks/java/extensions/euphoria/build.gradle | 5 ++++- .../google-cloud-platform-core/build.gradle | 6 ++++-- sdks/java/extensions/jackson/build.gradle | 3 +-- sdks/java/extensions/join-library/build.gradle | 2 -- sdks/java/extensions/kryo/build.gradle | 3 +++ sdks/java/extensions/ml/build.gradle | 14 +++++++++++--- sdks/java/extensions/protobuf/build.gradle | 4 +--- .../schemaio-expansion-service/build.gradle | 11 ++++++----- sdks/java/extensions/sketching/build.gradle | 3 --- sdks/java/extensions/sorter/build.gradle | 3 +-- sdks/java/extensions/sql/build.gradle | 13 ++++++++----- sdks/java/extensions/sql/datacatalog/build.gradle | 11 +++++++++++ .../extensions/sql/expansion-service/build.gradle | 4 +++- sdks/java/extensions/sql/hcatalog/build.gradle | 1 - sdks/java/extensions/sql/jdbc/build.gradle | 7 +++---- sdks/java/extensions/sql/zetasql/build.gradle | 15 +++++++-------- sdks/java/extensions/zetasketch/build.gradle | 1 + 17 files changed, 64 insertions(+), 42 deletions(-) diff --git a/sdks/java/extensions/euphoria/build.gradle b/sdks/java/extensions/euphoria/build.gradle index 92cbb6766173..e21760fdf218 100644 --- a/sdks/java/extensions/euphoria/build.gradle +++ b/sdks/java/extensions/euphoria/build.gradle @@ -26,7 +26,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 + implementation library.java.slf4j_api + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.2' + implementation library.java.vendored_guava_26_0_jre + implementation library.java.joda_time 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..5740208743fe 100644 --- a/sdks/java/extensions/google-cloud-platform-core/build.gradle +++ b/sdks/java/extensions/google-cloud-platform-core/build.gradle @@ -36,6 +36,9 @@ test { } dependencies { + compile "org.apache.httpcomponents:httpclient:4.5.10" + compile "org.apache.httpcomponents:httpcore:4.4.12" + compile "org.checkerframework:checker-qual:2.0.0" compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") @@ -52,11 +55,10 @@ dependencies { compile library.java.slf4j_api compile library.java.joda_time compile library.java.jackson_annotations - compile library.java.jackson_databind + testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.10.2' 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..b9d218792cd9 100644 --- a/sdks/java/extensions/jackson/build.gradle +++ b/sdks/java/extensions/jackson/build.gradle @@ -29,8 +29,7 @@ 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 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..b63306aeac00 100644 --- a/sdks/java/extensions/join-library/build.gradle +++ b/sdks/java/extensions/join-library/build.gradle @@ -24,8 +24,6 @@ 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..35be1afa6fc0 100644 --- a/sdks/java/extensions/kryo/build.gradle +++ b/sdks/java/extensions/kryo/build.gradle @@ -40,6 +40,9 @@ description = 'Apache Beam :: SDKs :: Java :: Extensions :: Kryo' dependencies { compile "com.esotericsoftware:kryo:${kryoVersion}" + compile library.java.jackson_annotations + compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1" + 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..cd566183ff1c 100644 --- a/sdks/java/extensions/ml/build.gradle +++ b/sdks/java/extensions/ml/build.gradle @@ -27,18 +27,26 @@ description = 'Apache Beam :: SDKs :: Java :: Extensions :: ML' dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") - compile project(":sdks:java:expansion-service") 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 'com.google.api:gax:1.57.1' + compile 'com.google.protobuf:protobuf-java:3.11.1' + compile 'org.checkerframework:checker-qual:2.0.0' + 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' + implementation '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' + implementation '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 74882d3452ce..a37252c76bbc 100644 --- a/sdks/java/extensions/protobuf/build.gradle +++ b/sdks/java/extensions/protobuf/build.gradle @@ -35,10 +35,8 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.protobuf_java + compile "org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1" 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 4129db687b42..55d09251d712 100644 --- a/sdks/java/extensions/schemaio-expansion-service/build.gradle +++ b/sdks/java/extensions/schemaio-expansion-service/build.gradle @@ -30,12 +30,13 @@ applyJavaNature( ) dependencies { - compile project(path: ":sdks:java:expansion-service") - compile project(":sdks:java:io:jdbc") - compile 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 "org.apache.beam:beam-vendor-guava-26_0-jre:0.1" 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.5.0" -} \ No newline at end of file +} + diff --git a/sdks/java/extensions/sketching/build.gradle b/sdks/java/extensions/sketching/build.gradle index 84e6f29231ce..9a5891f1d1b3 100644 --- a/sdks/java/extensions/sketching/build.gradle +++ b/sdks/java/extensions/sketching/build.gradle @@ -30,11 +30,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..9072fec3a3fc 100644 --- a/sdks/java/extensions/sorter/build.gradle +++ b/sdks/java/extensions/sorter/build.gradle @@ -36,10 +36,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/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index 93473852ef81..53c3aa31e146 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -62,7 +62,6 @@ dependencies { fmppTask "org.freemarker:freemarker:2.3.28" fmppTemplates library.java.vendored_calcite_1_20_0 compile project(":sdks:java:core") - compile project(":sdks:java:extensions:join-library") compile project(":sdks:java:extensions:sql:udf") compile project(path: ":runners:direct-java", configuration: "shadow") compile library.java.commons_codec @@ -73,7 +72,14 @@ dependencies { compile "com.alibaba:fastjson:1.2.69" compile "org.codehaus.janino:janino:3.0.11" compile "org.codehaus.janino:commons-compiler:3.0.11" - provided "org.checkerframework:checker-qual:3.4.1" + compile library.java.jackson_core + compile library.java.vendored_guava_26_0_jre + compile "org.mongodb:mongo-java-driver:3.9.1" + compile library.java.slf4j_api + compile library.java.joda_time + compile library.java.vendored_guava_26_0_jre + compile "org.checkerframework:checker-qual:2.0.0" + permitUnusedDeclared project(":sdks:java:core") provided project(":sdks:java:io:kafka") provided project(":sdks:java:io:google-cloud-platform") compile project(":sdks:java:io:mongodb") @@ -85,9 +91,6 @@ dependencies { testCompile library.java.vendored_calcite_1_20_0 testCompile library.java.vendored_guava_26_0_jre testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library - testCompile library.java.mockito_core testCompile library.java.quickcheck_core testCompile library.java.testcontainers_kafka testCompile library.java.google_cloud_bigtable_emulator diff --git a/sdks/java/extensions/sql/datacatalog/build.gradle b/sdks/java/extensions/sql/datacatalog/build.gradle index ad1fab0bceb9..c551c5dac582 100644 --- a/sdks/java/extensions/sql/datacatalog/build.gradle +++ b/sdks/java/extensions/sql/datacatalog/build.gradle @@ -27,6 +27,15 @@ dependencies { compile(library.java.google_cloud_datacatalog_v1beta1) { exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version } + compile "com.google.api.grpc:proto-google-cloud-datacatalog-v1beta1:0.32.1" + compile "com.google.api:gax:1.57.1" + compile "com.google.auth:google-auth-library-credentials:0.19.0" + compile "org.checkerframework:checker-qual:2.0.0" + compile library.java.vendored_guava_26_0_jre + compile library.java.slf4j_api + compile project(path: ":sdks:java:core", configuration: "shadow") + compile "org.threeten:threetenbp:1.4.5" + compile library.java.protobuf_java provided project(":sdks:java:extensions:sql") // Dependencies for the example @@ -35,6 +44,8 @@ dependencies { testCompile project(":sdks:java:extensions:sql:zetasql") testRuntimeOnly library.java.slf4j_simple + permitUnusedDeclared "org.threeten:threetenbp:1.4.5" + permitUnusedDeclared library.java.protobuf_java } task runDataCatalogExample(type: JavaExec) { diff --git a/sdks/java/extensions/sql/expansion-service/build.gradle b/sdks/java/extensions/sql/expansion-service/build.gradle index aabd3b1ed0c2..2578510cc689 100644 --- a/sdks/java/extensions/sql/expansion-service/build.gradle +++ b/sdks/java/extensions/sql/expansion-service/build.gradle @@ -34,7 +34,9 @@ ext.summary = """Contains code to run a SQL Expansion Service.""" dependencies { compile project(path: ":sdks:java:extensions:sql") compile project(path: ":sdks:java:extensions:sql:zetasql") - compile project(path: ":sdks:java:expansion-service") + compile project(path: ":sdks:java:core", configuration: "shadow") + compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1" + compile "org.checkerframework:checker-qual:2.0.0" } task runExpansionService (type: JavaExec) { diff --git a/sdks/java/extensions/sql/hcatalog/build.gradle b/sdks/java/extensions/sql/hcatalog/build.gradle index 678492eed4c9..81bca1a62f97 100644 --- a/sdks/java/extensions/sql/hcatalog/build.gradle +++ b/sdks/java/extensions/sql/hcatalog/build.gradle @@ -38,6 +38,5 @@ dependencies { testCompile("org.apache.hive.hcatalog:hive-hcatalog-core:$hive_version") { // Hive brings full Calcite 1.6 + Avatica with JDBC driver which // gets registered and gets started instead of ours - exclude group: "org.apache.calcite", module:"calcite-avatica" } } diff --git a/sdks/java/extensions/sql/jdbc/build.gradle b/sdks/java/extensions/sql/jdbc/build.gradle index f1919053a9e7..f051f5a3ebf3 100644 --- a/sdks/java/extensions/sql/jdbc/build.gradle +++ b/sdks/java/extensions/sql/jdbc/build.gradle @@ -32,18 +32,17 @@ configurations { dependencies { compile project(":sdks:java:extensions:sql") - compile "jline:jline:2.14.6" compile "sqlline:sqlline:1.4.0" - compile library.java.slf4j_jdk14 + compile library.java.vendored_guava_26_0_jre testCompile project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntime") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library // 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. integrationTest sourceSets.test.output integrationTest sourceSets.main.output integrationTest library.java.junit + compile project(path: ":sdks:java:core", configuration: "shadow") + compile "org.checkerframework:checker-qual:2.0.0" } processResources { diff --git a/sdks/java/extensions/sql/zetasql/build.gradle b/sdks/java/extensions/sql/zetasql/build.gradle index 9589301e90ca..e486bc805dac 100644 --- a/sdks/java/extensions/sql/zetasql/build.gradle +++ b/sdks/java/extensions/sql/zetasql/build.gradle @@ -31,25 +31,24 @@ def zetasql_version = "2020.10.1" dependencies { compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) - compile project(":sdks:java:core") + compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:extensions:sql") compile library.java.vendored_calcite_1_20_0 compile library.java.guava compile library.java.grpc_api compile library.java.protobuf_java - compile library.java.protobuf_java_util - compile "com.google.api.grpc:proto-google-common-protos:1.12.0" // Interfaces with ZetaSQL use this - compile "com.google.api.grpc:grpc-google-common-protos:1.12.0" // Interfaces with ZetaSQL use this - compile "com.google.zetasql:zetasql-jni-channel:$zetasql_version" compile "com.google.zetasql:zetasql-client:$zetasql_version" compile "com.google.zetasql:zetasql-types:$zetasql_version" + compile library.java.joda_time + compile library.java.vendored_guava_26_0_jre + compile "org.checkerframework:checker-qual:2.0.0" + permitUnusedDeclared library.java.protobuf_java_util + compile "com.google.zetasql:zetasql-jni-channel:$zetasql_version" + permitUnusedDeclared "com.google.zetasql:zetasql-jni-channel:$zetasql_version" testCompile library.java.vendored_calcite_1_20_0 testCompile library.java.vendored_guava_26_0_jre testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.mockito_core - testCompile library.java.quickcheck_core testRuntimeClasspath library.java.slf4j_jdk14 } diff --git a/sdks/java/extensions/zetasketch/build.gradle b/sdks/java/extensions/zetasketch/build.gradle index ab1f7bf7a444..292e0fa6e1dd 100644 --- a/sdks/java/extensions/zetasketch/build.gradle +++ b/sdks/java/extensions/zetasketch/build.gradle @@ -33,6 +33,7 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile "com.google.zetasketch:zetasketch:$zetasketch_version" + compile "org.checkerframework:checker-qual:2.8.1" testCompile library.java.junit testCompile project(":sdks:java:io:google-cloud-platform") testRuntimeOnly library.java.slf4j_simple From 29b2183d680461cfffa60291a1d69bc90302d4ed Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 27 Jan 2021 20:06:22 -0800 Subject: [PATCH 2/9] move sdks/java/extensions/sql changes to their own PR --- sdks/java/extensions/sql/build.gradle | 13 +++++-------- sdks/java/extensions/sql/datacatalog/build.gradle | 11 ----------- .../extensions/sql/expansion-service/build.gradle | 4 +--- sdks/java/extensions/sql/hcatalog/build.gradle | 1 + sdks/java/extensions/sql/jdbc/build.gradle | 7 ++++--- sdks/java/extensions/sql/zetasql/build.gradle | 15 ++++++++------- 6 files changed, 19 insertions(+), 32 deletions(-) diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle index 53c3aa31e146..93473852ef81 100644 --- a/sdks/java/extensions/sql/build.gradle +++ b/sdks/java/extensions/sql/build.gradle @@ -62,6 +62,7 @@ dependencies { fmppTask "org.freemarker:freemarker:2.3.28" fmppTemplates library.java.vendored_calcite_1_20_0 compile project(":sdks:java:core") + compile project(":sdks:java:extensions:join-library") compile project(":sdks:java:extensions:sql:udf") compile project(path: ":runners:direct-java", configuration: "shadow") compile library.java.commons_codec @@ -72,14 +73,7 @@ dependencies { compile "com.alibaba:fastjson:1.2.69" compile "org.codehaus.janino:janino:3.0.11" compile "org.codehaus.janino:commons-compiler:3.0.11" - compile library.java.jackson_core - compile library.java.vendored_guava_26_0_jre - compile "org.mongodb:mongo-java-driver:3.9.1" - compile library.java.slf4j_api - compile library.java.joda_time - compile library.java.vendored_guava_26_0_jre - compile "org.checkerframework:checker-qual:2.0.0" - permitUnusedDeclared project(":sdks:java:core") + provided "org.checkerframework:checker-qual:3.4.1" provided project(":sdks:java:io:kafka") provided project(":sdks:java:io:google-cloud-platform") compile project(":sdks:java:io:mongodb") @@ -91,6 +85,9 @@ dependencies { testCompile library.java.vendored_calcite_1_20_0 testCompile library.java.vendored_guava_26_0_jre testCompile library.java.junit + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library + testCompile library.java.mockito_core testCompile library.java.quickcheck_core testCompile library.java.testcontainers_kafka testCompile library.java.google_cloud_bigtable_emulator diff --git a/sdks/java/extensions/sql/datacatalog/build.gradle b/sdks/java/extensions/sql/datacatalog/build.gradle index c551c5dac582..ad1fab0bceb9 100644 --- a/sdks/java/extensions/sql/datacatalog/build.gradle +++ b/sdks/java/extensions/sql/datacatalog/build.gradle @@ -27,15 +27,6 @@ dependencies { compile(library.java.google_cloud_datacatalog_v1beta1) { exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version } - compile "com.google.api.grpc:proto-google-cloud-datacatalog-v1beta1:0.32.1" - compile "com.google.api:gax:1.57.1" - compile "com.google.auth:google-auth-library-credentials:0.19.0" - compile "org.checkerframework:checker-qual:2.0.0" - compile library.java.vendored_guava_26_0_jre - compile library.java.slf4j_api - compile project(path: ":sdks:java:core", configuration: "shadow") - compile "org.threeten:threetenbp:1.4.5" - compile library.java.protobuf_java provided project(":sdks:java:extensions:sql") // Dependencies for the example @@ -44,8 +35,6 @@ dependencies { testCompile project(":sdks:java:extensions:sql:zetasql") testRuntimeOnly library.java.slf4j_simple - permitUnusedDeclared "org.threeten:threetenbp:1.4.5" - permitUnusedDeclared library.java.protobuf_java } task runDataCatalogExample(type: JavaExec) { diff --git a/sdks/java/extensions/sql/expansion-service/build.gradle b/sdks/java/extensions/sql/expansion-service/build.gradle index 2578510cc689..aabd3b1ed0c2 100644 --- a/sdks/java/extensions/sql/expansion-service/build.gradle +++ b/sdks/java/extensions/sql/expansion-service/build.gradle @@ -34,9 +34,7 @@ ext.summary = """Contains code to run a SQL Expansion Service.""" dependencies { compile project(path: ":sdks:java:extensions:sql") compile project(path: ":sdks:java:extensions:sql:zetasql") - compile project(path: ":sdks:java:core", configuration: "shadow") - compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1" - compile "org.checkerframework:checker-qual:2.0.0" + compile project(path: ":sdks:java:expansion-service") } task runExpansionService (type: JavaExec) { diff --git a/sdks/java/extensions/sql/hcatalog/build.gradle b/sdks/java/extensions/sql/hcatalog/build.gradle index 81bca1a62f97..678492eed4c9 100644 --- a/sdks/java/extensions/sql/hcatalog/build.gradle +++ b/sdks/java/extensions/sql/hcatalog/build.gradle @@ -38,5 +38,6 @@ dependencies { testCompile("org.apache.hive.hcatalog:hive-hcatalog-core:$hive_version") { // Hive brings full Calcite 1.6 + Avatica with JDBC driver which // gets registered and gets started instead of ours + exclude group: "org.apache.calcite", module:"calcite-avatica" } } diff --git a/sdks/java/extensions/sql/jdbc/build.gradle b/sdks/java/extensions/sql/jdbc/build.gradle index f051f5a3ebf3..f1919053a9e7 100644 --- a/sdks/java/extensions/sql/jdbc/build.gradle +++ b/sdks/java/extensions/sql/jdbc/build.gradle @@ -32,17 +32,18 @@ configurations { dependencies { compile project(":sdks:java:extensions:sql") + compile "jline:jline:2.14.6" compile "sqlline:sqlline:1.4.0" - compile library.java.vendored_guava_26_0_jre + compile library.java.slf4j_jdk14 testCompile project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntime") testCompile library.java.junit + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library // 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. integrationTest sourceSets.test.output integrationTest sourceSets.main.output integrationTest library.java.junit - compile project(path: ":sdks:java:core", configuration: "shadow") - compile "org.checkerframework:checker-qual:2.0.0" } processResources { diff --git a/sdks/java/extensions/sql/zetasql/build.gradle b/sdks/java/extensions/sql/zetasql/build.gradle index e486bc805dac..9589301e90ca 100644 --- a/sdks/java/extensions/sql/zetasql/build.gradle +++ b/sdks/java/extensions/sql/zetasql/build.gradle @@ -31,24 +31,25 @@ def zetasql_version = "2020.10.1" dependencies { compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) - compile project(path: ":sdks:java:core", configuration: "shadow") + compile project(":sdks:java:core") compile project(":sdks:java:extensions:sql") compile library.java.vendored_calcite_1_20_0 compile library.java.guava compile library.java.grpc_api compile library.java.protobuf_java + compile library.java.protobuf_java_util + compile "com.google.api.grpc:proto-google-common-protos:1.12.0" // Interfaces with ZetaSQL use this + compile "com.google.api.grpc:grpc-google-common-protos:1.12.0" // Interfaces with ZetaSQL use this + compile "com.google.zetasql:zetasql-jni-channel:$zetasql_version" compile "com.google.zetasql:zetasql-client:$zetasql_version" compile "com.google.zetasql:zetasql-types:$zetasql_version" - compile library.java.joda_time - compile library.java.vendored_guava_26_0_jre - compile "org.checkerframework:checker-qual:2.0.0" - permitUnusedDeclared library.java.protobuf_java_util - compile "com.google.zetasql:zetasql-jni-channel:$zetasql_version" - permitUnusedDeclared "com.google.zetasql:zetasql-jni-channel:$zetasql_version" testCompile library.java.vendored_calcite_1_20_0 testCompile library.java.vendored_guava_26_0_jre testCompile library.java.junit + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library testCompile library.java.mockito_core + testCompile library.java.quickcheck_core testRuntimeClasspath library.java.slf4j_jdk14 } From 57b94513a9e3ea89e4650942833ff3ce674db53a Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 27 Jan 2021 20:27:05 -0800 Subject: [PATCH 3/9] enableStrictDependencies and other cleanup --- sdks/java/extensions/euphoria/build.gradle | 5 +++-- .../google-cloud-platform-core/build.gradle | 17 ++++++++--------- sdks/java/extensions/jackson/build.gradle | 3 ++- sdks/java/extensions/join-library/build.gradle | 5 ++++- sdks/java/extensions/kryo/build.gradle | 5 +++-- sdks/java/extensions/ml/build.gradle | 6 ++++-- sdks/java/extensions/protobuf/build.gradle | 1 + .../schemaio-expansion-service/build.gradle | 2 -- sdks/java/extensions/sketching/build.gradle | 1 + sdks/java/extensions/sorter/build.gradle | 1 + sdks/java/extensions/zetasketch/build.gradle | 2 +- 11 files changed, 28 insertions(+), 20 deletions(-) diff --git a/sdks/java/extensions/euphoria/build.gradle b/sdks/java/extensions/euphoria/build.gradle index e21760fdf218..74ef751b729d 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,10 +27,10 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: Euphoria Java 8 DSL" dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") + implementation library.java.jackson_annotations + implementation library.java.joda_time implementation library.java.slf4j_api - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.2' implementation library.java.vendored_guava_26_0_jre - implementation library.java.joda_time 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 5740208743fe..4c028bec00bd 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" @@ -36,26 +36,25 @@ test { } dependencies { - compile "org.apache.httpcomponents:httpclient:4.5.10" - compile "org.apache.httpcomponents:httpcore:4.4.12" - compile "org.checkerframework:checker-qual:2.0.0" compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) 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 - testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.10.2' + compile library.java.joda_time + compile library.java.slf4j_api + testImplementation library.java.jackson_databind provided library.java.hamcrest_core provided library.java.junit testCompile project(path: ":sdks:java:core", configuration: "shadowTest") diff --git a/sdks/java/extensions/jackson/build.gradle b/sdks/java/extensions/jackson/build.gradle index b9d218792cd9..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,10 +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 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 b63306aeac00..45255c3a6f8f 100644 --- a/sdks/java/extensions/join-library/build.gradle +++ b/sdks/java/extensions/join-library/build.gradle @@ -17,7 +17,10 @@ */ 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" diff --git a/sdks/java/extensions/kryo/build.gradle b/sdks/java/extensions/kryo/build.gradle index 35be1afa6fc0..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,9 +40,9 @@ applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.kryo', description = 'Apache Beam :: SDKs :: Java :: Extensions :: Kryo' dependencies { - compile "com.esotericsoftware:kryo:${kryoVersion}" compile library.java.jackson_annotations - compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1" + 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') diff --git a/sdks/java/extensions/ml/build.gradle b/sdks/java/extensions/ml/build.gradle index cd566183ff1c..c824f0a27167 100644 --- a/sdks/java/extensions/ml/build.gradle +++ b/sdks/java/extensions/ml/build.gradle @@ -21,7 +21,10 @@ 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' @@ -36,7 +39,6 @@ dependencies { compile 'com.google.api.grpc:proto-google-cloud-vision-v1:1.81.3' compile 'com.google.api:gax:1.57.1' compile 'com.google.protobuf:protobuf-java:3.11.1' - compile 'org.checkerframework:checker-qual:2.0.0' compile library.java.slf4j_api provided library.java.junit testCompile project(path: ':sdks:java:core', configuration: 'shadowTest') diff --git a/sdks/java/extensions/protobuf/build.gradle b/sdks/java/extensions/protobuf/build.gradle index a37252c76bbc..e1b34b8e3c8b 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\.Proto2CoderTestMessages/, /^org\.apache\.beam\.sdk\.extensions\.protobuf\.Proto2SchemaMessages/, diff --git a/sdks/java/extensions/schemaio-expansion-service/build.gradle b/sdks/java/extensions/schemaio-expansion-service/build.gradle index 55d09251d712..5f48f31b7777 100644 --- a/sdks/java/extensions/schemaio-expansion-service/build.gradle +++ b/sdks/java/extensions/schemaio-expansion-service/build.gradle @@ -36,7 +36,5 @@ dependencies { compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1" testCompile library.java.junit testCompile library.java.mockito_core - // TODO(BEAM-10632): remove this dependency - testCompile "org.checkerframework:checker-qual:3.5.0" } diff --git a/sdks/java/extensions/sketching/build.gradle b/sdks/java/extensions/sketching/build.gradle index 9a5891f1d1b3..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" diff --git a/sdks/java/extensions/sorter/build.gradle b/sdks/java/extensions/sorter/build.gradle index 9072fec3a3fc..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" diff --git a/sdks/java/extensions/zetasketch/build.gradle b/sdks/java/extensions/zetasketch/build.gradle index 292e0fa6e1dd..ea32c94f941d 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" @@ -33,7 +34,6 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile "com.google.zetasketch:zetasketch:$zetasketch_version" - compile "org.checkerframework:checker-qual:2.8.1" testCompile library.java.junit testCompile project(":sdks:java:io:google-cloud-platform") testRuntimeOnly library.java.slf4j_simple From 3a2fa119390502d607ed408763587b9febd7e849 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 27 Jan 2021 22:38:58 -0800 Subject: [PATCH 4/9] declare auto-value-annotations --- sdks/java/extensions/zetasketch/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/sdks/java/extensions/zetasketch/build.gradle b/sdks/java/extensions/zetasketch/build.gradle index ea32c94f941d..4edd0c8469a5 100644 --- a/sdks/java/extensions/zetasketch/build.gradle +++ b/sdks/java/extensions/zetasketch/build.gradle @@ -33,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") From b679b5308cf2c346f983d3d61299268707d4d916 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Fri, 5 Feb 2021 17:16:30 -0800 Subject: [PATCH 5/9] [BEAM-10961] (1) reintroduce previously removed compile lines paired with permitUnusedDeclared (2) alphabeticize some lines --- sdks/java/extensions/ml/build.gradle | 4 +++- sdks/java/extensions/protobuf/build.gradle | 4 ++-- .../extensions/schemaio-expansion-service/build.gradle | 7 ++++++- sdks/java/extensions/sketching/build.gradle | 2 ++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sdks/java/extensions/ml/build.gradle b/sdks/java/extensions/ml/build.gradle index c824f0a27167..dabc01c1b831 100644 --- a/sdks/java/extensions/ml/build.gradle +++ b/sdks/java/extensions/ml/build.gradle @@ -30,6 +30,8 @@ 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") 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' @@ -37,8 +39,8 @@ dependencies { 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 'com.google.api:gax:1.57.1' compile 'com.google.protobuf:protobuf-java:3.11.1' + compile library.java.gax compile library.java.slf4j_api provided library.java.junit testCompile project(path: ':sdks:java:core', configuration: 'shadowTest') diff --git a/sdks/java/extensions/protobuf/build.gradle b/sdks/java/extensions/protobuf/build.gradle index e1b34b8e3c8b..d2f879befc76 100644 --- a/sdks/java/extensions/protobuf/build.gradle +++ b/sdks/java/extensions/protobuf/build.gradle @@ -33,10 +33,10 @@ 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 "org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1" + compile library.java.vendored_bytebuddy_1_10_8 testCompile project(path: ":sdks:java:core", configuration: "shadowTest") 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 5f48f31b7777..20438fb9118f 100644 --- a/sdks/java/extensions/schemaio-expansion-service/build.gradle +++ b/sdks/java/extensions/schemaio-expansion-service/build.gradle @@ -30,6 +30,12 @@ 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 @@ -37,4 +43,3 @@ dependencies { testCompile library.java.junit testCompile library.java.mockito_core } - diff --git a/sdks/java/extensions/sketching/build.gradle b/sdks/java/extensions/sketching/build.gradle index 83a93f6167ef..0d4d3c3804b8 100644 --- a/sdks/java/extensions/sketching/build.gradle +++ b/sdks/java/extensions/sketching/build.gradle @@ -27,6 +27,8 @@ def streamlib_version = "2.9.5" def tdigest_version = "3.2" dependencies { + compile library.java.slf4j_api + permitUnusedDeclared library.java.slf4j_api compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile "com.clearspring.analytics:stream:$streamlib_version" From 77fddd3ce2855233117179af00d6c794fe57a9fa Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 10 Feb 2021 16:53:20 -0800 Subject: [PATCH 6/9] [BEAM-10961] some cleanup --- sdks/java/extensions/euphoria/build.gradle | 8 ++++---- .../extensions/google-cloud-platform-core/build.gradle | 3 ++- sdks/java/extensions/ml/build.gradle | 6 +----- .../extensions/schemaio-expansion-service/build.gradle | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sdks/java/extensions/euphoria/build.gradle b/sdks/java/extensions/euphoria/build.gradle index 74ef751b729d..1fe6c7765fb5 100644 --- a/sdks/java/extensions/euphoria/build.gradle +++ b/sdks/java/extensions/euphoria/build.gradle @@ -27,10 +27,10 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: Euphoria Java 8 DSL" dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") - implementation library.java.jackson_annotations - implementation library.java.joda_time - implementation library.java.slf4j_api - implementation library.java.vendored_guava_26_0_jre + 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 4c028bec00bd..d7661f6d372b 100644 --- a/sdks/java/extensions/google-cloud-platform-core/build.gradle +++ b/sdks/java/extensions/google-cloud-platform-core/build.gradle @@ -52,9 +52,10 @@ dependencies { 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 - testImplementation library.java.jackson_databind provided library.java.hamcrest_core provided library.java.junit testCompile project(path: ":sdks:java:core", configuration: "shadowTest") diff --git a/sdks/java/extensions/ml/build.gradle b/sdks/java/extensions/ml/build.gradle index dabc01c1b831..f3311ca33041 100644 --- a/sdks/java/extensions/ml/build.gradle +++ b/sdks/java/extensions/ml/build.gradle @@ -39,19 +39,15 @@ dependencies { 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 'com.google.protobuf:protobuf-java:3.11.1' 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' - implementation 'com.google.cloud:google-cloud-dlp:1.1.4' testCompile project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntime") - implementation '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/schemaio-expansion-service/build.gradle b/sdks/java/extensions/schemaio-expansion-service/build.gradle index 20438fb9118f..b6a1f7ef5a23 100644 --- a/sdks/java/extensions/schemaio-expansion-service/build.gradle +++ b/sdks/java/extensions/schemaio-expansion-service/build.gradle @@ -39,7 +39,7 @@ dependencies { compile project(path: ":model:pipeline", configuration: "shadow") compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.vendored_grpc_1_26_0 - compile "org.apache.beam:beam-vendor-guava-26_0-jre:0.1" + compile library.java.vendored_guava_26_0_jre testCompile library.java.junit testCompile library.java.mockito_core } From ac654b30c6b5b269341c7e749970b8d642b8f377 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Fri, 12 Feb 2021 23:00:26 -0800 Subject: [PATCH 7/9] [BEAM-10961] remove library.java.slf4j_api from sdks/java/extensions/sketching/build.gradle --- sdks/java/extensions/sketching/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdks/java/extensions/sketching/build.gradle b/sdks/java/extensions/sketching/build.gradle index 0d4d3c3804b8..83a93f6167ef 100644 --- a/sdks/java/extensions/sketching/build.gradle +++ b/sdks/java/extensions/sketching/build.gradle @@ -27,8 +27,6 @@ def streamlib_version = "2.9.5" def tdigest_version = "3.2" dependencies { - compile library.java.slf4j_api - permitUnusedDeclared library.java.slf4j_api compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile "com.clearspring.analytics:stream:$streamlib_version" From 7ff6f4fcf81b3f162dc6ef431a9b3c37ad627c3d Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Wed, 24 Feb 2021 15:45:38 -0800 Subject: [PATCH 8/9] trigger build From 740e3493c89592606d25bff9b43b9eb6efbead06 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Thu, 25 Feb 2021 00:28:46 -0800 Subject: [PATCH 9/9] [BEAM-10961] add reference to BEAM-11761 --- sdks/java/extensions/ml/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/extensions/ml/build.gradle b/sdks/java/extensions/ml/build.gradle index f3311ca33041..c6fd78e3daf0 100644 --- a/sdks/java/extensions/ml/build.gradle +++ b/sdks/java/extensions/ml/build.gradle @@ -31,7 +31,7 @@ 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") + 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'