Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions sdks/java/io/azure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ plugins {
}

applyJavaNature(
enableStrictDependencies:true,
automaticModuleName: 'org.apache.beam.sdk.io.azure')

description = "Apache Beam :: SDKs :: Java :: IO :: Azure"
Expand All @@ -29,13 +30,19 @@ 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 "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 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
Expand Down
7 changes: 2 additions & 5 deletions sdks/java/io/bigquery-io-perf-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
*/

plugins { id 'org.apache.beam.module' }
applyJavaNature(exportJavadoc: false, publish: false)
applyJavaNature(enableStrictDependencies:true,exportJavadoc: false, publish: false)
provideIntegrationTestingDependencies()
enableJavaPerformanceTesting()

description = "Apache Beam :: SDKs :: Java :: Google BigQuery IO Performance tests"
ext.summary = "Performance tests for Google BigQuery IO sources and sinks"

dependencies {
compile library.java.google_api_services_bigquery
testImplementation library.java.google_api_services_bigquery
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for compile+permitUnusedDeclared here since this bigquery-io-perf-tests just contains tests.

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")
Expand All @@ -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
}
4 changes: 4 additions & 0 deletions sdks/java/io/clickhouse/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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\..*/,
Expand Down Expand Up @@ -54,7 +55,10 @@ 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 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
Expand Down
10 changes: 7 additions & 3 deletions sdks/java/io/contextualtextio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,22 @@

plugins { id 'org.apache.beam.module' }
applyJavaNature(
enableStrictDependencies:true,
automaticModuleName: 'org.apache.beam.sdk.io.contextualtextio',
)

description = "Apache Beam :: SDKs :: Java :: Contextual-Text-IO"
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.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
testCompile library.java.junit
testCompile library.java.hamcrest_core
Expand Down
12 changes: 10 additions & 2 deletions sdks/java/io/elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,24 @@
*/

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"

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"
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")
}
5 changes: 5 additions & 0 deletions sdks/java/io/expansion-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -32,10 +33,14 @@ 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
}
4 changes: 1 addition & 3 deletions sdks/java/io/file-based-io-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

plugins { id 'org.apache.beam.module' }
applyJavaNature(exportJavadoc: false, publish: false)
applyJavaNature(enableStrictDependencies:true,exportJavadoc: false, publish: false)
provideIntegrationTestingDependencies()
enableJavaPerformanceTesting()

Expand All @@ -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
}
5 changes: 2 additions & 3 deletions sdks/java/io/hcatalog/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion sdks/java/io/influxdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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
Expand Down
12 changes: 7 additions & 5 deletions sdks/java/io/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

plugins { id 'org.apache.beam.module' }
applyJavaNature(
enableStrictDependencies:true,
automaticModuleName: 'org.apache.beam.sdk.io.jdbc',
)
provideIntegrationTestingDependencies()
Expand All @@ -30,17 +31,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")
}
7 changes: 3 additions & 4 deletions sdks/java/io/jms/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

plugins { id 'org.apache.beam.module' }
applyJavaNature(
enableStrictDependencies:true,
automaticModuleName: 'org.apache.beam.sdk.io.jms',
)

Expand All @@ -30,14 +31,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")
}
13 changes: 11 additions & 2 deletions sdks/java/io/kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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/']
Expand Down Expand Up @@ -49,6 +50,9 @@ dependencies {
compile library.java.vendored_guava_26_0_jre
compile project(path: ":sdks:java:core", configuration: "shadow")
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
provided library.java.kafka_clients
compile library.java.slf4j_api
Expand All @@ -57,6 +61,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"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For :sdks:java:container:generateLicenseReport to succeed, had to exclude kafka-clients and zookeeper.

}
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"
Expand All @@ -71,8 +82,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
Expand Down
13 changes: 6 additions & 7 deletions sdks/java/io/kinesis/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -31,22 +31,21 @@ test {

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
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
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
Expand Down
4 changes: 3 additions & 1 deletion sdks/java/io/kinesis/expansion-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -33,6 +33,8 @@ 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
}
8 changes: 3 additions & 5 deletions sdks/java/io/mqtt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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")
}
Loading