From 23a1b8d708e6756378783b48811c4881128fea59 Mon Sep 17 00:00:00 2001 From: Sonam Ramchand Date: Thu, 7 Jan 2021 15:08:18 +0500 Subject: [PATCH 01/13] Enabled strict dependency over sdks-io --- sdks/java/io/amazon-web-services/build.gradle | 3 +- .../java/io/amazon-web-services2/build.gradle | 9 +++-- sdks/java/io/amqp/build.gradle | 4 +-- sdks/java/io/azure/build.gradle | 4 ++- .../io/bigquery-io-perf-tests/build.gradle | 5 +-- sdks/java/io/cassandra/build.gradle | 1 + sdks/java/io/clickhouse/build.gradle | 4 +++ sdks/java/io/contextualtextio/build.gradle | 5 +-- sdks/java/io/elasticsearch/build.gradle | 8 ++++- sdks/java/io/expansion-service/build.gradle | 5 --- sdks/java/io/file-based-io-tests/build.gradle | 2 -- .../io/google-cloud-platform/build.gradle | 36 ++++++++++--------- .../expansion-service/build.gradle | 2 -- sdks/java/io/hadoop-common/build.gradle | 2 -- sdks/java/io/hadoop-file-system/build.gradle | 2 -- sdks/java/io/hadoop-format/build.gradle | 3 +- sdks/java/io/hcatalog/build.gradle | 3 +- sdks/java/io/influxdb/build.gradle | 3 ++ sdks/java/io/jdbc/build.gradle | 11 +++--- sdks/java/io/jms/build.gradle | 6 ++-- sdks/java/io/kafka/build.gradle | 13 +++++-- sdks/java/io/kinesis/build.gradle | 6 ++-- .../io/kinesis/expansion-service/build.gradle | 2 -- sdks/java/io/kudu/build.gradle | 2 -- sdks/java/io/mongodb/build.gradle | 2 -- sdks/java/io/mqtt/build.gradle | 6 ++-- sdks/java/io/parquet/build.gradle | 3 +- sdks/java/io/rabbitmq/build.gradle | 2 -- sdks/java/io/redis/build.gradle | 2 -- sdks/java/io/snowflake/build.gradle | 4 +-- .../snowflake/expansion-service/build.gradle | 2 -- sdks/java/io/solr/build.gradle | 5 ++- sdks/java/io/splunk/build.gradle | 7 +++- sdks/java/io/synthetic/build.gradle | 4 +-- sdks/java/io/thrift/build.gradle | 5 --- sdks/java/io/tika/build.gradle | 5 +-- sdks/java/io/xml/build.gradle | 5 ++- 37 files changed, 92 insertions(+), 101 deletions(-) diff --git a/sdks/java/io/amazon-web-services/build.gradle b/sdks/java/io/amazon-web-services/build.gradle index c7c3874b2af4..f190088c7cb3 100644 --- a/sdks/java/io/amazon-web-services/build.gradle +++ b/sdks/java/io/amazon-web-services/build.gradle @@ -39,11 +39,12 @@ dependencies { compile library.java.aws_java_sdk_sns compile library.java.aws_java_sdk_sqs compile library.java.aws_java_sdk_sts - compile "commons-lang:commons-lang:2.6" compile library.java.jackson_core compile library.java.jackson_annotations compile library.java.jackson_databind compile library.java.slf4j_api + compile library.java.joda_time + compile "org.apache.httpcomponents:httpcore:4.4.11" runtime library.java.commons_codec runtime "org.apache.httpcomponents:httpclient:4.5.12" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") diff --git a/sdks/java/io/amazon-web-services2/build.gradle b/sdks/java/io/amazon-web-services2/build.gradle index 854263ec973d..af44011866bf 100644 --- a/sdks/java/io/amazon-web-services2/build.gradle +++ b/sdks/java/io/amazon-web-services2/build.gradle @@ -42,23 +42,26 @@ dependencies { compile library.java.jackson_core compile library.java.jackson_annotations compile library.java.jackson_databind - compile library.java.jackson_dataformat_cbor compile library.java.joda_time compile library.java.slf4j_api compile "software.amazon.kinesis:amazon-kinesis-client:2.2.5" compile "commons-lang:commons-lang:2.6" + compile "org.apache.commons:commons-lang3:3.9" + compile "org.apache.httpcomponents:httpcore:4.4.11" + compile "org.checkerframework:checker-qual:2.0.0" + compile "software.amazon.awssdk:http-client-spi:2.13.54" + compile "software.amazon.awssdk:regions:2.13.54" + compile "software.amazon.awssdk:utils:2.13.54" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:io:kinesis", configuration: "testRuntime") testCompile library.java.mockito_core testCompile library.java.guava_testlib - testCompile library.java.hamcrest_core testCompile library.java.junit testCompile 'org.elasticmq:elasticmq-rest-sqs_2.12:0.15.6' testCompile library.java.hamcrest_library testCompile library.java.powermock testCompile library.java.powermock_mockito - testCompile library.java.testcontainers_localstack testCompile "org.assertj:assertj-core:3.11.1" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/amqp/build.gradle b/sdks/java/io/amqp/build.gradle index 9c9f60c327e7..618ab8e40ac2 100644 --- a/sdks/java/io/amqp/build.gradle +++ b/sdks/java/io/amqp/build.gradle @@ -27,12 +27,10 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.joda_time compile "org.apache.qpid:proton-j:0.16.0" + testCompile library.java.activemq_amqp testCompile library.java.slf4j_api testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.activemq_broker - testCompile library.java.activemq_amqp testCompile library.java.activemq_junit testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/azure/build.gradle b/sdks/java/io/azure/build.gradle index 97d31f9d9640..81d089c0f886 100644 --- a/sdks/java/io/azure/build.gradle +++ b/sdks/java/io/azure/build.gradle @@ -34,8 +34,10 @@ dependencies { compile "com.azure:azure-storage-blob:12.8.0" compile "com.azure:azure-identity:1.0.8" compile "com.microsoft.azure:azure-storage:8.6.5" - compile "commons-io:commons-io:2.6" compile library.java.slf4j_api + compile "com.azure:azure-core:1.6.0" + compile "com.azure:azure-storage-common:12.1.0" + compile "org.checkerframework:checker-qual:2.0.0" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.mockito_core testCompile library.java.junit diff --git a/sdks/java/io/bigquery-io-perf-tests/build.gradle b/sdks/java/io/bigquery-io-perf-tests/build.gradle index 8d5cf89195d3..1556226612ee 100644 --- a/sdks/java/io/bigquery-io-perf-tests/build.gradle +++ b/sdks/java/io/bigquery-io-perf-tests/build.gradle @@ -25,7 +25,7 @@ description = "Apache Beam :: SDKs :: Java :: Google BigQuery IO Performance tes ext.summary = "Performance tests for Google BigQuery IO sources and sinks" dependencies { - compile library.java.google_api_services_bigquery + testImplementation 'com.google.apis:google-api-services-bigquery:v2-rev20200719-1.30.10' testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntime") @@ -34,7 +34,4 @@ dependencies { testCompile project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntime") testCompile project(":sdks:java:io:synthetic") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.jaxb_api - testCompile library.java.jaxb_impl } diff --git a/sdks/java/io/cassandra/build.gradle b/sdks/java/io/cassandra/build.gradle index 6fc6e92b91af..ccaa723044e7 100644 --- a/sdks/java/io/cassandra/build.gradle +++ b/sdks/java/io/cassandra/build.gradle @@ -37,6 +37,7 @@ dependencies { compile library.java.slf4j_api compile library.java.cassandra_driver_core compile library.java.cassandra_driver_mapping + compile "org.checkerframework:checker-qual:2.0.0" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit testCompile library.java.hamcrest_core diff --git a/sdks/java/io/clickhouse/build.gradle b/sdks/java/io/clickhouse/build.gradle index 42deda7c14ab..bbd250a94647 100644 --- a/sdks/java/io/clickhouse/build.gradle +++ b/sdks/java/io/clickhouse/build.gradle @@ -56,6 +56,10 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.joda_time compile "ru.yandex.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version" + compile "com.google.guava:guava:25.1-jre" + compile library.java.vendored_guava_26_0_jre + compile "org.checkerframework:checker-qual:2.0.0" + compile library.java.slf4j_api testCompile library.java.slf4j_api testCompile library.java.junit testCompile library.java.hamcrest_core diff --git a/sdks/java/io/contextualtextio/build.gradle b/sdks/java/io/contextualtextio/build.gradle index 0ebd983eeb60..5df6f1eba762 100644 --- a/sdks/java/io/contextualtextio/build.gradle +++ b/sdks/java/io/contextualtextio/build.gradle @@ -26,10 +26,11 @@ ext.summary = "Context-aware Text IO." dependencies { compile library.java.vendored_guava_26_0_jre - compile library.java.protobuf_java compile project(path: ":sdks:java:core", configuration: "shadow") - testCompile project(path: ":sdks:java:core", configuration: "shadowTest") + compile library.java.vendored_grpc_1_26_0 + compile library.java.slf4j_api + testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.guava_testlib testCompile library.java.junit testCompile library.java.hamcrest_core diff --git a/sdks/java/io/elasticsearch/build.gradle b/sdks/java/io/elasticsearch/build.gradle index ac9e5e96cf02..d43784e35980 100644 --- a/sdks/java/io/elasticsearch/build.gradle +++ b/sdks/java/io/elasticsearch/build.gradle @@ -26,7 +26,13 @@ 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_annotations + compile library.java.jackson_core + compile library.java.joda_time + compile "org.apache.httpcomponents:httpasyncclient:4.1.4" + compile "org.apache.httpcomponents:httpclient:4.5.10" + compile "org.apache.httpcomponents:httpcore-nio:4.4.12" + compile "org.apache.httpcomponents:httpcore:4.4.12" + compile library.java.slf4j_api compile "org.elasticsearch.client:elasticsearch-rest-client:7.9.2" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") } diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle index 75ff5ad05544..06c66bcb4949 100644 --- a/sdks/java/io/expansion-service/build.gradle +++ b/sdks/java/io/expansion-service/build.gradle @@ -31,11 +31,6 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Expansion Service" ext.summary = "Expansion service serving several Java IOs" dependencies { - compile project(":sdks:java:expansion-service") - compile project(":sdks:java:io:kafka") - compile project(":sdks:java:io:jdbc") - // Include postgres so it can be used with external JDBC - compile library.java.postgres runtime library.java.kafka_clients runtime library.java.slf4j_jdk14 } diff --git a/sdks/java/io/file-based-io-tests/build.gradle b/sdks/java/io/file-based-io-tests/build.gradle index 6c53e90ff17f..b47a51d7b633 100644 --- a/sdks/java/io/file-based-io-tests/build.gradle +++ b/sdks/java/io/file-based-io-tests/build.gradle @@ -31,8 +31,6 @@ dependencies { testCompile project(path: ":sdks:java:io:parquet", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile library.java.jaxb_api - testCompile library.java.jaxb_impl testCompile library.java.junit - testCompile library.java.hamcrest_core testCompile library.java.hadoop_client } diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 7ac6878eae80..1087e7fe7e57 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -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..b86644d7565b 100644 --- a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle +++ b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle @@ -31,7 +31,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 } diff --git a/sdks/java/io/hadoop-common/build.gradle b/sdks/java/io/hadoop-common/build.gradle index 534512e49d10..552073742edb 100644 --- a/sdks/java/io/hadoop-common/build.gradle +++ b/sdks/java/io/hadoop-common/build.gradle @@ -38,8 +38,6 @@ dependencies { provided library.java.hadoop_client provided library.java.hadoop_common provided library.java.hadoop_mapreduce_client_core - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit hadoopVersions.each {kv -> "hadoopVersion$kv.key" "org.apache.hadoop:hadoop-client:$kv.value" diff --git a/sdks/java/io/hadoop-file-system/build.gradle b/sdks/java/io/hadoop-file-system/build.gradle index 39ba9ba452e0..686d42384492 100644 --- a/sdks/java/io/hadoop-file-system/build.gradle +++ b/sdks/java/io/hadoop-file-system/build.gradle @@ -45,8 +45,6 @@ dependencies { provided library.java.hadoop_common provided library.java.hadoop_mapreduce_client_core 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 testCompile library.java.hadoop_minicluster diff --git a/sdks/java/io/hadoop-format/build.gradle b/sdks/java/io/hadoop-format/build.gradle index 5ab4a55013a3..6e724a22bb9a 100644 --- a/sdks/java/io/hadoop-format/build.gradle +++ b/sdks/java/io/hadoop-format/build.gradle @@ -60,6 +60,7 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile library.java.slf4j_api compile project(":sdks:java:io:hadoop-common") + compile library.java.joda_time provided library.java.hadoop_common provided library.java.hadoop_hdfs provided library.java.hadoop_mapreduce_client_core @@ -68,6 +69,7 @@ dependencies { testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile project(":sdks:java:io:jdbc") testCompile project(path: ":examples:java", configuration: "testRuntime") + testCompile "org.elasticsearch.plugin:transport-netty4-client:$elastic_search_version" testCompile library.java.testcontainers_elasticsearch testCompile "org.elasticsearch.client:elasticsearch-rest-high-level-client:$elastic_search_version" testCompile "org.elasticsearch:elasticsearch:$elastic_search_version" @@ -90,7 +92,6 @@ dependencies { testCompile library.java.cassandra_driver_mapping testCompile "org.apache.cassandra:cassandra-all:3.11.8" testCompile library.java.postgres - testCompile "org.apache.logging.log4j:log4j-core:$log4j_version" testCompile library.java.junit testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library diff --git a/sdks/java/io/hcatalog/build.gradle b/sdks/java/io/hcatalog/build.gradle index d1c9e6fa9831..c418a52c571e 100644 --- a/sdks/java/io/hcatalog/build.gradle +++ b/sdks/java/io/hcatalog/build.gradle @@ -55,6 +55,7 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:io:hadoop-common") compile library.java.slf4j_api + compile library.java.joda_time // Hive bundles without repackaging Jackson which is why we redeclare it here so that it appears // on the compile/test/runtime classpath before Hive. provided library.java.jackson_annotations @@ -65,8 +66,6 @@ dependencies { provided library.java.hadoop_common provided "org.apache.hive:hive-exec:$hive_version" provided(group: "org.apache.hive.hcatalog", name: "hive-hcatalog-core", version: hive_version) { - exclude group: "org.apache.hive", module: "hive-exec" - exclude group: "com.google.protobuf", module: "protobuf-java" } testCompile project(":sdks:java:io:common").sourceSets.test.output testCompile library.java.commons_io diff --git a/sdks/java/io/influxdb/build.gradle b/sdks/java/io/influxdb/build.gradle index 782c57218eae..4bbe170097d3 100644 --- a/sdks/java/io/influxdb/build.gradle +++ b/sdks/java/io/influxdb/build.gradle @@ -27,6 +27,9 @@ ext.summary = "IO to read and write on InfluxDB" dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.influxdb_library + compile "com.squareup.okhttp3:okhttp:4.6.0" + compile library.java.vendored_guava_26_0_jre + compile library.java.slf4j_api testCompile library.java.junit testCompile library.java.powermock testCompile library.java.powermock_mockito diff --git a/sdks/java/io/jdbc/build.gradle b/sdks/java/io/jdbc/build.gradle index 549749c1d830..709393874322 100644 --- a/sdks/java/io/jdbc/build.gradle +++ b/sdks/java/io/jdbc/build.gradle @@ -30,17 +30,18 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile "org.apache.commons:commons-dbcp2:2.6.0" + compile library.java.joda_time + compile "org.apache.commons:commons-pool2:2.6.1" + compile library.java.slf4j_api + testCompile "org.apache.derby:derby:10.14.2.0" + testCompile "org.apache.derby:derbyclient:10.14.2.0" + testCompile "org.apache.derby:derbynet:10.14.2.0" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.slf4j_api testCompile library.java.postgres - testCompile "org.apache.derby:derby:10.14.2.0" - testCompile "org.apache.derby:derbyclient:10.14.2.0" - testCompile "org.apache.derby:derbynet:10.14.2.0" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/jms/build.gradle b/sdks/java/io/jms/build.gradle index 657bed432fae..b73fa8d592cc 100644 --- a/sdks/java/io/jms/build.gradle +++ b/sdks/java/io/jms/build.gradle @@ -30,14 +30,12 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.slf4j_api compile library.java.joda_time - compile "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" - testCompile library.java.activemq_broker testCompile library.java.activemq_jaas testCompile library.java.activemq_kahadb_store + compile "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" + testCompile library.java.activemq_broker testCompile library.java.activemq_client testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/kafka/build.gradle b/sdks/java/io/kafka/build.gradle index a500ddd49fb5..9207a661ab39 100644 --- a/sdks/java/io/kafka/build.gradle +++ b/sdks/java/io/kafka/build.gradle @@ -48,7 +48,9 @@ kafkaVersions.each{k,v -> configurations.create("kafkaVersion$k")} dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") - compile project(":sdks:java:expansion-service") + testCompile project(":sdks:java:expansion-service") + compile "org.apache.kafka:kafka-clients:2.4.1" + compile library.java.avro // Get back to "provided" since 2.14 provided library.java.kafka_clients compile library.java.slf4j_api @@ -57,6 +59,13 @@ dependencies { compile library.java.jackson_databind compile "org.springframework:spring-expression:4.3.18.RELEASE" compile ("io.confluent:kafka-avro-serializer:5.3.2") { + // zookeeper depends on "spotbugs-annotations:3.1.9" which clashes with current + // "spotbugs-annotations:3.1.12" used in Beam. Not required. + exclude group: "org.apache.zookeeper", module: "zookeeper" + // "kafka-clients" has to be provided since user can use its own version. + exclude group: "org.apache.kafka", module: "kafka-clients" + } + compile ("io.confluent:kafka-schema-registry-client:5.3.2") { // It depends on "spotbugs-annotations:3.1.9" which clashes with current // "spotbugs-annotations:3.1.12" used in Beam. Not required. exclude group: "org.apache.zookeeper", module: "zookeeper" @@ -71,8 +80,6 @@ dependencies { // For testing Cross-language transforms testCompile project(":runners:core-construction-java") testCompile library.java.avro - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit testCompile library.java.powermock testCompile library.java.powermock_mockito diff --git a/sdks/java/io/kinesis/build.gradle b/sdks/java/io/kinesis/build.gradle index bb513d875c6f..e6744d8bfffe 100644 --- a/sdks/java/io/kinesis/build.gradle +++ b/sdks/java/io/kinesis/build.gradle @@ -33,7 +33,6 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.slf4j_api compile library.java.joda_time - compile library.java.jackson_dataformat_cbor compile library.java.guava compile library.java.aws_java_sdk_cloudwatch compile library.java.aws_java_sdk_core @@ -41,12 +40,13 @@ dependencies { compile "com.amazonaws:amazon-kinesis-client:1.13.0" compile "com.amazonaws:amazon-kinesis-producer:0.14.1" compile "commons-lang:commons-lang:2.6" + compile library.java.vendored_guava_26_0_jre + compile "org.apache.commons:commons-lang3:3.9" + compile "org.checkerframework:checker-qual:2.0.0" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit testCompile library.java.mockito_core testCompile library.java.guava_testlib - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.powermock testCompile library.java.powermock_mockito testCompile library.java.testcontainers_localstack diff --git a/sdks/java/io/kinesis/expansion-service/build.gradle b/sdks/java/io/kinesis/expansion-service/build.gradle index ef3db42f0e2d..1e07a04fc531 100644 --- a/sdks/java/io/kinesis/expansion-service/build.gradle +++ b/sdks/java/io/kinesis/expansion-service/build.gradle @@ -32,7 +32,5 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Kinesis :: Expansion Service ext.summary = "Expansion service serving KinesisIO" dependencies { - compile project(":sdks:java:expansion-service") - compile project(":sdks:java:io:kinesis") runtime library.java.slf4j_jdk14 } diff --git a/sdks/java/io/kudu/build.gradle b/sdks/java/io/kudu/build.gradle index ffd776021dd4..7f28d5ecf9cf 100644 --- a/sdks/java/io/kudu/build.gradle +++ b/sdks/java/io/kudu/build.gradle @@ -50,8 +50,6 @@ dependencies { compile library.java.slf4j_api testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/mongodb/build.gradle b/sdks/java/io/mongodb/build.gradle index 4e6ef1c67391..1e5baf79d13e 100644 --- a/sdks/java/io/mongodb/build.gradle +++ b/sdks/java/io/mongodb/build.gradle @@ -31,8 +31,6 @@ dependencies { compile library.java.joda_time compile "org.mongodb:mongo-java-driver:3.12.7" testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile "de.flapdoodle.embed:de.flapdoodle.embed.mongo:2.2.0" diff --git a/sdks/java/io/mqtt/build.gradle b/sdks/java/io/mqtt/build.gradle index a384274de773..e103c2479c61 100644 --- a/sdks/java/io/mqtt/build.gradle +++ b/sdks/java/io/mqtt/build.gradle @@ -27,15 +27,13 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.slf4j_api compile library.java.joda_time + testCompile library.java.activemq_mqtt + testCompile library.java.activemq_kahadb_store compile "org.fusesource.mqtt-client:mqtt-client:1.15" compile "org.fusesource.hawtbuf:hawtbuf:1.11" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.activemq_broker - testCompile library.java.activemq_mqtt - testCompile library.java.activemq_kahadb_store testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/parquet/build.gradle b/sdks/java/io/parquet/build.gradle index b3af3c6f0a43..8421ace28b03 100644 --- a/sdks/java/io/parquet/build.gradle +++ b/sdks/java/io/parquet/build.gradle @@ -46,11 +46,10 @@ dependencies { compile "org.apache.parquet:parquet-common:$parquet_version" compile "org.apache.parquet:parquet-hadoop:$parquet_version" compile library.java.avro + compile "org.apache.parquet:parquet-column:1.10.0" provided library.java.hadoop_client testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") hadoopVersions.each {kv -> diff --git a/sdks/java/io/rabbitmq/build.gradle b/sdks/java/io/rabbitmq/build.gradle index 2256bc3726ab..2b8008437e33 100644 --- a/sdks/java/io/rabbitmq/build.gradle +++ b/sdks/java/io/rabbitmq/build.gradle @@ -35,8 +35,6 @@ dependencies { testCompile "org.apache.qpid:qpid-broker-plugins-memory-store:$qpid_version" testCompile "org.apache.qpid:qpid-broker-plugins-amqp-0-8-protocol:$qpid_version" testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.slf4j_api testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/redis/build.gradle b/sdks/java/io/redis/build.gradle index 611053f10df4..a09900a25c4d 100644 --- a/sdks/java/io/redis/build.gradle +++ b/sdks/java/io/redis/build.gradle @@ -28,8 +28,6 @@ dependencies { compile "redis.clients:jedis:3.3.0" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile "com.github.kstyrc:embedded-redis:0.6" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/snowflake/build.gradle b/sdks/java/io/snowflake/build.gradle index a6adc23ebba8..c8aca747fff0 100644 --- a/sdks/java/io/snowflake/build.gradle +++ b/sdks/java/io/snowflake/build.gradle @@ -27,19 +27,17 @@ ext.summary = "IO to read and write on Snowflake." dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") - compile project(path: ":sdks:java:extensions:google-cloud-platform-core") compile library.java.slf4j_api compile group: 'net.snowflake', name: 'snowflake-jdbc', version: '3.12.11' compile group: 'com.opencsv', name: 'opencsv', version: '5.0' compile 'net.snowflake:snowflake-ingest-sdk:0.9.9' + compile library.java.joda_time testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile 'com.google.cloud:google-cloud-storage:1.102.0' testCompile library.java.avro testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.slf4j_api testRuntimeOnly library.java.hadoop_client testRuntimeOnly library.java.slf4j_jdk14 diff --git a/sdks/java/io/snowflake/expansion-service/build.gradle b/sdks/java/io/snowflake/expansion-service/build.gradle index fe442b41af47..8e0cb5be4202 100644 --- a/sdks/java/io/snowflake/expansion-service/build.gradle +++ b/sdks/java/io/snowflake/expansion-service/build.gradle @@ -32,8 +32,6 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Snowflake ::Expansion Servic ext.summary = "Expansion service serving Snowflake IO" dependencies { - compile project(":sdks:java:expansion-service") - compile project(":sdks:java:io:snowflake") runtime library.java.slf4j_jdk14 } diff --git a/sdks/java/io/solr/build.gradle b/sdks/java/io/solr/build.gradle index 33a9b5cb69c7..efdfde26e043 100644 --- a/sdks/java/io/solr/build.gradle +++ b/sdks/java/io/solr/build.gradle @@ -30,12 +30,11 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.commons_compress + compile library.java.joda_time + compile library.java.slf4j_api compile "org.apache.solr:solr-solrj:$solrVersion" - compileOnly "org.apache.httpcomponents:httpclient:4.5.6" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(":sdks:java:io:common") - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit testCompile library.java.slf4j_api testCompile "org.apache.solr:solr-test-framework:$solrVersion" diff --git a/sdks/java/io/splunk/build.gradle b/sdks/java/io/splunk/build.gradle index a8a31b7354d6..8992a0ee9ad6 100644 --- a/sdks/java/io/splunk/build.gradle +++ b/sdks/java/io/splunk/build.gradle @@ -27,10 +27,15 @@ ext.summary = "IO to write events to Splunk Http Event Collector (HEC)" dependencies { compile platform(library.java.google_cloud_platform_libraries_bom) compile library.java.slf4j_api - compile library.java.google_api_client compile library.java.google_http_client_apache_v2 compile library.java.google_code_gson compile project(path: ":sdks:java:core", configuration: "shadow") + compile "com.google.http-client:google-http-client:1.34.0" + compile library.java.joda_time + compile library.java.vendored_guava_26_0_jre + compile "org.apache.httpcomponents:httpclient:4.5.10" + compile "org.apache.httpcomponents:httpcore:4.4.12" + compile "org.checkerframework:checker-qual:2.0.0" testCompile library.java.junit testCompile group: 'org.mock-server', name: 'mockserver-junit-rule', version: '5.10.0' testCompile group: 'org.mock-server', name: 'mockserver-client-java', version: '5.10.0' diff --git a/sdks/java/io/synthetic/build.gradle b/sdks/java/io/synthetic/build.gradle index cb9cbf8db1d7..f89fe3b5db8c 100644 --- a/sdks/java/io/synthetic/build.gradle +++ b/sdks/java/io/synthetic/build.gradle @@ -31,11 +31,11 @@ dependencies { compile library.java.jackson_core compile library.java.jackson_annotations compile library.java.jackson_databind + compile library.java.vendored_guava_26_0_jre + compile library.java.slf4j_api compile project(path: ":sdks:java:core", configuration: "shadow") testCompile library.java.vendored_guava_26_0_jre testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/thrift/build.gradle b/sdks/java/io/thrift/build.gradle index d22b934256e7..516240408f8c 100644 --- a/sdks/java/io/thrift/build.gradle +++ b/sdks/java/io/thrift/build.gradle @@ -39,11 +39,6 @@ dependencies { compile "org.apache.thrift:libthrift:0.13.0" compile project(path: ":sdks:java:core", configuration: "shadow") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library - testCompile library.java.jackson_databind - testCompile "com.google.code.gson:gson:2.8.6" - testCompile "commons-io:commons-io:2.6" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/tika/build.gradle b/sdks/java/io/tika/build.gradle index 28c6c622a31f..cea2103df9ad 100644 --- a/sdks/java/io/tika/build.gradle +++ b/sdks/java/io/tika/build.gradle @@ -27,14 +27,11 @@ def bndlib_version = "1.43.0" dependencies { compile library.java.vendored_guava_26_0_jre - compileOnly "biz.aQute:bndlib:$bndlib_version" compile project(path: ":sdks:java:core", configuration: "shadow") compile "org.apache.tika:tika-core:$tika_version" + testCompile "org.apache.tika:tika-parsers:$tika_version" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library - testCompile "org.apache.tika:tika-parsers:$tika_version" testCompileOnly "biz.aQute:bndlib:$bndlib_version" testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/xml/build.gradle b/sdks/java/io/xml/build.gradle index d6c8ba2761e3..24040b0556cb 100644 --- a/sdks/java/io/xml/build.gradle +++ b/sdks/java/io/xml/build.gradle @@ -24,15 +24,14 @@ ext.summary = "IO to read and write XML files." dependencies { compile library.java.jaxb_api - compile library.java.jaxb_impl compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.stax2_api + compile "javax.xml.stream:stax-api:1.0-2" compile library.java.woodstox_core_asl + permitUnusedDeclared library.java.woodstox_core_asl testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } From 2cf3d7bbfb5b5807dea8b6c07460de0ad177d968 Mon Sep 17 00:00:00 2001 From: Sonam Ramchand Date: Wed, 20 Jan 2021 21:52:04 +0500 Subject: [PATCH 02/13] set enableStrictDependencies=true to sdks-io --- sdks/java/io/amazon-web-services/build.gradle | 1 + sdks/java/io/amazon-web-services2/build.gradle | 1 + sdks/java/io/amqp/build.gradle | 2 +- sdks/java/io/azure/build.gradle | 1 + sdks/java/io/bigquery-io-perf-tests/build.gradle | 2 +- sdks/java/io/cassandra/build.gradle | 1 + sdks/java/io/clickhouse/build.gradle | 1 + sdks/java/io/common/build.gradle | 2 +- sdks/java/io/contextualtextio/build.gradle | 1 + .../io/elasticsearch-tests/elasticsearch-tests-2/build.gradle | 1 + .../io/elasticsearch-tests/elasticsearch-tests-5/build.gradle | 1 + .../io/elasticsearch-tests/elasticsearch-tests-6/build.gradle | 1 + .../io/elasticsearch-tests/elasticsearch-tests-7/build.gradle | 1 + .../elasticsearch-tests/elasticsearch-tests-common/build.gradle | 1 + sdks/java/io/elasticsearch/build.gradle | 2 +- sdks/java/io/expansion-service/build.gradle | 1 + sdks/java/io/file-based-io-tests/build.gradle | 2 +- sdks/java/io/google-cloud-platform/build.gradle | 2 +- .../io/google-cloud-platform/expansion-service/build.gradle | 1 + sdks/java/io/hadoop-common/build.gradle | 2 +- sdks/java/io/hadoop-file-system/build.gradle | 2 +- sdks/java/io/hadoop-format/build.gradle | 1 + sdks/java/io/hbase/build.gradle | 2 +- sdks/java/io/hcatalog/build.gradle | 2 +- sdks/java/io/influxdb/build.gradle | 2 +- sdks/java/io/jdbc/build.gradle | 1 + sdks/java/io/jms/build.gradle | 1 + sdks/java/io/kafka/build.gradle | 1 + sdks/java/io/kinesis/build.gradle | 2 +- sdks/java/io/kinesis/expansion-service/build.gradle | 2 +- sdks/java/io/kudu/build.gradle | 1 + sdks/java/io/mongodb/build.gradle | 2 +- sdks/java/io/mqtt/build.gradle | 2 +- sdks/java/io/parquet/build.gradle | 1 + sdks/java/io/rabbitmq/build.gradle | 2 +- sdks/java/io/redis/build.gradle | 2 +- sdks/java/io/snowflake/build.gradle | 1 + sdks/java/io/snowflake/expansion-service/build.gradle | 2 +- sdks/java/io/solr/build.gradle | 1 + sdks/java/io/splunk/build.gradle | 2 +- sdks/java/io/synthetic/build.gradle | 1 + sdks/java/io/thrift/build.gradle | 1 + sdks/java/io/tika/build.gradle | 2 +- sdks/java/io/xml/build.gradle | 2 +- 44 files changed, 44 insertions(+), 21 deletions(-) diff --git a/sdks/java/io/amazon-web-services/build.gradle b/sdks/java/io/amazon-web-services/build.gradle index f190088c7cb3..b8c226d92f2c 100644 --- a/sdks/java/io/amazon-web-services/build.gradle +++ b/sdks/java/io/amazon-web-services/build.gradle @@ -23,6 +23,7 @@ plugins { } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.aws', ) diff --git a/sdks/java/io/amazon-web-services2/build.gradle b/sdks/java/io/amazon-web-services2/build.gradle index af44011866bf..1aeb439f320a 100644 --- a/sdks/java/io/amazon-web-services2/build.gradle +++ b/sdks/java/io/amazon-web-services2/build.gradle @@ -20,6 +20,7 @@ import groovy.json.JsonOutput plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.aws2', ) provideIntegrationTestingDependencies() diff --git a/sdks/java/io/amqp/build.gradle b/sdks/java/io/amqp/build.gradle index 618ab8e40ac2..2d0f1bcd824a 100644 --- a/sdks/java/io/amqp/build.gradle +++ b/sdks/java/io/amqp/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.amqp') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.amqp') description = "Apache Beam :: SDKs :: Java :: IO :: AMQP" ext.summary = "IO to read and write using AMQP 1.0 protocol (http://www.amqp.org)." diff --git a/sdks/java/io/azure/build.gradle b/sdks/java/io/azure/build.gradle index 81d089c0f886..fb585070ed14 100644 --- a/sdks/java/io/azure/build.gradle +++ b/sdks/java/io/azure/build.gradle @@ -21,6 +21,7 @@ plugins { } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.azure') description = "Apache Beam :: SDKs :: Java :: IO :: Azure" diff --git a/sdks/java/io/bigquery-io-perf-tests/build.gradle b/sdks/java/io/bigquery-io-perf-tests/build.gradle index 1556226612ee..f62983d4e46c 100644 --- a/sdks/java/io/bigquery-io-perf-tests/build.gradle +++ b/sdks/java/io/bigquery-io-perf-tests/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(exportJavadoc: false, publish: false) +applyJavaNature(enableStrictDependencies:true,exportJavadoc: false, publish: false) provideIntegrationTestingDependencies() enableJavaPerformanceTesting() diff --git a/sdks/java/io/cassandra/build.gradle b/sdks/java/io/cassandra/build.gradle index ccaa723044e7..860ec537adc0 100644 --- a/sdks/java/io/cassandra/build.gradle +++ b/sdks/java/io/cassandra/build.gradle @@ -20,6 +20,7 @@ plugins { id 'org.apache.beam.module' } // Do not relocate guava to avoid issues with Cassandra's version. applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.cassandra', ) provideIntegrationTestingDependencies() diff --git a/sdks/java/io/clickhouse/build.gradle b/sdks/java/io/clickhouse/build.gradle index bbd250a94647..49690fafd913 100644 --- a/sdks/java/io/clickhouse/build.gradle +++ b/sdks/java/io/clickhouse/build.gradle @@ -21,6 +21,7 @@ plugins { id 'ca.coglinc.javacc' } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.clickhouse', generatedClassPatterns: [ /^org\.apache\.beam\.sdk\.io\.clickhouse\.impl\.parser\..*/, diff --git a/sdks/java/io/common/build.gradle b/sdks/java/io/common/build.gradle index a17e2b7ddc34..dfd3e4612239 100644 --- a/sdks/java/io/common/build.gradle +++ b/sdks/java/io/common/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(exportJavadoc: false, automaticModuleName: 'org.apache.beam.sdk.io.common') +applyJavaNature(enableStrictDependencies:true,exportJavadoc: false, automaticModuleName: 'org.apache.beam.sdk.io.common') description = "Apache Beam :: SDKs :: Java :: IO :: Common" ext.summary = "Code used by all Beam IOs" diff --git a/sdks/java/io/contextualtextio/build.gradle b/sdks/java/io/contextualtextio/build.gradle index 5df6f1eba762..ec1af81ca300 100644 --- a/sdks/java/io/contextualtextio/build.gradle +++ b/sdks/java/io/contextualtextio/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.contextualtextio', ) diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle index a627e6236bd7..7bda31e3d2bf 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-2' ) diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle index b017cac99a5a..f32d630b8e48 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-5' ) diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle index 15f3bbff86f5..fac39fb26fff 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-6' ) diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle index 5b04c7b770b8..9984da9bfca3 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-7' ) diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle index 1b46a13be738..52924ba7eb2f 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-common' ) diff --git a/sdks/java/io/elasticsearch/build.gradle b/sdks/java/io/elasticsearch/build.gradle index d43784e35980..447b2b968225 100644 --- a/sdks/java/io/elasticsearch/build.gradle +++ b/sdks/java/io/elasticsearch/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.elasticsearch') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.elasticsearch') description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch" ext.summary = "IO to read and write on Elasticsearch" diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle index 06c66bcb4949..b89742720ee7 100644 --- a/sdks/java/io/expansion-service/build.gradle +++ b/sdks/java/io/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.expansion.service', exportJavadoc: false, validateShadowJar: false, diff --git a/sdks/java/io/file-based-io-tests/build.gradle b/sdks/java/io/file-based-io-tests/build.gradle index b47a51d7b633..ec96b3e4a051 100644 --- a/sdks/java/io/file-based-io-tests/build.gradle +++ b/sdks/java/io/file-based-io-tests/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(exportJavadoc: false, publish: false) +applyJavaNature(enableStrictDependencies:true,exportJavadoc: false, publish: false) provideIntegrationTestingDependencies() enableJavaPerformanceTesting() diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 1087e7fe7e57..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, ) 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 b86644d7565b..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, diff --git a/sdks/java/io/hadoop-common/build.gradle b/sdks/java/io/hadoop-common/build.gradle index 552073742edb..dbb9a4ac14d6 100644 --- a/sdks/java/io/hadoop-common/build.gradle +++ b/sdks/java/io/hadoop-common/build.gradle @@ -19,7 +19,7 @@ import java.util.stream.Collectors plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.hadoop.common') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.hadoop.common') description = "Apache Beam :: SDKs :: Java :: IO :: Hadoop Common" ext.summary = "Library to add shared Hadoop classes among Beam IOs." diff --git a/sdks/java/io/hadoop-file-system/build.gradle b/sdks/java/io/hadoop-file-system/build.gradle index 686d42384492..c4c3c93756b5 100644 --- a/sdks/java/io/hadoop-file-system/build.gradle +++ b/sdks/java/io/hadoop-file-system/build.gradle @@ -20,7 +20,7 @@ import java.util.stream.Collectors plugins { id 'org.apache.beam.module' } applyJavaNature( - + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.hdfs') description = "Apache Beam :: SDKs :: Java :: IO :: Hadoop File System" diff --git a/sdks/java/io/hadoop-format/build.gradle b/sdks/java/io/hadoop-format/build.gradle index 6e724a22bb9a..e94adfe39dfc 100644 --- a/sdks/java/io/hadoop-format/build.gradle +++ b/sdks/java/io/hadoop-format/build.gradle @@ -21,6 +21,7 @@ import java.util.stream.Collectors plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.hadoop.format', ) provideIntegrationTestingDependencies() diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index 93a502d44341..143613fb8eb7 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.hbase') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.hbase') provideIntegrationTestingDependencies() enableJavaPerformanceTesting() diff --git a/sdks/java/io/hcatalog/build.gradle b/sdks/java/io/hcatalog/build.gradle index c418a52c571e..eb43a5ee1d2a 100644 --- a/sdks/java/io/hcatalog/build.gradle +++ b/sdks/java/io/hcatalog/build.gradle @@ -19,7 +19,7 @@ import java.util.stream.Collectors plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.hcatalog') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.hcatalog') description = "Apache Beam :: SDKs :: Java :: IO :: HCatalog" ext.summary = "IO to read and write for HCatalog source." diff --git a/sdks/java/io/influxdb/build.gradle b/sdks/java/io/influxdb/build.gradle index 4bbe170097d3..ca9371fe5945 100644 --- a/sdks/java/io/influxdb/build.gradle +++ b/sdks/java/io/influxdb/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.influxdb') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.influxdb') provideIntegrationTestingDependencies() enableJavaPerformanceTesting() diff --git a/sdks/java/io/jdbc/build.gradle b/sdks/java/io/jdbc/build.gradle index 709393874322..124d16d7a296 100644 --- a/sdks/java/io/jdbc/build.gradle +++ b/sdks/java/io/jdbc/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.jdbc', ) provideIntegrationTestingDependencies() diff --git a/sdks/java/io/jms/build.gradle b/sdks/java/io/jms/build.gradle index b73fa8d592cc..45a9336aa03e 100644 --- a/sdks/java/io/jms/build.gradle +++ b/sdks/java/io/jms/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.jms', ) diff --git a/sdks/java/io/kafka/build.gradle b/sdks/java/io/kafka/build.gradle index 9207a661ab39..8c97f079a026 100644 --- a/sdks/java/io/kafka/build.gradle +++ b/sdks/java/io/kafka/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.io.kafka', mavenRepositories: [ [id: 'io.confluent', url: 'https://packages.confluent.io/maven/'] diff --git a/sdks/java/io/kinesis/build.gradle b/sdks/java/io/kinesis/build.gradle index e6744d8bfffe..f42c6b7bae4a 100644 --- a/sdks/java/io/kinesis/build.gradle +++ b/sdks/java/io/kinesis/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.kinesis') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.kinesis') provideIntegrationTestingDependencies() enableJavaPerformanceTesting() diff --git a/sdks/java/io/kinesis/expansion-service/build.gradle b/sdks/java/io/kinesis/expansion-service/build.gradle index 1e07a04fc531..38092d3bb987 100644 --- a/sdks/java/io/kinesis/expansion-service/build.gradle +++ b/sdks/java/io/kinesis/expansion-service/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'application' mainClassName = "org.apache.beam.sdk.expansion.service.ExpansionService" applyJavaNature( - + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.kinesis.expansion.service', exportJavadoc: false, validateShadowJar: false, diff --git a/sdks/java/io/kudu/build.gradle b/sdks/java/io/kudu/build.gradle index 7f28d5ecf9cf..07e8a52f700b 100644 --- a/sdks/java/io/kudu/build.gradle +++ b/sdks/java/io/kudu/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, classesTriggerCheckerBugs: [ 'KuduTestUtils': 'TODO: file a bug report', 'KuduIOIT': 'TODO: file a bug report', diff --git a/sdks/java/io/mongodb/build.gradle b/sdks/java/io/mongodb/build.gradle index 1e5baf79d13e..30ede18d9db1 100644 --- a/sdks/java/io/mongodb/build.gradle +++ b/sdks/java/io/mongodb/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.mongodb') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.mongodb') provideIntegrationTestingDependencies() enableJavaPerformanceTesting() diff --git a/sdks/java/io/mqtt/build.gradle b/sdks/java/io/mqtt/build.gradle index e103c2479c61..0b59ea191ad3 100644 --- a/sdks/java/io/mqtt/build.gradle +++ b/sdks/java/io/mqtt/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.mqtt') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.mqtt') description = "Apache Beam :: SDKs :: Java :: IO :: MQTT" ext.summary = "IO to read and write to a MQTT broker." diff --git a/sdks/java/io/parquet/build.gradle b/sdks/java/io/parquet/build.gradle index 8421ace28b03..faa5f561b04d 100644 --- a/sdks/java/io/parquet/build.gradle +++ b/sdks/java/io/parquet/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.io.parquet', ) diff --git a/sdks/java/io/rabbitmq/build.gradle b/sdks/java/io/rabbitmq/build.gradle index 2b8008437e33..7d8f0dc1cd4c 100644 --- a/sdks/java/io/rabbitmq/build.gradle +++ b/sdks/java/io/rabbitmq/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.rabbitmq') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.rabbitmq') description = "Apache Beam :: SDKs :: Java :: IO :: RabbitMQ" ext.summary = "IO to read and write to a RabbitMQ broker." diff --git a/sdks/java/io/redis/build.gradle b/sdks/java/io/redis/build.gradle index a09900a25c4d..53a7b5baf870 100644 --- a/sdks/java/io/redis/build.gradle +++ b/sdks/java/io/redis/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.redis') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.redis') description = "Apache Beam :: SDKs :: Java :: IO :: Redis" ext.summary ="IO to read and write on a Redis keystore." diff --git a/sdks/java/io/snowflake/build.gradle b/sdks/java/io/snowflake/build.gradle index c8aca747fff0..06cdc8eba505 100644 --- a/sdks/java/io/snowflake/build.gradle +++ b/sdks/java/io/snowflake/build.gradle @@ -17,6 +17,7 @@ */ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.snowflake', ) provideIntegrationTestingDependencies() diff --git a/sdks/java/io/snowflake/expansion-service/build.gradle b/sdks/java/io/snowflake/expansion-service/build.gradle index 8e0cb5be4202..33ae4e8a1a98 100644 --- a/sdks/java/io/snowflake/expansion-service/build.gradle +++ b/sdks/java/io/snowflake/expansion-service/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'application' mainClassName = "org.apache.beam.sdk.expansion.service.ExpansionService" applyJavaNature( - + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.expansion.service', exportJavadoc: false, validateShadowJar: false, diff --git a/sdks/java/io/solr/build.gradle b/sdks/java/io/solr/build.gradle index efdfde26e043..9c49d1fdc667 100644 --- a/sdks/java/io/solr/build.gradle +++ b/sdks/java/io/solr/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.solr', ) diff --git a/sdks/java/io/splunk/build.gradle b/sdks/java/io/splunk/build.gradle index 8992a0ee9ad6..babf6f8e5d5c 100644 --- a/sdks/java/io/splunk/build.gradle +++ b/sdks/java/io/splunk/build.gradle @@ -19,7 +19,7 @@ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.splunk') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.splunk') description = "Apache Beam :: SDKs :: Java :: IO :: Splunk" ext.summary = "IO to write events to Splunk Http Event Collector (HEC)" diff --git a/sdks/java/io/synthetic/build.gradle b/sdks/java/io/synthetic/build.gradle index f89fe3b5db8c..ab76b60fa502 100644 --- a/sdks/java/io/synthetic/build.gradle +++ b/sdks/java/io/synthetic/build.gradle @@ -18,6 +18,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( + enableStrictDependencies:true, exportJavadoc: false, automaticModuleName: 'org.apache.beam.sdk.io.synthetic', ) diff --git a/sdks/java/io/thrift/build.gradle b/sdks/java/io/thrift/build.gradle index 516240408f8c..21e5b28c4cde 100644 --- a/sdks/java/io/thrift/build.gradle +++ b/sdks/java/io/thrift/build.gradle @@ -21,6 +21,7 @@ plugins { // id "org.jruyi.thrift" version "0.4.1" } applyJavaNature( + enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.thrift', generatedClassPatterns: [ /^org\.apache\.beam\.sdk\.io\.thrift\.TestThriftStruct/, diff --git a/sdks/java/io/tika/build.gradle b/sdks/java/io/tika/build.gradle index cea2103df9ad..931261ad74ff 100644 --- a/sdks/java/io/tika/build.gradle +++ b/sdks/java/io/tika/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.tika') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.tika') description = "Apache Beam :: SDKs :: Java :: IO :: Tika" ext.summary = "Tika Input to parse files." diff --git a/sdks/java/io/xml/build.gradle b/sdks/java/io/xml/build.gradle index 24040b0556cb..91e40bf88752 100644 --- a/sdks/java/io/xml/build.gradle +++ b/sdks/java/io/xml/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.xml') +applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.xml') description = "Apache Beam :: SDKs :: Java :: IO :: XML" ext.summary = "IO to read and write XML files." From dd44bd3debdf9e753a7340a53241c24eee9139c5 Mon Sep 17 00:00:00 2001 From: Sonam Ramchand Date: Thu, 7 Jan 2021 15:08:18 +0500 Subject: [PATCH 03/13] Enabled strict dependency over sdks-io --- sdks/java/io/amazon-web-services/build.gradle | 3 +- .../java/io/amazon-web-services2/build.gradle | 9 +++-- sdks/java/io/amqp/build.gradle | 4 +-- sdks/java/io/azure/build.gradle | 4 ++- .../io/bigquery-io-perf-tests/build.gradle | 5 +-- sdks/java/io/cassandra/build.gradle | 1 + sdks/java/io/clickhouse/build.gradle | 4 +++ sdks/java/io/contextualtextio/build.gradle | 5 +-- sdks/java/io/elasticsearch/build.gradle | 8 ++++- sdks/java/io/expansion-service/build.gradle | 5 --- sdks/java/io/file-based-io-tests/build.gradle | 2 -- .../io/google-cloud-platform/build.gradle | 36 ++++++++++--------- .../expansion-service/build.gradle | 2 -- sdks/java/io/hadoop-common/build.gradle | 2 -- sdks/java/io/hadoop-file-system/build.gradle | 2 -- sdks/java/io/hadoop-format/build.gradle | 3 +- sdks/java/io/hcatalog/build.gradle | 3 +- sdks/java/io/influxdb/build.gradle | 3 ++ sdks/java/io/jdbc/build.gradle | 11 +++--- sdks/java/io/jms/build.gradle | 6 ++-- sdks/java/io/kafka/build.gradle | 13 +++++-- sdks/java/io/kinesis/build.gradle | 6 ++-- .../io/kinesis/expansion-service/build.gradle | 2 -- sdks/java/io/kudu/build.gradle | 2 -- sdks/java/io/mongodb/build.gradle | 2 -- sdks/java/io/mqtt/build.gradle | 6 ++-- sdks/java/io/parquet/build.gradle | 3 +- sdks/java/io/rabbitmq/build.gradle | 2 -- sdks/java/io/redis/build.gradle | 2 -- sdks/java/io/snowflake/build.gradle | 4 +-- .../snowflake/expansion-service/build.gradle | 2 -- sdks/java/io/solr/build.gradle | 5 ++- sdks/java/io/splunk/build.gradle | 7 +++- sdks/java/io/synthetic/build.gradle | 4 +-- sdks/java/io/thrift/build.gradle | 5 --- sdks/java/io/tika/build.gradle | 5 +-- sdks/java/io/xml/build.gradle | 5 ++- 37 files changed, 92 insertions(+), 101 deletions(-) diff --git a/sdks/java/io/amazon-web-services/build.gradle b/sdks/java/io/amazon-web-services/build.gradle index c7c3874b2af4..f190088c7cb3 100644 --- a/sdks/java/io/amazon-web-services/build.gradle +++ b/sdks/java/io/amazon-web-services/build.gradle @@ -39,11 +39,12 @@ dependencies { compile library.java.aws_java_sdk_sns compile library.java.aws_java_sdk_sqs compile library.java.aws_java_sdk_sts - compile "commons-lang:commons-lang:2.6" compile library.java.jackson_core compile library.java.jackson_annotations compile library.java.jackson_databind compile library.java.slf4j_api + compile library.java.joda_time + compile "org.apache.httpcomponents:httpcore:4.4.11" runtime library.java.commons_codec runtime "org.apache.httpcomponents:httpclient:4.5.12" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") diff --git a/sdks/java/io/amazon-web-services2/build.gradle b/sdks/java/io/amazon-web-services2/build.gradle index 854263ec973d..af44011866bf 100644 --- a/sdks/java/io/amazon-web-services2/build.gradle +++ b/sdks/java/io/amazon-web-services2/build.gradle @@ -42,23 +42,26 @@ dependencies { compile library.java.jackson_core compile library.java.jackson_annotations compile library.java.jackson_databind - compile library.java.jackson_dataformat_cbor compile library.java.joda_time compile library.java.slf4j_api compile "software.amazon.kinesis:amazon-kinesis-client:2.2.5" compile "commons-lang:commons-lang:2.6" + compile "org.apache.commons:commons-lang3:3.9" + compile "org.apache.httpcomponents:httpcore:4.4.11" + compile "org.checkerframework:checker-qual:2.0.0" + compile "software.amazon.awssdk:http-client-spi:2.13.54" + compile "software.amazon.awssdk:regions:2.13.54" + compile "software.amazon.awssdk:utils:2.13.54" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:io:kinesis", configuration: "testRuntime") testCompile library.java.mockito_core testCompile library.java.guava_testlib - testCompile library.java.hamcrest_core testCompile library.java.junit testCompile 'org.elasticmq:elasticmq-rest-sqs_2.12:0.15.6' testCompile library.java.hamcrest_library testCompile library.java.powermock testCompile library.java.powermock_mockito - testCompile library.java.testcontainers_localstack testCompile "org.assertj:assertj-core:3.11.1" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/amqp/build.gradle b/sdks/java/io/amqp/build.gradle index 9c9f60c327e7..618ab8e40ac2 100644 --- a/sdks/java/io/amqp/build.gradle +++ b/sdks/java/io/amqp/build.gradle @@ -27,12 +27,10 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.joda_time compile "org.apache.qpid:proton-j:0.16.0" + testCompile library.java.activemq_amqp testCompile library.java.slf4j_api testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.activemq_broker - testCompile library.java.activemq_amqp testCompile library.java.activemq_junit testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/azure/build.gradle b/sdks/java/io/azure/build.gradle index 97d31f9d9640..81d089c0f886 100644 --- a/sdks/java/io/azure/build.gradle +++ b/sdks/java/io/azure/build.gradle @@ -34,8 +34,10 @@ dependencies { compile "com.azure:azure-storage-blob:12.8.0" compile "com.azure:azure-identity:1.0.8" compile "com.microsoft.azure:azure-storage:8.6.5" - compile "commons-io:commons-io:2.6" compile library.java.slf4j_api + compile "com.azure:azure-core:1.6.0" + compile "com.azure:azure-storage-common:12.1.0" + compile "org.checkerframework:checker-qual:2.0.0" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.mockito_core testCompile library.java.junit diff --git a/sdks/java/io/bigquery-io-perf-tests/build.gradle b/sdks/java/io/bigquery-io-perf-tests/build.gradle index 8d5cf89195d3..1556226612ee 100644 --- a/sdks/java/io/bigquery-io-perf-tests/build.gradle +++ b/sdks/java/io/bigquery-io-perf-tests/build.gradle @@ -25,7 +25,7 @@ description = "Apache Beam :: SDKs :: Java :: Google BigQuery IO Performance tes ext.summary = "Performance tests for Google BigQuery IO sources and sinks" dependencies { - compile library.java.google_api_services_bigquery + testImplementation 'com.google.apis:google-api-services-bigquery:v2-rev20200719-1.30.10' testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntime") @@ -34,7 +34,4 @@ dependencies { testCompile project(path: ":sdks:java:io:google-cloud-platform", configuration: "testRuntime") testCompile project(":sdks:java:io:synthetic") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.jaxb_api - testCompile library.java.jaxb_impl } diff --git a/sdks/java/io/cassandra/build.gradle b/sdks/java/io/cassandra/build.gradle index 6fc6e92b91af..ccaa723044e7 100644 --- a/sdks/java/io/cassandra/build.gradle +++ b/sdks/java/io/cassandra/build.gradle @@ -37,6 +37,7 @@ dependencies { compile library.java.slf4j_api compile library.java.cassandra_driver_core compile library.java.cassandra_driver_mapping + compile "org.checkerframework:checker-qual:2.0.0" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit testCompile library.java.hamcrest_core diff --git a/sdks/java/io/clickhouse/build.gradle b/sdks/java/io/clickhouse/build.gradle index 42deda7c14ab..bbd250a94647 100644 --- a/sdks/java/io/clickhouse/build.gradle +++ b/sdks/java/io/clickhouse/build.gradle @@ -56,6 +56,10 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.joda_time compile "ru.yandex.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version" + compile "com.google.guava:guava:25.1-jre" + compile library.java.vendored_guava_26_0_jre + compile "org.checkerframework:checker-qual:2.0.0" + compile library.java.slf4j_api testCompile library.java.slf4j_api testCompile library.java.junit testCompile library.java.hamcrest_core diff --git a/sdks/java/io/contextualtextio/build.gradle b/sdks/java/io/contextualtextio/build.gradle index 0ebd983eeb60..5df6f1eba762 100644 --- a/sdks/java/io/contextualtextio/build.gradle +++ b/sdks/java/io/contextualtextio/build.gradle @@ -26,10 +26,11 @@ ext.summary = "Context-aware Text IO." dependencies { compile library.java.vendored_guava_26_0_jre - compile library.java.protobuf_java compile project(path: ":sdks:java:core", configuration: "shadow") - testCompile project(path: ":sdks:java:core", configuration: "shadowTest") + compile library.java.vendored_grpc_1_26_0 + compile library.java.slf4j_api + testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.guava_testlib testCompile library.java.junit testCompile library.java.hamcrest_core diff --git a/sdks/java/io/elasticsearch/build.gradle b/sdks/java/io/elasticsearch/build.gradle index ac9e5e96cf02..d43784e35980 100644 --- a/sdks/java/io/elasticsearch/build.gradle +++ b/sdks/java/io/elasticsearch/build.gradle @@ -26,7 +26,13 @@ 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_annotations + compile library.java.jackson_core + compile library.java.joda_time + compile "org.apache.httpcomponents:httpasyncclient:4.1.4" + compile "org.apache.httpcomponents:httpclient:4.5.10" + compile "org.apache.httpcomponents:httpcore-nio:4.4.12" + compile "org.apache.httpcomponents:httpcore:4.4.12" + compile library.java.slf4j_api compile "org.elasticsearch.client:elasticsearch-rest-client:7.9.2" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") } diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle index 75ff5ad05544..06c66bcb4949 100644 --- a/sdks/java/io/expansion-service/build.gradle +++ b/sdks/java/io/expansion-service/build.gradle @@ -31,11 +31,6 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Expansion Service" ext.summary = "Expansion service serving several Java IOs" dependencies { - compile project(":sdks:java:expansion-service") - compile project(":sdks:java:io:kafka") - compile project(":sdks:java:io:jdbc") - // Include postgres so it can be used with external JDBC - compile library.java.postgres runtime library.java.kafka_clients runtime library.java.slf4j_jdk14 } diff --git a/sdks/java/io/file-based-io-tests/build.gradle b/sdks/java/io/file-based-io-tests/build.gradle index 6c53e90ff17f..b47a51d7b633 100644 --- a/sdks/java/io/file-based-io-tests/build.gradle +++ b/sdks/java/io/file-based-io-tests/build.gradle @@ -31,8 +31,6 @@ dependencies { testCompile project(path: ":sdks:java:io:parquet", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile library.java.jaxb_api - testCompile library.java.jaxb_impl testCompile library.java.junit - testCompile library.java.hamcrest_core testCompile library.java.hadoop_client } diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 7ac6878eae80..1087e7fe7e57 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -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..b86644d7565b 100644 --- a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle +++ b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle @@ -31,7 +31,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 } diff --git a/sdks/java/io/hadoop-common/build.gradle b/sdks/java/io/hadoop-common/build.gradle index 534512e49d10..552073742edb 100644 --- a/sdks/java/io/hadoop-common/build.gradle +++ b/sdks/java/io/hadoop-common/build.gradle @@ -38,8 +38,6 @@ dependencies { provided library.java.hadoop_client provided library.java.hadoop_common provided library.java.hadoop_mapreduce_client_core - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit hadoopVersions.each {kv -> "hadoopVersion$kv.key" "org.apache.hadoop:hadoop-client:$kv.value" diff --git a/sdks/java/io/hadoop-file-system/build.gradle b/sdks/java/io/hadoop-file-system/build.gradle index 39ba9ba452e0..686d42384492 100644 --- a/sdks/java/io/hadoop-file-system/build.gradle +++ b/sdks/java/io/hadoop-file-system/build.gradle @@ -45,8 +45,6 @@ dependencies { provided library.java.hadoop_common provided library.java.hadoop_mapreduce_client_core 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 testCompile library.java.hadoop_minicluster diff --git a/sdks/java/io/hadoop-format/build.gradle b/sdks/java/io/hadoop-format/build.gradle index 5ab4a55013a3..6e724a22bb9a 100644 --- a/sdks/java/io/hadoop-format/build.gradle +++ b/sdks/java/io/hadoop-format/build.gradle @@ -60,6 +60,7 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile library.java.slf4j_api compile project(":sdks:java:io:hadoop-common") + compile library.java.joda_time provided library.java.hadoop_common provided library.java.hadoop_hdfs provided library.java.hadoop_mapreduce_client_core @@ -68,6 +69,7 @@ dependencies { testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile project(":sdks:java:io:jdbc") testCompile project(path: ":examples:java", configuration: "testRuntime") + testCompile "org.elasticsearch.plugin:transport-netty4-client:$elastic_search_version" testCompile library.java.testcontainers_elasticsearch testCompile "org.elasticsearch.client:elasticsearch-rest-high-level-client:$elastic_search_version" testCompile "org.elasticsearch:elasticsearch:$elastic_search_version" @@ -90,7 +92,6 @@ dependencies { testCompile library.java.cassandra_driver_mapping testCompile "org.apache.cassandra:cassandra-all:3.11.8" testCompile library.java.postgres - testCompile "org.apache.logging.log4j:log4j-core:$log4j_version" testCompile library.java.junit testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library diff --git a/sdks/java/io/hcatalog/build.gradle b/sdks/java/io/hcatalog/build.gradle index d1c9e6fa9831..c418a52c571e 100644 --- a/sdks/java/io/hcatalog/build.gradle +++ b/sdks/java/io/hcatalog/build.gradle @@ -55,6 +55,7 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:io:hadoop-common") compile library.java.slf4j_api + compile library.java.joda_time // Hive bundles without repackaging Jackson which is why we redeclare it here so that it appears // on the compile/test/runtime classpath before Hive. provided library.java.jackson_annotations @@ -65,8 +66,6 @@ dependencies { provided library.java.hadoop_common provided "org.apache.hive:hive-exec:$hive_version" provided(group: "org.apache.hive.hcatalog", name: "hive-hcatalog-core", version: hive_version) { - exclude group: "org.apache.hive", module: "hive-exec" - exclude group: "com.google.protobuf", module: "protobuf-java" } testCompile project(":sdks:java:io:common").sourceSets.test.output testCompile library.java.commons_io diff --git a/sdks/java/io/influxdb/build.gradle b/sdks/java/io/influxdb/build.gradle index 782c57218eae..4bbe170097d3 100644 --- a/sdks/java/io/influxdb/build.gradle +++ b/sdks/java/io/influxdb/build.gradle @@ -27,6 +27,9 @@ ext.summary = "IO to read and write on InfluxDB" dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.influxdb_library + compile "com.squareup.okhttp3:okhttp:4.6.0" + compile library.java.vendored_guava_26_0_jre + compile library.java.slf4j_api testCompile library.java.junit testCompile library.java.powermock testCompile library.java.powermock_mockito diff --git a/sdks/java/io/jdbc/build.gradle b/sdks/java/io/jdbc/build.gradle index 549749c1d830..709393874322 100644 --- a/sdks/java/io/jdbc/build.gradle +++ b/sdks/java/io/jdbc/build.gradle @@ -30,17 +30,18 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile "org.apache.commons:commons-dbcp2:2.6.0" + compile library.java.joda_time + compile "org.apache.commons:commons-pool2:2.6.1" + compile library.java.slf4j_api + testCompile "org.apache.derby:derby:10.14.2.0" + testCompile "org.apache.derby:derbyclient:10.14.2.0" + testCompile "org.apache.derby:derbynet:10.14.2.0" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.slf4j_api testCompile library.java.postgres - testCompile "org.apache.derby:derby:10.14.2.0" - testCompile "org.apache.derby:derbyclient:10.14.2.0" - testCompile "org.apache.derby:derbynet:10.14.2.0" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/jms/build.gradle b/sdks/java/io/jms/build.gradle index 657bed432fae..b73fa8d592cc 100644 --- a/sdks/java/io/jms/build.gradle +++ b/sdks/java/io/jms/build.gradle @@ -30,14 +30,12 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.slf4j_api compile library.java.joda_time - compile "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" - testCompile library.java.activemq_broker testCompile library.java.activemq_jaas testCompile library.java.activemq_kahadb_store + compile "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" + testCompile library.java.activemq_broker testCompile library.java.activemq_client testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/kafka/build.gradle b/sdks/java/io/kafka/build.gradle index a500ddd49fb5..9207a661ab39 100644 --- a/sdks/java/io/kafka/build.gradle +++ b/sdks/java/io/kafka/build.gradle @@ -48,7 +48,9 @@ kafkaVersions.each{k,v -> configurations.create("kafkaVersion$k")} dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") - compile project(":sdks:java:expansion-service") + testCompile project(":sdks:java:expansion-service") + compile "org.apache.kafka:kafka-clients:2.4.1" + compile library.java.avro // Get back to "provided" since 2.14 provided library.java.kafka_clients compile library.java.slf4j_api @@ -57,6 +59,13 @@ dependencies { compile library.java.jackson_databind compile "org.springframework:spring-expression:4.3.18.RELEASE" compile ("io.confluent:kafka-avro-serializer:5.3.2") { + // zookeeper depends on "spotbugs-annotations:3.1.9" which clashes with current + // "spotbugs-annotations:3.1.12" used in Beam. Not required. + exclude group: "org.apache.zookeeper", module: "zookeeper" + // "kafka-clients" has to be provided since user can use its own version. + exclude group: "org.apache.kafka", module: "kafka-clients" + } + compile ("io.confluent:kafka-schema-registry-client:5.3.2") { // It depends on "spotbugs-annotations:3.1.9" which clashes with current // "spotbugs-annotations:3.1.12" used in Beam. Not required. exclude group: "org.apache.zookeeper", module: "zookeeper" @@ -71,8 +80,6 @@ dependencies { // For testing Cross-language transforms testCompile project(":runners:core-construction-java") testCompile library.java.avro - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit testCompile library.java.powermock testCompile library.java.powermock_mockito diff --git a/sdks/java/io/kinesis/build.gradle b/sdks/java/io/kinesis/build.gradle index bb513d875c6f..e6744d8bfffe 100644 --- a/sdks/java/io/kinesis/build.gradle +++ b/sdks/java/io/kinesis/build.gradle @@ -33,7 +33,6 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.slf4j_api compile library.java.joda_time - compile library.java.jackson_dataformat_cbor compile library.java.guava compile library.java.aws_java_sdk_cloudwatch compile library.java.aws_java_sdk_core @@ -41,12 +40,13 @@ dependencies { compile "com.amazonaws:amazon-kinesis-client:1.13.0" compile "com.amazonaws:amazon-kinesis-producer:0.14.1" compile "commons-lang:commons-lang:2.6" + compile library.java.vendored_guava_26_0_jre + compile "org.apache.commons:commons-lang3:3.9" + compile "org.checkerframework:checker-qual:2.0.0" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit testCompile library.java.mockito_core testCompile library.java.guava_testlib - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.powermock testCompile library.java.powermock_mockito testCompile library.java.testcontainers_localstack diff --git a/sdks/java/io/kinesis/expansion-service/build.gradle b/sdks/java/io/kinesis/expansion-service/build.gradle index ef3db42f0e2d..1e07a04fc531 100644 --- a/sdks/java/io/kinesis/expansion-service/build.gradle +++ b/sdks/java/io/kinesis/expansion-service/build.gradle @@ -32,7 +32,5 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Kinesis :: Expansion Service ext.summary = "Expansion service serving KinesisIO" dependencies { - compile project(":sdks:java:expansion-service") - compile project(":sdks:java:io:kinesis") runtime library.java.slf4j_jdk14 } diff --git a/sdks/java/io/kudu/build.gradle b/sdks/java/io/kudu/build.gradle index ffd776021dd4..7f28d5ecf9cf 100644 --- a/sdks/java/io/kudu/build.gradle +++ b/sdks/java/io/kudu/build.gradle @@ -50,8 +50,6 @@ dependencies { compile library.java.slf4j_api testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/mongodb/build.gradle b/sdks/java/io/mongodb/build.gradle index 4e6ef1c67391..1e5baf79d13e 100644 --- a/sdks/java/io/mongodb/build.gradle +++ b/sdks/java/io/mongodb/build.gradle @@ -31,8 +31,6 @@ dependencies { compile library.java.joda_time compile "org.mongodb:mongo-java-driver:3.12.7" testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile "de.flapdoodle.embed:de.flapdoodle.embed.mongo:2.2.0" diff --git a/sdks/java/io/mqtt/build.gradle b/sdks/java/io/mqtt/build.gradle index a384274de773..e103c2479c61 100644 --- a/sdks/java/io/mqtt/build.gradle +++ b/sdks/java/io/mqtt/build.gradle @@ -27,15 +27,13 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.slf4j_api compile library.java.joda_time + testCompile library.java.activemq_mqtt + testCompile library.java.activemq_kahadb_store compile "org.fusesource.mqtt-client:mqtt-client:1.15" compile "org.fusesource.hawtbuf:hawtbuf:1.11" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.activemq_broker - testCompile library.java.activemq_mqtt - testCompile library.java.activemq_kahadb_store testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/parquet/build.gradle b/sdks/java/io/parquet/build.gradle index b3af3c6f0a43..8421ace28b03 100644 --- a/sdks/java/io/parquet/build.gradle +++ b/sdks/java/io/parquet/build.gradle @@ -46,11 +46,10 @@ dependencies { compile "org.apache.parquet:parquet-common:$parquet_version" compile "org.apache.parquet:parquet-hadoop:$parquet_version" compile library.java.avro + compile "org.apache.parquet:parquet-column:1.10.0" provided library.java.hadoop_client testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") hadoopVersions.each {kv -> diff --git a/sdks/java/io/rabbitmq/build.gradle b/sdks/java/io/rabbitmq/build.gradle index 2256bc3726ab..2b8008437e33 100644 --- a/sdks/java/io/rabbitmq/build.gradle +++ b/sdks/java/io/rabbitmq/build.gradle @@ -35,8 +35,6 @@ dependencies { testCompile "org.apache.qpid:qpid-broker-plugins-memory-store:$qpid_version" testCompile "org.apache.qpid:qpid-broker-plugins-amqp-0-8-protocol:$qpid_version" testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.slf4j_api testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/redis/build.gradle b/sdks/java/io/redis/build.gradle index 611053f10df4..a09900a25c4d 100644 --- a/sdks/java/io/redis/build.gradle +++ b/sdks/java/io/redis/build.gradle @@ -28,8 +28,6 @@ dependencies { compile "redis.clients:jedis:3.3.0" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile "com.github.kstyrc:embedded-redis:0.6" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/snowflake/build.gradle b/sdks/java/io/snowflake/build.gradle index a6adc23ebba8..c8aca747fff0 100644 --- a/sdks/java/io/snowflake/build.gradle +++ b/sdks/java/io/snowflake/build.gradle @@ -27,19 +27,17 @@ ext.summary = "IO to read and write on Snowflake." dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") - compile project(path: ":sdks:java:extensions:google-cloud-platform-core") compile library.java.slf4j_api compile group: 'net.snowflake', name: 'snowflake-jdbc', version: '3.12.11' compile group: 'com.opencsv', name: 'opencsv', version: '5.0' compile 'net.snowflake:snowflake-ingest-sdk:0.9.9' + compile library.java.joda_time testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile 'com.google.cloud:google-cloud-storage:1.102.0' testCompile library.java.avro testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.slf4j_api testRuntimeOnly library.java.hadoop_client testRuntimeOnly library.java.slf4j_jdk14 diff --git a/sdks/java/io/snowflake/expansion-service/build.gradle b/sdks/java/io/snowflake/expansion-service/build.gradle index fe442b41af47..8e0cb5be4202 100644 --- a/sdks/java/io/snowflake/expansion-service/build.gradle +++ b/sdks/java/io/snowflake/expansion-service/build.gradle @@ -32,8 +32,6 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Snowflake ::Expansion Servic ext.summary = "Expansion service serving Snowflake IO" dependencies { - compile project(":sdks:java:expansion-service") - compile project(":sdks:java:io:snowflake") runtime library.java.slf4j_jdk14 } diff --git a/sdks/java/io/solr/build.gradle b/sdks/java/io/solr/build.gradle index 33a9b5cb69c7..efdfde26e043 100644 --- a/sdks/java/io/solr/build.gradle +++ b/sdks/java/io/solr/build.gradle @@ -30,12 +30,11 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.commons_compress + compile library.java.joda_time + compile library.java.slf4j_api compile "org.apache.solr:solr-solrj:$solrVersion" - compileOnly "org.apache.httpcomponents:httpclient:4.5.6" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(":sdks:java:io:common") - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testCompile library.java.junit testCompile library.java.slf4j_api testCompile "org.apache.solr:solr-test-framework:$solrVersion" diff --git a/sdks/java/io/splunk/build.gradle b/sdks/java/io/splunk/build.gradle index a8a31b7354d6..8992a0ee9ad6 100644 --- a/sdks/java/io/splunk/build.gradle +++ b/sdks/java/io/splunk/build.gradle @@ -27,10 +27,15 @@ ext.summary = "IO to write events to Splunk Http Event Collector (HEC)" dependencies { compile platform(library.java.google_cloud_platform_libraries_bom) compile library.java.slf4j_api - compile library.java.google_api_client compile library.java.google_http_client_apache_v2 compile library.java.google_code_gson compile project(path: ":sdks:java:core", configuration: "shadow") + compile "com.google.http-client:google-http-client:1.34.0" + compile library.java.joda_time + compile library.java.vendored_guava_26_0_jre + compile "org.apache.httpcomponents:httpclient:4.5.10" + compile "org.apache.httpcomponents:httpcore:4.4.12" + compile "org.checkerframework:checker-qual:2.0.0" testCompile library.java.junit testCompile group: 'org.mock-server', name: 'mockserver-junit-rule', version: '5.10.0' testCompile group: 'org.mock-server', name: 'mockserver-client-java', version: '5.10.0' diff --git a/sdks/java/io/synthetic/build.gradle b/sdks/java/io/synthetic/build.gradle index cb9cbf8db1d7..f89fe3b5db8c 100644 --- a/sdks/java/io/synthetic/build.gradle +++ b/sdks/java/io/synthetic/build.gradle @@ -31,11 +31,11 @@ dependencies { compile library.java.jackson_core compile library.java.jackson_annotations compile library.java.jackson_databind + compile library.java.vendored_guava_26_0_jre + compile library.java.slf4j_api compile project(path: ":sdks:java:core", configuration: "shadow") testCompile library.java.vendored_guava_26_0_jre testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/thrift/build.gradle b/sdks/java/io/thrift/build.gradle index d22b934256e7..516240408f8c 100644 --- a/sdks/java/io/thrift/build.gradle +++ b/sdks/java/io/thrift/build.gradle @@ -39,11 +39,6 @@ dependencies { compile "org.apache.thrift:libthrift:0.13.0" compile project(path: ":sdks:java:core", configuration: "shadow") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library - testCompile library.java.jackson_databind - testCompile "com.google.code.gson:gson:2.8.6" - testCompile "commons-io:commons-io:2.6" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/tika/build.gradle b/sdks/java/io/tika/build.gradle index 28c6c622a31f..cea2103df9ad 100644 --- a/sdks/java/io/tika/build.gradle +++ b/sdks/java/io/tika/build.gradle @@ -27,14 +27,11 @@ def bndlib_version = "1.43.0" dependencies { compile library.java.vendored_guava_26_0_jre - compileOnly "biz.aQute:bndlib:$bndlib_version" compile project(path: ":sdks:java:core", configuration: "shadow") compile "org.apache.tika:tika-core:$tika_version" + testCompile "org.apache.tika:tika-parsers:$tika_version" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library - testCompile "org.apache.tika:tika-parsers:$tika_version" testCompileOnly "biz.aQute:bndlib:$bndlib_version" testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } diff --git a/sdks/java/io/xml/build.gradle b/sdks/java/io/xml/build.gradle index d6c8ba2761e3..24040b0556cb 100644 --- a/sdks/java/io/xml/build.gradle +++ b/sdks/java/io/xml/build.gradle @@ -24,15 +24,14 @@ ext.summary = "IO to read and write XML files." dependencies { compile library.java.jaxb_api - compile library.java.jaxb_impl compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.stax2_api + compile "javax.xml.stream:stax-api:1.0-2" compile library.java.woodstox_core_asl + permitUnusedDeclared library.java.woodstox_core_asl testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.junit - testCompile library.java.hamcrest_core - testCompile library.java.hamcrest_library testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") } From 224ac85f31ac9f2c037945c398fab4173a265926 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Fri, 22 Jan 2021 02:53:44 -0800 Subject: [PATCH 04/13] move google-cloud-platform changes to a different PR --- .../io/google-cloud-platform/build.gradle | 38 +++++++++---------- .../expansion-service/build.gradle | 3 +- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 3a8fd50c3fa4..7ac6878eae80 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") - testCompile project(":sdks:java:expansion-service") + compile 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,6 +50,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 @@ -57,40 +60,32 @@ 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 - testImplementation 'io.grpc:grpc-core:1.27.2' + compile library.java.grpc_core + compile library.java.grpc_context + compile library.java.grpc_grpclb 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") @@ -98,6 +93,7 @@ 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 9a1bd41084e4..2d1799762761 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,6 @@ 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, @@ -32,5 +31,7 @@ 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 5d59cc81d1dae543fccaf0974493c0f8f649e39e Mon Sep 17 00:00:00 2001 From: shehzaadn-vd <32536022+shehzaadn-vd@users.noreply.github.com> Date: Fri, 22 Jan 2021 09:08:11 -0800 Subject: [PATCH 05/13] Apply suggestions from code review remove checker-qual:2.0.0 declarations (since that is declared globally) Co-authored-by: Kyle Weaver --- sdks/java/io/amazon-web-services2/build.gradle | 1 - sdks/java/io/azure/build.gradle | 1 - sdks/java/io/cassandra/build.gradle | 1 - sdks/java/io/clickhouse/build.gradle | 1 - sdks/java/io/kinesis/build.gradle | 1 - sdks/java/io/splunk/build.gradle | 1 - 6 files changed, 6 deletions(-) diff --git a/sdks/java/io/amazon-web-services2/build.gradle b/sdks/java/io/amazon-web-services2/build.gradle index 1aeb439f320a..dccf592ab4a6 100644 --- a/sdks/java/io/amazon-web-services2/build.gradle +++ b/sdks/java/io/amazon-web-services2/build.gradle @@ -49,7 +49,6 @@ dependencies { compile "commons-lang:commons-lang:2.6" compile "org.apache.commons:commons-lang3:3.9" compile "org.apache.httpcomponents:httpcore:4.4.11" - compile "org.checkerframework:checker-qual:2.0.0" compile "software.amazon.awssdk:http-client-spi:2.13.54" compile "software.amazon.awssdk:regions:2.13.54" compile "software.amazon.awssdk:utils:2.13.54" diff --git a/sdks/java/io/azure/build.gradle b/sdks/java/io/azure/build.gradle index fb585070ed14..9ad89b41bc57 100644 --- a/sdks/java/io/azure/build.gradle +++ b/sdks/java/io/azure/build.gradle @@ -38,7 +38,6 @@ dependencies { compile library.java.slf4j_api compile "com.azure:azure-core:1.6.0" compile "com.azure:azure-storage-common:12.1.0" - compile "org.checkerframework:checker-qual:2.0.0" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.mockito_core testCompile library.java.junit diff --git a/sdks/java/io/cassandra/build.gradle b/sdks/java/io/cassandra/build.gradle index 860ec537adc0..771386a77bfa 100644 --- a/sdks/java/io/cassandra/build.gradle +++ b/sdks/java/io/cassandra/build.gradle @@ -38,7 +38,6 @@ dependencies { compile library.java.slf4j_api compile library.java.cassandra_driver_core compile library.java.cassandra_driver_mapping - compile "org.checkerframework:checker-qual:2.0.0" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit testCompile library.java.hamcrest_core diff --git a/sdks/java/io/clickhouse/build.gradle b/sdks/java/io/clickhouse/build.gradle index 49690fafd913..7f81d186b75c 100644 --- a/sdks/java/io/clickhouse/build.gradle +++ b/sdks/java/io/clickhouse/build.gradle @@ -59,7 +59,6 @@ dependencies { compile "ru.yandex.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version" compile "com.google.guava:guava:25.1-jre" compile library.java.vendored_guava_26_0_jre - compile "org.checkerframework:checker-qual:2.0.0" compile library.java.slf4j_api testCompile library.java.slf4j_api testCompile library.java.junit diff --git a/sdks/java/io/kinesis/build.gradle b/sdks/java/io/kinesis/build.gradle index f42c6b7bae4a..58d41edd1345 100644 --- a/sdks/java/io/kinesis/build.gradle +++ b/sdks/java/io/kinesis/build.gradle @@ -42,7 +42,6 @@ dependencies { compile "commons-lang:commons-lang:2.6" compile library.java.vendored_guava_26_0_jre compile "org.apache.commons:commons-lang3:3.9" - compile "org.checkerframework:checker-qual:2.0.0" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit testCompile library.java.mockito_core diff --git a/sdks/java/io/splunk/build.gradle b/sdks/java/io/splunk/build.gradle index babf6f8e5d5c..1dd6f2f2f03f 100644 --- a/sdks/java/io/splunk/build.gradle +++ b/sdks/java/io/splunk/build.gradle @@ -35,7 +35,6 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile "org.apache.httpcomponents:httpclient:4.5.10" compile "org.apache.httpcomponents:httpcore:4.4.12" - compile "org.checkerframework:checker-qual:2.0.0" testCompile library.java.junit testCompile group: 'org.mock-server', name: 'mockserver-junit-rule', version: '5.10.0' testCompile group: 'org.mock-server', name: 'mockserver-client-java', version: '5.10.0' From e07a255cf0766111f7f64cd6834ce8ea3a618044 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Fri, 22 Jan 2021 12:02:34 -0800 Subject: [PATCH 06/13] move amazon-web-services* changes to another PR --- sdks/java/io/amazon-web-services/build.gradle | 4 +--- sdks/java/io/amazon-web-services2/build.gradle | 9 +++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/sdks/java/io/amazon-web-services/build.gradle b/sdks/java/io/amazon-web-services/build.gradle index b8c226d92f2c..c7c3874b2af4 100644 --- a/sdks/java/io/amazon-web-services/build.gradle +++ b/sdks/java/io/amazon-web-services/build.gradle @@ -23,7 +23,6 @@ plugins { } applyJavaNature( - enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.aws', ) @@ -40,12 +39,11 @@ dependencies { compile library.java.aws_java_sdk_sns compile library.java.aws_java_sdk_sqs compile library.java.aws_java_sdk_sts + compile "commons-lang:commons-lang:2.6" compile library.java.jackson_core compile library.java.jackson_annotations compile library.java.jackson_databind compile library.java.slf4j_api - compile library.java.joda_time - compile "org.apache.httpcomponents:httpcore:4.4.11" runtime library.java.commons_codec runtime "org.apache.httpcomponents:httpclient:4.5.12" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") diff --git a/sdks/java/io/amazon-web-services2/build.gradle b/sdks/java/io/amazon-web-services2/build.gradle index dccf592ab4a6..854263ec973d 100644 --- a/sdks/java/io/amazon-web-services2/build.gradle +++ b/sdks/java/io/amazon-web-services2/build.gradle @@ -20,7 +20,6 @@ import groovy.json.JsonOutput plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.aws2', ) provideIntegrationTestingDependencies() @@ -43,25 +42,23 @@ dependencies { compile library.java.jackson_core compile library.java.jackson_annotations compile library.java.jackson_databind + compile library.java.jackson_dataformat_cbor compile library.java.joda_time compile library.java.slf4j_api compile "software.amazon.kinesis:amazon-kinesis-client:2.2.5" compile "commons-lang:commons-lang:2.6" - compile "org.apache.commons:commons-lang3:3.9" - compile "org.apache.httpcomponents:httpcore:4.4.11" - compile "software.amazon.awssdk:http-client-spi:2.13.54" - compile "software.amazon.awssdk:regions:2.13.54" - compile "software.amazon.awssdk:utils:2.13.54" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:io:kinesis", configuration: "testRuntime") testCompile library.java.mockito_core testCompile library.java.guava_testlib + testCompile library.java.hamcrest_core testCompile library.java.junit testCompile 'org.elasticmq:elasticmq-rest-sqs_2.12:0.15.6' testCompile library.java.hamcrest_library testCompile library.java.powermock testCompile library.java.powermock_mockito + testCompile library.java.testcontainers_localstack testCompile "org.assertj:assertj-core:3.11.1" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") From bee54fb82a5c3cfb820be930d477ecef63944dd8 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Fri, 22 Jan 2021 12:37:03 -0800 Subject: [PATCH 07/13] moved trivial changes to PR #13794 --- sdks/java/io/amqp/build.gradle | 6 ++++-- sdks/java/io/cassandra/build.gradle | 1 - sdks/java/io/common/build.gradle | 2 +- .../elasticsearch-tests/elasticsearch-tests-2/build.gradle | 1 - .../elasticsearch-tests/elasticsearch-tests-5/build.gradle | 1 - .../elasticsearch-tests/elasticsearch-tests-6/build.gradle | 1 - .../elasticsearch-tests/elasticsearch-tests-7/build.gradle | 1 - .../elasticsearch-tests-common/build.gradle | 1 - sdks/java/io/hadoop-common/build.gradle | 4 +++- sdks/java/io/hadoop-file-system/build.gradle | 4 +++- sdks/java/io/hbase/build.gradle | 2 +- sdks/java/io/kudu/build.gradle | 3 ++- sdks/java/io/mongodb/build.gradle | 4 +++- sdks/java/io/rabbitmq/build.gradle | 4 +++- 14 files changed, 20 insertions(+), 15 deletions(-) diff --git a/sdks/java/io/amqp/build.gradle b/sdks/java/io/amqp/build.gradle index 2d0f1bcd824a..9c9f60c327e7 100644 --- a/sdks/java/io/amqp/build.gradle +++ b/sdks/java/io/amqp/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.amqp') +applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.amqp') description = "Apache Beam :: SDKs :: Java :: IO :: AMQP" ext.summary = "IO to read and write using AMQP 1.0 protocol (http://www.amqp.org)." @@ -27,10 +27,12 @@ dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.joda_time compile "org.apache.qpid:proton-j:0.16.0" - testCompile library.java.activemq_amqp testCompile library.java.slf4j_api testCompile library.java.junit + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library testCompile library.java.activemq_broker + testCompile library.java.activemq_amqp testCompile library.java.activemq_junit testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/cassandra/build.gradle b/sdks/java/io/cassandra/build.gradle index 771386a77bfa..6fc6e92b91af 100644 --- a/sdks/java/io/cassandra/build.gradle +++ b/sdks/java/io/cassandra/build.gradle @@ -20,7 +20,6 @@ plugins { id 'org.apache.beam.module' } // Do not relocate guava to avoid issues with Cassandra's version. applyJavaNature( - enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.cassandra', ) provideIntegrationTestingDependencies() diff --git a/sdks/java/io/common/build.gradle b/sdks/java/io/common/build.gradle index dfd3e4612239..a17e2b7ddc34 100644 --- a/sdks/java/io/common/build.gradle +++ b/sdks/java/io/common/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(enableStrictDependencies:true,exportJavadoc: false, automaticModuleName: 'org.apache.beam.sdk.io.common') +applyJavaNature(exportJavadoc: false, automaticModuleName: 'org.apache.beam.sdk.io.common') description = "Apache Beam :: SDKs :: Java :: IO :: Common" ext.summary = "Code used by all Beam IOs" diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle index 7bda31e3d2bf..a627e6236bd7 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-2/build.gradle @@ -18,7 +18,6 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-2' ) diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle index f32d630b8e48..b017cac99a5a 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle @@ -18,7 +18,6 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-5' ) diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle index fac39fb26fff..15f3bbff86f5 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle @@ -18,7 +18,6 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-6' ) diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle index 9984da9bfca3..5b04c7b770b8 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle @@ -18,7 +18,6 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-7' ) diff --git a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle index 52924ba7eb2f..1b46a13be738 100644 --- a/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle +++ b/sdks/java/io/elasticsearch-tests/elasticsearch-tests-common/build.gradle @@ -18,7 +18,6 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, publish: false, archivesBaseName: 'beam-sdks-java-io-elasticsearch-tests-common' ) diff --git a/sdks/java/io/hadoop-common/build.gradle b/sdks/java/io/hadoop-common/build.gradle index dbb9a4ac14d6..534512e49d10 100644 --- a/sdks/java/io/hadoop-common/build.gradle +++ b/sdks/java/io/hadoop-common/build.gradle @@ -19,7 +19,7 @@ import java.util.stream.Collectors plugins { id 'org.apache.beam.module' } -applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.hadoop.common') +applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.hadoop.common') description = "Apache Beam :: SDKs :: Java :: IO :: Hadoop Common" ext.summary = "Library to add shared Hadoop classes among Beam IOs." @@ -38,6 +38,8 @@ dependencies { provided library.java.hadoop_client provided library.java.hadoop_common provided library.java.hadoop_mapreduce_client_core + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library testCompile library.java.junit hadoopVersions.each {kv -> "hadoopVersion$kv.key" "org.apache.hadoop:hadoop-client:$kv.value" diff --git a/sdks/java/io/hadoop-file-system/build.gradle b/sdks/java/io/hadoop-file-system/build.gradle index c4c3c93756b5..39ba9ba452e0 100644 --- a/sdks/java/io/hadoop-file-system/build.gradle +++ b/sdks/java/io/hadoop-file-system/build.gradle @@ -20,7 +20,7 @@ import java.util.stream.Collectors plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, + automaticModuleName: 'org.apache.beam.sdk.io.hdfs') description = "Apache Beam :: SDKs :: Java :: IO :: Hadoop File System" @@ -45,6 +45,8 @@ dependencies { provided library.java.hadoop_common provided library.java.hadoop_mapreduce_client_core 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 testCompile library.java.hadoop_minicluster diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle index 143613fb8eb7..93a502d44341 100644 --- a/sdks/java/io/hbase/build.gradle +++ b/sdks/java/io/hbase/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.hbase') +applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.hbase') provideIntegrationTestingDependencies() enableJavaPerformanceTesting() diff --git a/sdks/java/io/kudu/build.gradle b/sdks/java/io/kudu/build.gradle index 07e8a52f700b..ffd776021dd4 100644 --- a/sdks/java/io/kudu/build.gradle +++ b/sdks/java/io/kudu/build.gradle @@ -18,7 +18,6 @@ plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, classesTriggerCheckerBugs: [ 'KuduTestUtils': 'TODO: file a bug report', 'KuduIOIT': 'TODO: file a bug report', @@ -51,6 +50,8 @@ dependencies { compile library.java.slf4j_api testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library testCompile library.java.junit testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") diff --git a/sdks/java/io/mongodb/build.gradle b/sdks/java/io/mongodb/build.gradle index 30ede18d9db1..4e6ef1c67391 100644 --- a/sdks/java/io/mongodb/build.gradle +++ b/sdks/java/io/mongodb/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.mongodb') +applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.mongodb') provideIntegrationTestingDependencies() enableJavaPerformanceTesting() @@ -31,6 +31,8 @@ dependencies { compile library.java.joda_time compile "org.mongodb:mongo-java-driver:3.12.7" testCompile library.java.junit + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile "de.flapdoodle.embed:de.flapdoodle.embed.mongo:2.2.0" diff --git a/sdks/java/io/rabbitmq/build.gradle b/sdks/java/io/rabbitmq/build.gradle index 7d8f0dc1cd4c..2256bc3726ab 100644 --- a/sdks/java/io/rabbitmq/build.gradle +++ b/sdks/java/io/rabbitmq/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.rabbitmq') +applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.rabbitmq') description = "Apache Beam :: SDKs :: Java :: IO :: RabbitMQ" ext.summary = "IO to read and write to a RabbitMQ broker." @@ -35,6 +35,8 @@ dependencies { testCompile "org.apache.qpid:qpid-broker-plugins-memory-store:$qpid_version" testCompile "org.apache.qpid:qpid-broker-plugins-amqp-0-8-protocol:$qpid_version" testCompile library.java.junit + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library testCompile library.java.slf4j_api testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") From 06d69ab698903ea23ac7b290c436e8918929d517 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Fri, 22 Jan 2021 18:34:35 -0800 Subject: [PATCH 08/13] undo changes to redis/build.gradle (should have been part of commit bee54fb) --- sdks/java/io/redis/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdks/java/io/redis/build.gradle b/sdks/java/io/redis/build.gradle index 53a7b5baf870..611053f10df4 100644 --- a/sdks/java/io/redis/build.gradle +++ b/sdks/java/io/redis/build.gradle @@ -17,7 +17,7 @@ */ plugins { id 'org.apache.beam.module' } -applyJavaNature(enableStrictDependencies:true,automaticModuleName: 'org.apache.beam.sdk.io.redis') +applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.io.redis') description = "Apache Beam :: SDKs :: Java :: IO :: Redis" ext.summary ="IO to read and write on a Redis keystore." @@ -28,6 +28,8 @@ dependencies { compile "redis.clients:jedis:3.3.0" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library testCompile "com.github.kstyrc:embedded-redis:0.6" testRuntimeOnly library.java.slf4j_jdk14 testRuntimeOnly project(path: ":runners:direct-java", configuration: "shadow") From 3dce55c2b0dc522aa0818c20da50b7d6c80e927f Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sun, 31 Jan 2021 19:13:02 -0800 Subject: [PATCH 09/13] move sdks/java/io/snowflake/build.gradle to its own PR --- sdks/java/io/snowflake/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdks/java/io/snowflake/build.gradle b/sdks/java/io/snowflake/build.gradle index 06cdc8eba505..a6adc23ebba8 100644 --- a/sdks/java/io/snowflake/build.gradle +++ b/sdks/java/io/snowflake/build.gradle @@ -17,7 +17,6 @@ */ plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.snowflake', ) provideIntegrationTestingDependencies() @@ -28,17 +27,19 @@ ext.summary = "IO to read and write on Snowflake." dependencies { compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") + compile project(path: ":sdks:java:extensions:google-cloud-platform-core") compile library.java.slf4j_api compile group: 'net.snowflake', name: 'snowflake-jdbc', version: '3.12.11' compile group: 'com.opencsv', name: 'opencsv', version: '5.0' compile 'net.snowflake:snowflake-ingest-sdk:0.9.9' - compile library.java.joda_time testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile 'com.google.cloud:google-cloud-storage:1.102.0' testCompile library.java.avro testCompile library.java.junit + testCompile library.java.hamcrest_core + testCompile library.java.hamcrest_library testCompile library.java.slf4j_api testRuntimeOnly library.java.hadoop_client testRuntimeOnly library.java.slf4j_jdk14 From c4011dc74a0456b1fafc0fdec189820cfd649c6d Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sun, 31 Jan 2021 19:16:08 -0800 Subject: [PATCH 10/13] move sdks/java/io/snowflake/expansion-service/build.gradle to separate PR --- sdks/java/io/snowflake/expansion-service/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdks/java/io/snowflake/expansion-service/build.gradle b/sdks/java/io/snowflake/expansion-service/build.gradle index 33ae4e8a1a98..fe442b41af47 100644 --- a/sdks/java/io/snowflake/expansion-service/build.gradle +++ b/sdks/java/io/snowflake/expansion-service/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'application' mainClassName = "org.apache.beam.sdk.expansion.service.ExpansionService" applyJavaNature( - enableStrictDependencies:true, + automaticModuleName: 'org.apache.beam.sdk.io.expansion.service', exportJavadoc: false, validateShadowJar: false, @@ -32,6 +32,8 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Snowflake ::Expansion Servic ext.summary = "Expansion service serving Snowflake IO" dependencies { + compile project(":sdks:java:expansion-service") + compile project(":sdks:java:io:snowflake") runtime library.java.slf4j_jdk14 } From f8824e70c2b4763fa7cce42943a0e568cb3880d6 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Sun, 31 Jan 2021 19:34:31 -0800 Subject: [PATCH 11/13] moved sdks/java/io/hadoop-format/build.gradle to its own PR --- sdks/java/io/hadoop-format/build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdks/java/io/hadoop-format/build.gradle b/sdks/java/io/hadoop-format/build.gradle index e94adfe39dfc..5ab4a55013a3 100644 --- a/sdks/java/io/hadoop-format/build.gradle +++ b/sdks/java/io/hadoop-format/build.gradle @@ -21,7 +21,6 @@ import java.util.stream.Collectors plugins { id 'org.apache.beam.module' } applyJavaNature( - enableStrictDependencies:true, automaticModuleName: 'org.apache.beam.sdk.io.hadoop.format', ) provideIntegrationTestingDependencies() @@ -61,7 +60,6 @@ dependencies { compile library.java.vendored_guava_26_0_jre compile library.java.slf4j_api compile project(":sdks:java:io:hadoop-common") - compile library.java.joda_time provided library.java.hadoop_common provided library.java.hadoop_hdfs provided library.java.hadoop_mapreduce_client_core @@ -70,7 +68,6 @@ dependencies { testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile project(":sdks:java:io:jdbc") testCompile project(path: ":examples:java", configuration: "testRuntime") - testCompile "org.elasticsearch.plugin:transport-netty4-client:$elastic_search_version" testCompile library.java.testcontainers_elasticsearch testCompile "org.elasticsearch.client:elasticsearch-rest-high-level-client:$elastic_search_version" testCompile "org.elasticsearch:elasticsearch:$elastic_search_version" @@ -93,6 +90,7 @@ dependencies { testCompile library.java.cassandra_driver_mapping testCompile "org.apache.cassandra:cassandra-all:3.11.8" testCompile library.java.postgres + testCompile "org.apache.logging.log4j:log4j-core:$log4j_version" testCompile library.java.junit testCompile library.java.hamcrest_core testCompile library.java.hamcrest_library From 98b1e2d21959e66b82f5e6f5b5794cdf2f18eaaa Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Fri, 5 Feb 2021 04:29:02 -0800 Subject: [PATCH 12/13] (1) bring back removed compile lines paired with permitUnusedDeclared and (2) fix some alphabetization --- sdks/java/io/azure/build.gradle | 4 +++- sdks/java/io/bigquery-io-perf-tests/build.gradle | 2 +- sdks/java/io/clickhouse/build.gradle | 6 +++--- sdks/java/io/contextualtextio/build.gradle | 6 ++++-- sdks/java/io/elasticsearch/build.gradle | 4 +++- sdks/java/io/expansion-service/build.gradle | 9 +++++++++ sdks/java/io/kafka/build.gradle | 3 ++- sdks/java/io/kinesis/build.gradle | 8 ++++---- sdks/java/io/kinesis/expansion-service/build.gradle | 4 ++++ sdks/java/io/splunk/build.gradle | 2 ++ 10 files changed, 35 insertions(+), 13 deletions(-) diff --git a/sdks/java/io/azure/build.gradle b/sdks/java/io/azure/build.gradle index 9ad89b41bc57..163d31b0c644 100644 --- a/sdks/java/io/azure/build.gradle +++ b/sdks/java/io/azure/build.gradle @@ -30,12 +30,14 @@ ext.summary = "IO library to read and write Azure services from Beam." repositories { jcenter() } dependencies { + compile library.java.commons_io + permitUnusedDeclared library.java.commons_io + compile library.java.slf4j_api compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile "com.azure:azure-storage-blob:12.8.0" compile "com.azure:azure-identity:1.0.8" compile "com.microsoft.azure:azure-storage:8.6.5" - compile library.java.slf4j_api compile "com.azure:azure-core:1.6.0" compile "com.azure:azure-storage-common:12.1.0" testCompile project(path: ":sdks:java:core", configuration: "shadowTest") diff --git a/sdks/java/io/bigquery-io-perf-tests/build.gradle b/sdks/java/io/bigquery-io-perf-tests/build.gradle index f62983d4e46c..61950b92ec27 100644 --- a/sdks/java/io/bigquery-io-perf-tests/build.gradle +++ b/sdks/java/io/bigquery-io-perf-tests/build.gradle @@ -25,7 +25,7 @@ description = "Apache Beam :: SDKs :: Java :: Google BigQuery IO Performance tes ext.summary = "Performance tests for Google BigQuery IO sources and sinks" dependencies { - testImplementation 'com.google.apis:google-api-services-bigquery:v2-rev20200719-1.30.10' + testImplementation library.java.google_api_services_bigquery testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile project(path: ":sdks:java:testing:test-utils", configuration: "testRuntime") testCompile project(path: ":sdks:java:extensions:google-cloud-platform-core", configuration: "testRuntime") diff --git a/sdks/java/io/clickhouse/build.gradle b/sdks/java/io/clickhouse/build.gradle index 7f81d186b75c..9dc4bb4edae6 100644 --- a/sdks/java/io/clickhouse/build.gradle +++ b/sdks/java/io/clickhouse/build.gradle @@ -55,11 +55,11 @@ def clickhouse_jdbc_version = "0.2.4" dependencies { javacc "net.java.dev.javacc:javacc:7.0.9" compile project(path: ":sdks:java:core", configuration: "shadow") + compile library.java.guava compile library.java.joda_time - compile "ru.yandex.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version" - compile "com.google.guava:guava:25.1-jre" - compile library.java.vendored_guava_26_0_jre compile library.java.slf4j_api + compile library.java.vendored_guava_26_0_jre + compile "ru.yandex.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version" testCompile library.java.slf4j_api testCompile library.java.junit testCompile library.java.hamcrest_core diff --git a/sdks/java/io/contextualtextio/build.gradle b/sdks/java/io/contextualtextio/build.gradle index ec1af81ca300..fe2fb7297a60 100644 --- a/sdks/java/io/contextualtextio/build.gradle +++ b/sdks/java/io/contextualtextio/build.gradle @@ -26,10 +26,12 @@ description = "Apache Beam :: SDKs :: Java :: Contextual-Text-IO" ext.summary = "Context-aware Text IO." dependencies { - compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") - compile library.java.vendored_grpc_1_26_0 + compile library.java.protobuf_java + permitUnusedDeclared library.java.protobuf_java compile library.java.slf4j_api + compile library.java.vendored_guava_26_0_jre + compile library.java.vendored_grpc_1_26_0 testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.guava_testlib diff --git a/sdks/java/io/elasticsearch/build.gradle b/sdks/java/io/elasticsearch/build.gradle index 447b2b968225..d342eb9a8052 100644 --- a/sdks/java/io/elasticsearch/build.gradle +++ b/sdks/java/io/elasticsearch/build.gradle @@ -25,8 +25,10 @@ ext.summary = "IO to read and write on Elasticsearch" 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_annotations + permitUnusedDeclared library.java.jackson_annotations compile library.java.jackson_core + compile library.java.jackson_databind compile library.java.joda_time compile "org.apache.httpcomponents:httpasyncclient:4.1.4" compile "org.apache.httpcomponents:httpclient:4.5.10" diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle index b89742720ee7..6665e4fac6e2 100644 --- a/sdks/java/io/expansion-service/build.gradle +++ b/sdks/java/io/expansion-service/build.gradle @@ -32,6 +32,15 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Expansion Service" ext.summary = "Expansion service serving several Java IOs" dependencies { + compile project(":sdks:java:expansion-service") + permitUnusedDeclared project(":sdks:java:expansion-service") + compile project(":sdks:java:io:kafka") + permitUnusedDeclared project(":sdks:java:io:kafka") + compile project(":sdks:java:io:jdbc") + permitUnusedDeclared project(":sdks:java:io:jdbc") + // Include postgres so it can be used with external JDBC + compile library.java.postgres + permitUnusedDeclared library.java.postgres runtime library.java.kafka_clients runtime library.java.slf4j_jdk14 } diff --git a/sdks/java/io/kafka/build.gradle b/sdks/java/io/kafka/build.gradle index 8c97f079a026..4d98135f397a 100644 --- a/sdks/java/io/kafka/build.gradle +++ b/sdks/java/io/kafka/build.gradle @@ -49,7 +49,8 @@ kafkaVersions.each{k,v -> configurations.create("kafkaVersion$k")} dependencies { compile library.java.vendored_guava_26_0_jre 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 "org.apache.kafka:kafka-clients:2.4.1" compile library.java.avro // Get back to "provided" since 2.14 diff --git a/sdks/java/io/kinesis/build.gradle b/sdks/java/io/kinesis/build.gradle index 58d41edd1345..0a7256206bae 100644 --- a/sdks/java/io/kinesis/build.gradle +++ b/sdks/java/io/kinesis/build.gradle @@ -31,17 +31,17 @@ test { dependencies { compile project(path: ":sdks:java:core", configuration: "shadow") - compile library.java.slf4j_api - compile library.java.joda_time - compile library.java.guava compile library.java.aws_java_sdk_cloudwatch compile library.java.aws_java_sdk_core compile library.java.aws_java_sdk_kinesis + compile library.java.commons_lang3 + compile library.java.guava + compile library.java.joda_time + compile library.java.slf4j_api compile "com.amazonaws:amazon-kinesis-client:1.13.0" compile "com.amazonaws:amazon-kinesis-producer:0.14.1" compile "commons-lang:commons-lang:2.6" compile library.java.vendored_guava_26_0_jre - compile "org.apache.commons:commons-lang3:3.9" testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime") testCompile library.java.junit testCompile library.java.mockito_core diff --git a/sdks/java/io/kinesis/expansion-service/build.gradle b/sdks/java/io/kinesis/expansion-service/build.gradle index 38092d3bb987..e21f9f061d13 100644 --- a/sdks/java/io/kinesis/expansion-service/build.gradle +++ b/sdks/java/io/kinesis/expansion-service/build.gradle @@ -32,5 +32,9 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Kinesis :: Expansion Service ext.summary = "Expansion service serving KinesisIO" dependencies { + compile project(":sdks:java:expansion-service") + permitUnusedDeclared project(":sdks:java:expansion-service") + compile project(":sdks:java:io:kinesis") + permitUnusedDeclared project(":sdks:java:io:kinesis") runtime library.java.slf4j_jdk14 } diff --git a/sdks/java/io/splunk/build.gradle b/sdks/java/io/splunk/build.gradle index 1dd6f2f2f03f..4519f18c8de9 100644 --- a/sdks/java/io/splunk/build.gradle +++ b/sdks/java/io/splunk/build.gradle @@ -27,6 +27,8 @@ ext.summary = "IO to write events to Splunk Http Event Collector (HEC)" dependencies { compile platform(library.java.google_cloud_platform_libraries_bom) compile library.java.slf4j_api + compile library.java.google_api_client + permitUnusedDeclared library.java.google_api_client compile library.java.google_http_client_apache_v2 compile library.java.google_code_gson compile project(path: ":sdks:java:core", configuration: "shadow") From dc848cbd54a90d9a8f59634006e88d44836651a8 Mon Sep 17 00:00:00 2001 From: Shehzaad Nakhoda Date: Fri, 5 Feb 2021 16:44:45 -0800 Subject: [PATCH 13/13] [BEAM-10961] add compile lines for usedUndeclared jackson* artifacts --- sdks/java/io/azure/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdks/java/io/azure/build.gradle b/sdks/java/io/azure/build.gradle index 163d31b0c644..8c5658abee54 100644 --- a/sdks/java/io/azure/build.gradle +++ b/sdks/java/io/azure/build.gradle @@ -40,6 +40,9 @@ dependencies { compile "com.microsoft.azure:azure-storage:8.6.5" compile "com.azure:azure-core:1.6.0" compile "com.azure:azure-storage-common:12.1.0" + compile library.java.jackson_annotations + compile library.java.jackson_core + compile library.java.jackson_databind testCompile project(path: ":sdks:java:core", configuration: "shadowTest") testCompile library.java.mockito_core testCompile library.java.junit