Skip to content

[BEAM-10961] Strict dependency checking for sdks/java/io/gcp #13791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ibzib merged 17 commits into from
Feb 26, 2021
Merged

[BEAM-10961] Strict dependency checking for sdks/java/io/gcp #13791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8137647
strict dependency checking for sdks/io/gcp
shehzaadn-vd Jan 22, 2021
b3639e3
add compile(runners:core-java) since it was usedUndeclared
shehzaadn-vd Jan 27, 2021
89e3567
[BEAM-10961] suggested changes: better use of existing library variab…
shehzaadn-vd Jan 28, 2021
a556379
reintroduce some dependencies but as runtimeOnly
shehzaadn-vd Jan 28, 2021
b06b9f1
remove stray space
shehzaadn-vd Jan 28, 2021
bef61df
[BEAM-10961] create variables for some grpc libraries
shehzaadn-vd Feb 6, 2021
8fcd746
[BEAM-10961] add back compile+permitUnusedDeclared lines
shehzaadn-vd Feb 6, 2021
6346e90
[BEAM-10961] fix whitespace in comment block and uncomment enableStri…
shehzaadn-vd Feb 6, 2021
7604e0c
[BEAM-10961] uncomment out permitUnusedDeclared - to show error in PR
shehzaadn-vd Feb 6, 2021
226969b
remove trailing whitespace
shehzaadn-vd Feb 6, 2021
9b13f14
[BEAM-10961] hardcode dependency in permitUnusedDeclared lines
shehzaadn-vd Feb 6, 2021
3d08996
[BEAM-10961] make commenting for BEAM-11761 consistent with other PRs
shehzaadn-vd Feb 13, 2021
09525a1
[BEAM-10961] use enforcedPlatform dependency to allow permitUnusedDec…
shehzaadn-vd Feb 18, 2021
f44cea0
merge master
shehzaadn-vd Feb 24, 2021
feac628
[BEAM-10961] (1) add reference to BEAM-11761 (2) fix spacing (3) perm…
shehzaadn-vd Feb 25, 2021
5d28a06
[BEAM-10961] (1) remove stray compile/permitUnusedDeclared pair added…
shehzaadn-vd Feb 25, 2021
2187c9a
[BEAM-10961] remove proto_google_cloud_bigquery_storage_v1beta1
shehzaadn-vd Feb 25, 2021
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
4 changes: 4 additions & 0 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ class BeamModulePlugin implements Plugin<Project> {
hadoop_minicluster : "org.apache.hadoop:hadoop-minicluster:$hadoop_version",
hadoop_hdfs : "org.apache.hadoop:hadoop-hdfs:$hadoop_version",
hadoop_hdfs_tests : "org.apache.hadoop:hadoop-hdfs:$hadoop_version:tests",
hamcrest : "org.hamcrest:hamcrest:$hamcrest_version",
hamcrest_core : "org.hamcrest:hamcrest-core:$hamcrest_version",
hamcrest_library : "org.hamcrest:hamcrest-library:$hamcrest_version",
http_client : "org.apache.httpcomponents:httpclient:$httpclient_version",
Expand Down Expand Up @@ -600,11 +601,14 @@ class BeamModulePlugin implements Plugin<Project> {
powermock_mockito : "org.powermock:powermock-api-mockito2:$powermock_version",
protobuf_java : "com.google.protobuf:protobuf-java:$protobuf_version",
protobuf_java_util : "com.google.protobuf:protobuf-java-util:$protobuf_version",
proto_google_cloud_bigquery_storage_v1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_bigquerybeta2_storage_v1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_bigtable_admin_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-admin-v2", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_bigtable_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-v2", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_datastore_v1 : "com.google.api.grpc:proto-google-cloud-datastore-v1", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_pubsub_v1 : "com.google.api.grpc:proto-google-cloud-pubsub-v1", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_pubsublite_v1 : "com.google.api.grpc:proto-google-cloud-pubsublite-v1:$google_cloud_pubsublite_version",
proto_google_cloud_spanner_v1: "com.google.api.grpc:proto-google-cloud-spanner-v1", // google_cloud_platform_libraries_bom sets version
proto_google_cloud_spanner_admin_database_v1: "com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1", // google_cloud_platform_libraries_bom sets version
proto_google_common_protos : "com.google.api.grpc:proto-google-common-protos", // google_cloud_platform_libraries_bom sets version
slf4j_api : "org.slf4j:slf4j-api:$slf4j_version",
Expand Down
36 changes: 34 additions & 2 deletions sdks/java/io/google-cloud-platform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand All @@ -30,18 +30,25 @@ ext.summary = "IO library to read and write Google Cloud Platform systems from B

dependencies {
compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
permitUnusedDeclared enforcedPlatform(library.java.google_cloud_platform_libraries_bom)
compile project(path: ":model:pipeline", configuration: "shadow")
compile project(":runners:core-java")
compile project(path: ":sdks:java:core", configuration: "shadow")
compile project(":sdks:java:expansion-service")
permitUnusedDeclared project(":sdks:java:expansion-service") // BEAM-11761
compile project(":sdks:java:extensions:google-cloud-platform-core")
compile project(":sdks:java:extensions:protobuf")
compile library.java.avro
compile library.java.bigdataoss_util
compile library.java.error_prone_annotations
compile library.java.gax
compile library.java.gax_grpc
compile library.java.google_api_client
compile library.java.google_api_common
compile library.java.google_api_services_bigquery
compile library.java.google_api_services_healthcare
compile library.java.google_api_services_pubsub
compile library.java.google_api_services_storage
compile library.java.google_auth_library_credentials
compile library.java.google_auth_library_oauth2_http
compile library.java.google_cloud_bigquery_storage
Expand All @@ -53,48 +60,73 @@ dependencies {
compile(library.java.google_cloud_core_grpc) {
exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version
}
permitUnusedDeclared library.java.google_cloud_core_grpc // BEAM-11761
compile library.java.google_cloud_datastore_v1_proto_client
compile library.java.google_cloud_pubsublite
// GCP PubSub client is used in TestPubSub
compile library.java.google_cloud_pubsub
compile library.java.google_cloud_spanner
compile library.java.google_code_gson
compile library.java.google_http_client
compile library.java.google_http_client_jackson2
compile library.java.grpc_alts
permitUnusedDeclared library.java.grpc_alts // BEAM-11761
compile library.java.grpc_api
compile library.java.grpc_auth
compile library.java.grpc_core
permitUnusedDeclared library.java.grpc_core // BEAM-11761
compile library.java.grpc_context
permitUnusedDeclared library.java.grpc_context // BEAM-11761
compile library.java.grpc_grpclb
permitUnusedDeclared library.java.grpc_grpclb // BEAM-11761
compile library.java.grpc_netty
compile library.java.grpc_netty_shaded
permitUnusedDeclared library.java.grpc_netty_shaded // BEAM-11761
compile library.java.grpc_stub
permitUnusedDeclared library.java.grpc_stub // BEAM-11761
compile library.java.grpc_google_cloud_pubsub_v1
compile library.java.grpc_google_cloud_pubsublite_v1
permitUnusedDeclared library.java.grpc_google_cloud_pubsublite_v1 // BEAM-11761
compile library.java.guava
compile library.java.hamcrest
compile library.java.http_client
compile library.java.hamcrest_core
permitUnusedDeclared library.java.hamcrest_core // BEAM-11761
compile library.java.http_core
compile library.java.jackson_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
permitUnusedDeclared library.java.netty_tcnative_boringssl_static // BEAM-11761
compile library.java.proto_google_cloud_bigquery_storage_v1
compile library.java.proto_google_cloud_bigquerybeta2_storage_v1
permitUnusedDeclared library.java.proto_google_cloud_bigquerybeta2_storage_v1 // BEAM-11761
compile library.java.proto_google_cloud_bigtable_admin_v2
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
permitUnusedDeclared library.java.proto_google_cloud_spanner_admin_database_v1 // BEAM-11761
compile library.java.proto_google_cloud_spanner_v1
compile library.java.proto_google_common_protos
compile library.java.protobuf_java
compile library.java.protobuf_java_util
compile library.java.slf4j_api
compile library.java.vendored_grpc_1_26_0
compile library.java.vendored_guava_26_0_jre

compile "org.threeten:threetenbp:1.4.4"

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")
testCompile project(path: ":sdks:java:io:common", configuration: "testRuntime")
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
Expand Down
3 changes: 3 additions & 0 deletions sdks/java/io/google-cloud-platform/expansion-service/build.gradle
View file
Open in desktop
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.gcp.expansion.service',
exportJavadoc: false,
validateShadowJar: false,
Expand All @@ -32,6 +33,8 @@ ext.summary = "Expansion service serving GCP Java IOs"

dependencies {
compile project(":sdks:java:expansion-service")
permitUnusedDeclared project(":sdks:java:expansion-service") // BEAM-11761
compile project(":sdks:java:io:google-cloud-platform")
permitUnusedDeclared project(":sdks:java:io:google-cloud-platform") // BEAM-11761
runtime library.java.slf4j_jdk14
}