From b47744e6c69f5646a2c91026952aff65decc20b2 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 10 Apr 2020 17:03:21 -0400 Subject: [PATCH 01/14] Applying difference --- .../beam/gradle/BeamModulePlugin.groovy | 105 +++++++++++------- examples/java/build.gradle | 1 + .../google-cloud-dataflow-java/build.gradle | 1 + .../worker/build.gradle | 1 + .../google-cloud-platform-core/build.gradle | 1 + .../extensions/sql/datacatalog/build.gradle | 1 + sdks/java/extensions/sql/zetasql/build.gradle | 1 + .../io/google-cloud-platform/build.gradle | 1 + 8 files changed, 73 insertions(+), 39 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 479ec2eebb6d..0f2101ebd1ee 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -22,6 +22,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import groovy.json.JsonOutput import groovy.json.JsonSlurper import java.util.concurrent.atomic.AtomicInteger +import org.gradle.api.attributes.Attribute +import org.gradle.api.attributes.AttributeContainer import org.gradle.api.GradleException import org.gradle.api.Plugin import org.gradle.api.Project @@ -373,15 +375,9 @@ class BeamModulePlugin implements Plugin { def aws_java_sdk2_version = "2.10.61" def cassandra_driver_version = "3.8.0" def classgraph_version = "4.8.65" - def gax_version = "1.54.0" - def generated_grpc_ga_version = "1.85.1" - def google_auth_version = "0.19.0" def google_clients_version = "1.30.3" def google_cloud_bigdataoss_version = "2.1.2" - def google_cloud_core_version = "1.92.2" - def google_cloud_spanner_version = "1.49.1" - def google_cloud_datacatalog_version = "0.32.1" - def google_http_clients_version = "1.34.0" + // Try to keep grpc_version consistent with gRPC version in google_cloud_platform_libraries_bom def grpc_version = "1.27.2" def guava_version = "25.1-jre" def hadoop_version = "2.8.5" @@ -393,7 +389,6 @@ class BeamModulePlugin implements Plugin { def netty_version = "4.1.30.Final" def postgres_version = "42.2.2" def powermock_version = "2.0.2" - def proto_google_common_protos_version = "1.17.0" def protobuf_version = "3.11.1" def quickcheck_version = "0.8" def spark_version = "2.4.5" @@ -444,45 +439,48 @@ class BeamModulePlugin implements Plugin { commons_lang3 : "org.apache.commons:commons-lang3:3.9", commons_math3 : "org.apache.commons:commons-math3:3.6.1", error_prone_annotations : "com.google.errorprone:error_prone_annotations:2.0.15", - gax : "com.google.api:gax:$gax_version", - gax_grpc : "com.google.api:gax-grpc:$gax_version", + gax : "com.google.api:gax", // google_cloud_platform_libraries_bom sets version + gax_grpc : "com.google.api:gax-grpc", // google_cloud_platform_libraries_bom sets version google_api_client : "com.google.api-client:google-api-client:$google_clients_version", google_api_client_jackson2 : "com.google.api-client:google-api-client-jackson2:$google_clients_version", google_api_client_java6 : "com.google.api-client:google-api-client-java6:$google_clients_version", - google_api_common : "com.google.api:api-common:1.8.1", + google_api_common : "com.google.api:api-common", // google_cloud_platform_libraries_bom sets version google_api_services_bigquery : "com.google.apis:google-api-services-bigquery:v2-rev20191211-$google_clients_version", google_api_services_clouddebugger : "com.google.apis:google-api-services-clouddebugger:v2-rev20191003-$google_clients_version", google_api_services_cloudresourcemanager : "com.google.apis:google-api-services-cloudresourcemanager:v1-rev20191206-$google_clients_version", google_api_services_dataflow : "com.google.apis:google-api-services-dataflow:v1b3-rev20190927-$google_clients_version", google_api_services_pubsub : "com.google.apis:google-api-services-pubsub:v1-rev20191111-$google_clients_version", google_api_services_storage : "com.google.apis:google-api-services-storage:v1-rev20191011-$google_clients_version", - google_auth_library_credentials : "com.google.auth:google-auth-library-credentials:$google_auth_version", - google_auth_library_oauth2_http : "com.google.auth:google-auth-library-oauth2-http:$google_auth_version", - google_cloud_bigquery : "com.google.cloud:google-cloud-bigquery:1.108.0", - google_cloud_bigquery_storage : "com.google.cloud:google-cloud-bigquerystorage:0.125.0-beta", + google_auth_library_credentials : "com.google.auth:google-auth-library-credentials", // google_cloud_platform_libraries_bom sets version + google_auth_library_oauth2_http : "com.google.auth:google-auth-library-oauth2-http", // google_cloud_platform_libraries_bom sets version + google_cloud_bigquery : "com.google.cloud:google-cloud-bigquery", // google_cloud_platform_libraries_bom sets version + google_cloud_bigquery_storage : "com.google.cloud:google-cloud-bigquerystorage", // google_cloud_platform_libraries_bom sets version google_cloud_bigtable_client_core : "com.google.cloud.bigtable:bigtable-client-core:1.13.0", - google_cloud_core : "com.google.cloud:google-cloud-core:$google_cloud_core_version", - google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc:$google_cloud_core_version", - google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog:$google_cloud_datacatalog_version", + google_cloud_core : "com.google.cloud:google-cloud-core", // google_cloud_platform_libraries_bom sets version + google_cloud_core_grpc : "com.google.cloud:google-cloud-core-grpc", // google_cloud_platform_libraries_bom sets version + google_cloud_datacatalog_v1beta1 : "com.google.cloud:google-cloud-datacatalog", // google_cloud_platform_libraries_bom sets version google_cloud_dataflow_java_proto_library_all: "com.google.cloud.dataflow:google-cloud-dataflow-java-proto-library-all:0.5.160304", google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:1.6.3", - google_cloud_spanner : "com.google.cloud:google-cloud-spanner:$google_cloud_spanner_version", - google_http_client : "com.google.http-client:google-http-client:$google_http_clients_version", + // The GCP Libraries BOM dashboard shows the versions set by the BOM: + // https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/4.2.0/artifact_details.html + google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:4.2.0", + google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version + // google-http-client's version is explicitly declared for sdks/java/maven-archetypes/examples + // This version should be in line with the one in com.google.cloud:libraries-bom. + google_http_client : "com.google.http-client:google-http-client:1.34.2", // google_cloud_platform_libraries_bom sets version google_http_client_jackson : "com.google.http-client:google-http-client-jackson:1.29.2", - google_http_client_jackson2 : "com.google.http-client:google-http-client-jackson2:$google_http_clients_version", - google_http_client_protobuf : "com.google.http-client:google-http-client-protobuf:$google_http_clients_version", + google_http_client_jackson2 : "com.google.http-client:google-http-client-jackson2", // google_cloud_platform_libraries_bom sets version + google_http_client_protobuf : "com.google.http-client:google-http-client-protobuf", // google_cloud_platform_libraries_bom sets version google_oauth_client : "com.google.oauth-client:google-oauth-client:$google_clients_version", google_oauth_client_java6 : "com.google.oauth-client:google-oauth-client-java6:$google_clients_version", grpc_all : "io.grpc:grpc-all:$grpc_version", - grpc_auth : "io.grpc:grpc-auth:$grpc_version", - grpc_core : "io.grpc:grpc-core:$grpc_version", - grpc_context : "io.grpc:grpc-context:$grpc_version", - grpc_google_cloud_pubsub_v1 : "com.google.api.grpc:grpc-google-cloud-pubsub-v1:$generated_grpc_ga_version", - grpc_grpclb : "io.grpc:grpc-grpclb:$grpc_version", - grpc_protobuf : "io.grpc:grpc-protobuf:$grpc_version", - grpc_protobuf_lite : "io.grpc:grpc-protobuf-lite:$grpc_version", - grpc_netty : "io.grpc:grpc-netty:$grpc_version", - grpc_stub : "io.grpc:grpc-stub:$grpc_version", + grpc_auth : "io.grpc:grpc-auth", // google_cloud_platform_libraries_bom sets version + grpc_core : "io.grpc:grpc-core", // google_cloud_platform_libraries_bom sets version + grpc_context : "io.grpc:grpc-context", // google_cloud_platform_libraries_bom sets version + grpc_google_cloud_pubsub_v1 : "com.google.api.grpc:grpc-google-cloud-pubsub-v1", // google_cloud_platform_libraries_bom sets version + grpc_grpclb : "io.grpc:grpc-grpclb", // google_cloud_platform_libraries_bom sets version + grpc_netty : "io.grpc:grpc-netty", // google_cloud_platform_libraries_bom sets version + grpc_stub : "io.grpc:grpc-stub", // google_cloud_platform_libraries_bom sets version guava : "com.google.guava:guava:$guava_version", guava_testlib : "com.google.guava:guava-testlib:$guava_version", hadoop_client : "org.apache.hadoop:hadoop-client:$hadoop_version", @@ -521,12 +519,12 @@ class BeamModulePlugin implements Plugin { 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_v1beta1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1:0.85.1", - proto_google_cloud_bigtable_v2 : "com.google.api.grpc:proto-google-cloud-bigtable-v2:1.9.1", - proto_google_cloud_datastore_v1 : "com.google.api.grpc:proto-google-cloud-datastore-v1:0.85.0", - proto_google_cloud_pubsub_v1 : "com.google.api.grpc:proto-google-cloud-pubsub-v1:$generated_grpc_ga_version", - proto_google_cloud_spanner_admin_database_v1: "com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:$google_cloud_spanner_version", - proto_google_common_protos : "com.google.api.grpc:proto-google-common-protos:$proto_google_common_protos_version", + proto_google_cloud_bigquery_storage_v1beta1 : "com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1", // 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_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:1.7.25", slf4j_simple : "org.slf4j:slf4j-simple:1.7.25", slf4j_jdk14 : "org.slf4j:slf4j-jdk14:1.7.25", @@ -1160,8 +1158,20 @@ class BeamModulePlugin implements Plugin { } def dependenciesNode = root.appendNode('dependencies') + + // BOMs, declared with 'platform', appear in section + def boms = [] + + // This value is from PlatformSupport.COMPONENT_CATEGORY (Gradle's internal API) + def componentCategory = Attribute.of('org.gradle.component.category', java.lang.String.class); def generateDependenciesFromConfiguration = { param -> project.configurations."${param.configuration}".allDependencies.each { + AttributeContainer attributes = it.getAttributes() + if (attributes.getAttribute(componentCategory) == 'platform') { + boms.add(it); + return + } + def dependencyNode = dependenciesNode.appendNode('dependency') def appendClassifier = { dep -> dep.artifacts.each { art -> @@ -1180,7 +1190,9 @@ class BeamModulePlugin implements Plugin { } else { dependencyNode.appendNode('groupId', it.group) dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) + if (it.version != null) { // bom-managed artifacts do not have their versions + dependencyNode.appendNode('version', it.version) + } dependencyNode.appendNode('scope', param.scope) appendClassifier(it) } @@ -1210,6 +1222,18 @@ class BeamModulePlugin implements Plugin { configuration: (configuration.shadowClosure ? 'shadow' : 'compile'), scope: 'compile') generateDependenciesFromConfiguration(configuration: 'provided', scope: 'provided') + if (!boms.isEmpty()) { + def dependencyManagementNode = root.appendNode('dependencyManagement') + def dependencyManagementDependencies = dependencyManagementNode.appendNode('dependencies') + boms.each { + def dependencyNode = dependencyManagementDependencies.appendNode('dependency') + dependencyNode.appendNode('groupId', it.group) + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + dependencyNode.appendNode('type', 'pom') + dependencyNode.appendNode('scope', 'import') + } + } // NB: This must come after asNode() logic, as it seems asNode() // removes XML comments. // TODO: Load this from file? @@ -1274,7 +1298,10 @@ class BeamModulePlugin implements Plugin { // has different dependencies than our project. if (config.getName() != "errorprone" && !inDependencyUpdates) { config.resolutionStrategy { - force project.library.java.values() + // Filtering versionless coordinates that depend on BOM. Beam project needs to set the + // versions for only handful libraries when building the project (BEAM-9542). + def librariesWithVersion = project.library.java.values().findAll { it.split(':').size() > 2 } + force librariesWithVersion } } } diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 5b08348aa5c8..04f25528c771 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -45,6 +45,7 @@ configurations.sparkRunnerPreCommit { } dependencies { + compile platform(library.java.google_cloud_platform_libraries_bom) compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:extensions:google-cloud-platform-core") diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index 48a34d8f75d5..1bac782798d7 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -60,6 +60,7 @@ configurations { } dependencies { + compile platform(library.java.google_cloud_platform_libraries_bom) compile library.java.vendored_guava_26_0_jre compile project(path: ":model:pipeline", configuration: "shadow") compile project(path: ":sdks:java:core", configuration: "shadow") diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle b/runners/google-cloud-dataflow-java/worker/build.gradle index a0e335632bc5..546e6f8919dd 100644 --- a/runners/google-cloud-dataflow-java/worker/build.gradle +++ b/runners/google-cloud-dataflow-java/worker/build.gradle @@ -65,6 +65,7 @@ dependencies { // // All main sourceset dependencies here should be listed as compile scope so that the dependencies // are all packaged into a single uber jar allowing the jar to serve as an application. + compile platform(library.java.google_cloud_platform_libraries_bom) compile project(":runners:google-cloud-dataflow-java") compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:extensions:google-cloud-platform-core") diff --git a/sdks/java/extensions/google-cloud-platform-core/build.gradle b/sdks/java/extensions/google-cloud-platform-core/build.gradle index 9ffa22902a47..cd09867e0bd8 100644 --- a/sdks/java/extensions/google-cloud-platform-core/build.gradle +++ b/sdks/java/extensions/google-cloud-platform-core/build.gradle @@ -34,6 +34,7 @@ test { } dependencies { + compile platform(library.java.google_cloud_platform_libraries_bom) compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.google_http_client_jackson2 diff --git a/sdks/java/extensions/sql/datacatalog/build.gradle b/sdks/java/extensions/sql/datacatalog/build.gradle index 5068c8bde80a..f49783032da2 100644 --- a/sdks/java/extensions/sql/datacatalog/build.gradle +++ b/sdks/java/extensions/sql/datacatalog/build.gradle @@ -23,6 +23,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.sql.datacatalog') dependencies { + compile platform(library.java.google_cloud_platform_libraries_bom) compile(library.java.google_cloud_datacatalog_v1beta1) { exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version } diff --git a/sdks/java/extensions/sql/zetasql/build.gradle b/sdks/java/extensions/sql/zetasql/build.gradle index fd5364187700..240f251261a0 100644 --- a/sdks/java/extensions/sql/zetasql/build.gradle +++ b/sdks/java/extensions/sql/zetasql/build.gradle @@ -28,6 +28,7 @@ ext.summary = "ZetaSQL to Calcite translator" def zetasql_version = "2020.03.2" dependencies { + compile platform(library.java.google_cloud_platform_libraries_bom) compile project(":sdks:java:core") compile project(":sdks:java:extensions:sql") compile library.java.vendored_calcite_1_20_0 diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 66db0bea448c..bac1cdd1fe60 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -28,6 +28,7 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform" ext.summary = "IO library to read and write Google Cloud Platform systems from Beam." dependencies { + compile platform(library.java.google_cloud_platform_libraries_bom) compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:expansion-service") compile project(":sdks:java:extensions:google-cloud-platform-core") From 68deb1e020037b61b7f3cd701cfb3782159ef9ad Mon Sep 17 00:00:00 2001 From: kileys Date: Thu, 8 Oct 2020 21:38:02 +0000 Subject: [PATCH 02/14] update new dependencies --- .../apache/beam/gradle/BeamModulePlugin.groovy | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index d6b8230f3eae..c3707cc2059f 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -391,12 +391,10 @@ class BeamModulePlugin implements Plugin { def cassandra_driver_version = "3.8.0" def checkerframework_version = "3.5.0" def classgraph_version = "4.8.65" - def gax_version = "1.57.1" - def generated_grpc_ga_version = "1.85.1" def google_clients_version = "1.30.10" def google_cloud_bigdataoss_version = "2.1.5" def google_cloud_pubsublite_version = "0.1.6" - def google_http_clients_version = "1.34.0" + def google_code_gson_version = "2.8.6" def google_oauth_clients_version = "1.31.0" // Try to keep grpc_version consistent with gRPC version in google_cloud_platform_libraries_bom def grpc_version = "1.27.2" @@ -490,29 +488,29 @@ class BeamModulePlugin implements Plugin { google_cloud_datastore_v1_proto_client : "com.google.cloud.datastore:datastore-v1-proto-client:1.6.3", google_cloud_pubsublite : "com.google.cloud:google-cloud-pubsublite:$google_cloud_pubsublite_version", // The GCP Libraries BOM dashboard shows the versions set by the BOM: - // https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/4.2.0/artifact_details.html - google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:4.2.0", + // https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/12.0.0/artifact_details.html + google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:12.0.0", google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version - google_code_gson : "com.google.code.gson:gson", + google_code_gson : "com.google.code.gson:gson:$google_code_gson_version", // google-http-client's version is explicitly declared for sdks/java/maven-archetypes/examples // This version should be in line with the one in com.google.cloud:libraries-bom. google_http_client : "com.google.http-client:google-http-client", // google_cloud_platform_libraries_bom sets version - google_http_client_apache_v2 : "com.google.http-client:google-http-client-apache-v2:$google_http_clients_version", + google_http_client_apache_v2 : "com.google.http-client:google-http-client-apache-v2", // google_cloud_platform_libraries_bom sets version google_http_client_jackson : "com.google.http-client:google-http-client-jackson:1.29.2", google_http_client_jackson2 : "com.google.http-client:google-http-client-jackson2", // google_cloud_platform_libraries_bom sets version google_http_client_protobuf : "com.google.http-client:google-http-client-protobuf", // google_cloud_platform_libraries_bom sets version google_oauth_client : "com.google.oauth-client:google-oauth-client:$google_oauth_clients_version", google_oauth_client_java6 : "com.google.oauth-client:google-oauth-client-java6:$google_oauth_clients_version", // Don't use grpc_all, it can cause issues in Bazel builds. Reference the gRPC libraries you need individually instead. - grpc_api : "io.grpc:grpc-api:$grpc_version", - grpc_alts : "io.grpc:grpc-alts:$grpc_version", + grpc_alts : "io.grpc:grpc-alts", // google_cloud_platform_libraries_bom sets version + grpc_api : "io.grpc:grpc-api", // google_cloud_platform_libraries_bom sets version grpc_auth : "io.grpc:grpc-auth", // google_cloud_platform_libraries_bom sets version grpc_core : "io.grpc:grpc-core", // google_cloud_platform_libraries_bom sets version grpc_context : "io.grpc:grpc-context", // google_cloud_platform_libraries_bom sets version grpc_google_cloud_pubsub_v1 : "com.google.api.grpc:grpc-google-cloud-pubsub-v1", // google_cloud_platform_libraries_bom sets version grpc_google_cloud_pubsublite_v1 : "com.google.api.grpc:grpc-google-cloud-pubsublite-v1:$google_cloud_pubsublite_version", grpc_grpclb : "io.grpc:grpc-grpclb", // google_cloud_platform_libraries_bom sets version - grpc_protobuf : "io.grpc:grpc-protobuf:$grpc_version", + grpc_protobuf : "io.grpc:grpc-protobuf", // google_cloud_platform_libraries_bom sets version grpc_protobuf_lite : "io.grpc:grpc-protobuf-lite:$grpc_version", grpc_netty : "io.grpc:grpc-netty", // google_cloud_platform_libraries_bom sets version grpc_netty_shaded : "io.grpc:grpc-netty-shaded", // google_cloud_platform_libraries_bom sets version From 13329a02af2d54546bffff5893b2f851ac3b08eb Mon Sep 17 00:00:00 2001 From: kileys Date: Thu, 8 Oct 2020 22:11:42 +0000 Subject: [PATCH 03/14] add bom dependency --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- examples/kotlin/build.gradle | 1 + sdks/java/io/splunk/build.gradle | 1 + sdks/java/testing/test-utils/build.gradle | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index c3707cc2059f..e211943b210b 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -505,8 +505,8 @@ class BeamModulePlugin implements Plugin { grpc_alts : "io.grpc:grpc-alts", // google_cloud_platform_libraries_bom sets version grpc_api : "io.grpc:grpc-api", // google_cloud_platform_libraries_bom sets version grpc_auth : "io.grpc:grpc-auth", // google_cloud_platform_libraries_bom sets version - grpc_core : "io.grpc:grpc-core", // google_cloud_platform_libraries_bom sets version grpc_context : "io.grpc:grpc-context", // google_cloud_platform_libraries_bom sets version + grpc_core : "io.grpc:grpc-core", // google_cloud_platform_libraries_bom sets version grpc_google_cloud_pubsub_v1 : "com.google.api.grpc:grpc-google-cloud-pubsub-v1", // google_cloud_platform_libraries_bom sets version grpc_google_cloud_pubsublite_v1 : "com.google.api.grpc:grpc-google-cloud-pubsublite-v1:$google_cloud_pubsublite_version", grpc_grpclb : "io.grpc:grpc-grpclb", // google_cloud_platform_libraries_bom sets version diff --git a/examples/kotlin/build.gradle b/examples/kotlin/build.gradle index 7b062cc330a7..ca0d444fb66d 100644 --- a/examples/kotlin/build.gradle +++ b/examples/kotlin/build.gradle @@ -47,6 +47,7 @@ configurations.sparkRunnerPreCommit { } dependencies { + compile platform(library.java.google_cloud_platform_libraries_bom) compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:extensions:google-cloud-platform-core") diff --git a/sdks/java/io/splunk/build.gradle b/sdks/java/io/splunk/build.gradle index 0ffe998a553e..5e3a47f01500 100644 --- a/sdks/java/io/splunk/build.gradle +++ b/sdks/java/io/splunk/build.gradle @@ -25,6 +25,7 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Splunk" 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 diff --git a/sdks/java/testing/test-utils/build.gradle b/sdks/java/testing/test-utils/build.gradle index c69f0eb1cfff..531a02acbfe6 100644 --- a/sdks/java/testing/test-utils/build.gradle +++ b/sdks/java/testing/test-utils/build.gradle @@ -26,6 +26,7 @@ applyJavaNature(enableChecker:false, description = "Apache Beam :: SDKs :: Java :: Test Utils" dependencies { + compile platform(library.java.google_cloud_platform_libraries_bom) compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.vendored_guava_26_0_jre compile library.java.google_cloud_bigquery From db26087457e60a37439b004b79d9a259e2c1cade Mon Sep 17 00:00:00 2001 From: kileys Date: Fri, 9 Oct 2020 20:48:23 +0000 Subject: [PATCH 04/14] update category attribute --- .../org/apache/beam/gradle/BeamModulePlugin.groovy | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index e211943b210b..0b282cf2d536 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -22,8 +22,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import groovy.json.JsonOutput import groovy.json.JsonSlurper import java.util.concurrent.atomic.AtomicInteger -import org.gradle.api.attributes.Attribute -import org.gradle.api.attributes.AttributeContainer +import org.gradle.api.attributes.Category import org.gradle.api.GradleException import org.gradle.api.Plugin import org.gradle.api.Project @@ -1256,16 +1255,14 @@ class BeamModulePlugin implements Plugin { def dependenciesNode = root.appendNode('dependencies') - // BOMs, declared with 'platform', appear in section + // BOMs, declared with 'platform' or 'enforced-platform', appear in section def boms = [] - // This value is from PlatformSupport.COMPONENT_CATEGORY (Gradle's internal API) - def componentCategory = Attribute.of('org.gradle.component.category', java.lang.String.class); def generateDependenciesFromConfiguration = { param -> project.configurations."${param.configuration}".allDependencies.each { - AttributeContainer attributes = it.getAttributes() - if (attributes.getAttribute(componentCategory) == 'platform') { - boms.add(it); + String category = it.getAttributes().getAttribute(Category.CATEGORY_ATTRIBUTE) + if (Category.ENFORCED_PLATFORM == category || Category.REGULAR_PLATFORM == category) { + boms.add(it) return } From 6b9b51ccfba85d53df17878349af4c36603288d8 Mon Sep 17 00:00:00 2001 From: kileys Date: Mon, 12 Oct 2020 20:08:11 +0000 Subject: [PATCH 05/14] use bom in maven archetype --- .../java/maven-archetypes/examples/build.gradle | 2 +- .../main/resources/archetype-resources/pom.xml | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/sdks/java/maven-archetypes/examples/build.gradle b/sdks/java/maven-archetypes/examples/build.gradle index d6463fea536d..20e967aad7e7 100644 --- a/sdks/java/maven-archetypes/examples/build.gradle +++ b/sdks/java/maven-archetypes/examples/build.gradle @@ -28,11 +28,11 @@ processResources { 'project.version': version, 'bigquery.version': dependencies.create(project.library.java.google_api_services_bigquery).getVersion(), 'google-api-client.version': dependencies.create(project.library.java.google_api_client).getVersion(), - 'google-http-client.version': dependencies.create(project.library.java.google_http_client).getVersion(), 'hamcrest.version': dependencies.create(project.library.java.hamcrest_library).getVersion(), 'jackson.version': dependencies.create(project.library.java.jackson_core).getVersion(), 'joda.version': dependencies.create(project.library.java.joda_time).getVersion(), 'junit.version': dependencies.create(project.library.java.junit).getVersion(), + 'libraries-bom.version': dependencies.create(project.library.java.google_cloud_platform_libraries_bom).getVersion(), 'pubsub.version': dependencies.create(project.library.java.google_api_services_pubsub).getVersion(), 'slf4j.version': dependencies.create(project.library.java.slf4j_api).getVersion(), 'spark.version': dependencies.create(project.library.java.spark_core).getVersion(), diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index 8733942d0d93..e5b88c935489 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -28,10 +28,9 @@ @project.version@ - + @libraries-bom.version@ @bigquery.version@ @google-api-client.version@ - @google-http-client.version@ @hamcrest.version@ @jackson.version@ @joda.version@ @@ -379,7 +378,6 @@ com.google.http-client google-http-client - ${google-http-client.version} @@ -460,4 +458,17 @@ test + + + + + + com.google.cloud + libraries-bom + ${libraries-bom.version} + pom + import + + + From c51c95fed46fc1e54c966499991c696a0fd470dc Mon Sep 17 00:00:00 2001 From: kileys Date: Mon, 12 Oct 2020 20:23:17 +0000 Subject: [PATCH 06/14] remove fixed issue --- .../org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java index d83ef0b209de..d7fea67e97b6 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java @@ -85,14 +85,6 @@ public void testGcpApiSurface() throws Exception { Matchers.>equalTo(com.google.cloud.ByteArray.class), Matchers.>equalTo(com.google.cloud.Date.class), Matchers.>equalTo(com.google.cloud.Timestamp.class), - // TODO: remove the following classes once spanner updates APIs of AsyncResultSet: - // https://github.com/googleapis/java-spanner/issues/410 - Matchers.>equalTo(com.google.common.collect.ImmutableCollection.class), - Matchers.>equalTo(com.google.common.collect.ImmutableCollection.Builder.class), - Matchers.>equalTo(com.google.common.collect.ImmutableList.class), - Matchers.>equalTo(com.google.common.collect.ImmutableList.Builder.class), - Matchers.>equalTo(com.google.common.collect.UnmodifiableIterator.class), - Matchers.>equalTo(com.google.common.collect.UnmodifiableListIterator.class), classesInPackage("com.google.cloud.spanner"), classesInPackage("com.google.datastore.v1"), classesInPackage("com.google.protobuf"), From 359e0d6807add8f31db773ce8bc9471aca6258c2 Mon Sep 17 00:00:00 2001 From: kileys Date: Mon, 12 Oct 2020 20:49:32 +0000 Subject: [PATCH 07/14] alpha ordering --- .../examples/src/main/resources/archetype-resources/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index e5b88c935489..c7c2d40ad1a0 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -28,13 +28,14 @@ @project.version@ - @libraries-bom.version@ + @bigquery.version@ @google-api-client.version@ @hamcrest.version@ @jackson.version@ @joda.version@ @junit.version@ + @libraries-bom.version@ @maven-compiler-plugin.version@ @maven-exec-plugin.version@ @maven-jar-plugin.version@ From e51d3a4fd2d5884a191c045b59608e5407957735 Mon Sep 17 00:00:00 2001 From: kileys Date: Mon, 12 Oct 2020 21:44:25 +0000 Subject: [PATCH 08/14] plugin cant find license type --- sdks/java/container/license_scripts/dep_urls_java.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml index 37f4b6a5e035..72a402f412fc 100644 --- a/sdks/java/container/license_scripts/dep_urls_java.yaml +++ b/sdks/java/container/license_scripts/dep_urls_java.yaml @@ -40,6 +40,9 @@ jcip-annotations: jaxen: '1.1.6': type: "3-Clause BSD" +libraries-bom: + '12.0.0': + type: "Apache License 2.0" paranamer: '2.7': license: "https://raw.githubusercontent.com/paul-hammant/paranamer/master/LICENSE.txt" From f4adb3821ba0403c89a8abfd2657c2ae9b6ba0bd Mon Sep 17 00:00:00 2001 From: kileys Date: Mon, 12 Oct 2020 23:01:13 +0000 Subject: [PATCH 09/14] add license --- sdks/java/container/license_scripts/dep_urls_java.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml index 72a402f412fc..05092c47da4a 100644 --- a/sdks/java/container/license_scripts/dep_urls_java.yaml +++ b/sdks/java/container/license_scripts/dep_urls_java.yaml @@ -42,6 +42,7 @@ jaxen: type: "3-Clause BSD" libraries-bom: '12.0.0': + license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE" type: "Apache License 2.0" paranamer: '2.7': From 8764e7f879b9076d4b18dfd71e24b41ce0669f3d Mon Sep 17 00:00:00 2001 From: kileys Date: Tue, 20 Oct 2020 20:27:09 +0000 Subject: [PATCH 10/14] use enforce platform --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- examples/java/build.gradle | 2 +- examples/kotlin/build.gradle | 2 +- runners/google-cloud-dataflow-java/build.gradle | 2 +- runners/google-cloud-dataflow-java/worker/build.gradle | 2 +- sdks/java/extensions/google-cloud-platform-core/build.gradle | 2 +- sdks/java/extensions/sql/datacatalog/build.gradle | 2 +- sdks/java/extensions/sql/zetasql/build.gradle | 2 +- sdks/java/io/google-cloud-platform/build.gradle | 2 +- sdks/java/testing/test-utils/build.gradle | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 18568d35b372..ba53da76c53e 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -21,7 +21,6 @@ package org.apache.beam.gradle import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import groovy.json.JsonOutput import groovy.json.JsonSlurper -import java.util.concurrent.atomic.AtomicInteger import org.gradle.api.attributes.Category import org.gradle.api.GradleException import org.gradle.api.Plugin @@ -490,6 +489,7 @@ class BeamModulePlugin implements Plugin { google_cloud_pubsublite : "com.google.cloud:google-cloud-pubsublite:$google_cloud_pubsublite_version", // The GCP Libraries BOM dashboard shows the versions set by the BOM: // https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/12.0.0/artifact_details.html + // Update libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:12.0.0", google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version google_code_gson : "com.google.code.gson:gson:$google_code_gson_version", diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 48300fde1875..0cf09565b7ed 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -48,7 +48,7 @@ configurations.sparkRunnerPreCommit { } dependencies { - compile platform(library.java.google_cloud_platform_libraries_bom) + compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:extensions:google-cloud-platform-core") diff --git a/examples/kotlin/build.gradle b/examples/kotlin/build.gradle index ca0d444fb66d..f77a803fb398 100644 --- a/examples/kotlin/build.gradle +++ b/examples/kotlin/build.gradle @@ -47,7 +47,7 @@ configurations.sparkRunnerPreCommit { } dependencies { - compile platform(library.java.google_cloud_platform_libraries_bom) + compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:extensions:google-cloud-platform-core") diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle index a4d19ab9666f..4d15fcbfacc3 100644 --- a/runners/google-cloud-dataflow-java/build.gradle +++ b/runners/google-cloud-dataflow-java/build.gradle @@ -63,7 +63,7 @@ configurations { } dependencies { - compile platform(library.java.google_cloud_platform_libraries_bom) + compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile library.java.vendored_guava_26_0_jre compile project(path: ":model:pipeline", configuration: "shadow") compile project(path: ":sdks:java:core", configuration: "shadow") diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle b/runners/google-cloud-dataflow-java/worker/build.gradle index 445d0c9d7300..05fe61a20e68 100644 --- a/runners/google-cloud-dataflow-java/worker/build.gradle +++ b/runners/google-cloud-dataflow-java/worker/build.gradle @@ -67,7 +67,7 @@ dependencies { // // All main sourceset dependencies here should be listed as compile scope so that the dependencies // are all packaged into a single uber jar allowing the jar to serve as an application. - compile platform(library.java.google_cloud_platform_libraries_bom) + compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile project(":runners:google-cloud-dataflow-java") compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:extensions:google-cloud-platform-core") diff --git a/sdks/java/extensions/google-cloud-platform-core/build.gradle b/sdks/java/extensions/google-cloud-platform-core/build.gradle index f663ff64162d..b2ffaaed09f5 100644 --- a/sdks/java/extensions/google-cloud-platform-core/build.gradle +++ b/sdks/java/extensions/google-cloud-platform-core/build.gradle @@ -36,7 +36,7 @@ test { } dependencies { - compile platform(library.java.google_cloud_platform_libraries_bom) + compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile library.java.vendored_guava_26_0_jre compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.google_http_client_jackson2 diff --git a/sdks/java/extensions/sql/datacatalog/build.gradle b/sdks/java/extensions/sql/datacatalog/build.gradle index f49783032da2..ad1fab0bceb9 100644 --- a/sdks/java/extensions/sql/datacatalog/build.gradle +++ b/sdks/java/extensions/sql/datacatalog/build.gradle @@ -23,7 +23,7 @@ plugins { id 'org.apache.beam.module' } applyJavaNature(automaticModuleName: 'org.apache.beam.sdk.extensions.sql.datacatalog') dependencies { - compile platform(library.java.google_cloud_platform_libraries_bom) + compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile(library.java.google_cloud_datacatalog_v1beta1) { exclude group: 'io.grpc', module: 'grpc-core' // Use Beam's version } diff --git a/sdks/java/extensions/sql/zetasql/build.gradle b/sdks/java/extensions/sql/zetasql/build.gradle index 00412f497a0d..c5b140781858 100644 --- a/sdks/java/extensions/sql/zetasql/build.gradle +++ b/sdks/java/extensions/sql/zetasql/build.gradle @@ -31,7 +31,7 @@ ext.summary = "ZetaSQL to Calcite translator" def zetasql_version = "2020.08.1" dependencies { - compile platform(library.java.google_cloud_platform_libraries_bom) + compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile project(":sdks:java:core") compile project(":sdks:java:extensions:sql") compile library.java.vendored_calcite_1_20_0 diff --git a/sdks/java/io/google-cloud-platform/build.gradle b/sdks/java/io/google-cloud-platform/build.gradle index 0b6ac77940d5..47cda04f3e8a 100644 --- a/sdks/java/io/google-cloud-platform/build.gradle +++ b/sdks/java/io/google-cloud-platform/build.gradle @@ -29,7 +29,7 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform" ext.summary = "IO library to read and write Google Cloud Platform systems from Beam." dependencies { - compile platform(library.java.google_cloud_platform_libraries_bom) + compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile project(path: ":sdks:java:core", configuration: "shadow") compile project(":sdks:java:expansion-service") compile project(":sdks:java:extensions:google-cloud-platform-core") diff --git a/sdks/java/testing/test-utils/build.gradle b/sdks/java/testing/test-utils/build.gradle index 531a02acbfe6..8ce707c191e6 100644 --- a/sdks/java/testing/test-utils/build.gradle +++ b/sdks/java/testing/test-utils/build.gradle @@ -26,7 +26,7 @@ applyJavaNature(enableChecker:false, description = "Apache Beam :: SDKs :: Java :: Test Utils" dependencies { - compile platform(library.java.google_cloud_platform_libraries_bom) + compile enforcedPlatform(library.java.google_cloud_platform_libraries_bom) compile project(path: ":sdks:java:core", configuration: "shadow") compile library.java.vendored_guava_26_0_jre compile library.java.google_cloud_bigquery From 951184ac8018d78545147a10b7361da2379608d2 Mon Sep 17 00:00:00 2001 From: kileys Date: Wed, 21 Oct 2020 08:27:47 +0000 Subject: [PATCH 11/14] update bom to 13.0.0 --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- sdks/java/container/license_scripts/dep_urls_java.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index ba53da76c53e..886c86f0b0ce 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -490,7 +490,7 @@ class BeamModulePlugin implements Plugin { // The GCP Libraries BOM dashboard shows the versions set by the BOM: // https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/12.0.0/artifact_details.html // Update libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml - google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:12.0.0", + google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:13.0.0", google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version google_code_gson : "com.google.code.gson:gson:$google_code_gson_version", // google-http-client's version is explicitly declared for sdks/java/maven-archetypes/examples diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml index 05092c47da4a..5c5046ef330c 100644 --- a/sdks/java/container/license_scripts/dep_urls_java.yaml +++ b/sdks/java/container/license_scripts/dep_urls_java.yaml @@ -41,7 +41,7 @@ jaxen: '1.1.6': type: "3-Clause BSD" libraries-bom: - '12.0.0': + '13.0.0': license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE" type: "Apache License 2.0" paranamer: From 9cf208316a27c8b8699ef6a5a3c1ae1201b6e1fe Mon Sep 17 00:00:00 2001 From: kileys Date: Mon, 26 Oct 2020 20:47:36 +0000 Subject: [PATCH 12/14] update to 13.2 --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- sdks/java/container/license_scripts/dep_urls_java.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index fa982e74f0fc..601cd5dcb6a2 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -490,7 +490,7 @@ class BeamModulePlugin implements Plugin { // The GCP Libraries BOM dashboard shows the versions set by the BOM: // https://storage.googleapis.com/cloud-opensource-java-dashboard/com.google.cloud/libraries-bom/12.0.0/artifact_details.html // Update libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml - google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:13.0.0", + google_cloud_platform_libraries_bom : "com.google.cloud:libraries-bom:13.2.0", google_cloud_spanner : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version google_code_gson : "com.google.code.gson:gson:$google_code_gson_version", // google-http-client's version is explicitly declared for sdks/java/maven-archetypes/examples diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml index 5c5046ef330c..280b1a8cee79 100644 --- a/sdks/java/container/license_scripts/dep_urls_java.yaml +++ b/sdks/java/container/license_scripts/dep_urls_java.yaml @@ -41,7 +41,7 @@ jaxen: '1.1.6': type: "3-Clause BSD" libraries-bom: - '13.0.0': + '13.2.0': license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE" type: "Apache License 2.0" paranamer: From 28f633a8548f284163c42752aeecb39d56c97504 Mon Sep 17 00:00:00 2001 From: kileys Date: Mon, 26 Oct 2020 23:35:54 +0000 Subject: [PATCH 13/14] update grpc version --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 601cd5dcb6a2..1e126e14ca2d 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -398,7 +398,7 @@ class BeamModulePlugin implements Plugin { def google_code_gson_version = "2.8.6" def google_oauth_clients_version = "1.31.0" // Try to keep grpc_version consistent with gRPC version in google_cloud_platform_libraries_bom - def grpc_version = "1.27.2" + def grpc_version = "1.32.2" def guava_version = "25.1-jre" def hadoop_version = "2.8.5" def hamcrest_version = "2.1" From db31a4a0de124bee48c5e1485bda21d1a7230fc6 Mon Sep 17 00:00:00 2001 From: kileys Date: Fri, 30 Oct 2020 21:41:11 +0000 Subject: [PATCH 14/14] fix conflicts --- .../org/apache/beam/gradle/BeamModulePlugin.groovy | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index f56f7e47421a..341596b68d00 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -393,21 +393,12 @@ class BeamModulePlugin implements Plugin { def cassandra_driver_version = "3.10.2" def checkerframework_version = "3.7.0" def classgraph_version = "4.8.65" -<<<<<<< HEAD -======= - def gax_version = "1.60.0" - def generated_grpc_ga_version = "1.85.1" - def google_auth_version = "0.19.0" ->>>>>>> 168d442314a3bd012eedf2915d1aaef7f4092bdc def google_clients_version = "1.30.10" def google_cloud_bigdataoss_version = "2.1.5" def google_cloud_pubsublite_version = "0.4.1" def google_code_gson_version = "2.8.6" def google_oauth_clients_version = "1.31.0" -<<<<<<< HEAD // Try to keep grpc_version consistent with gRPC version in google_cloud_platform_libraries_bom -======= ->>>>>>> 168d442314a3bd012eedf2915d1aaef7f4092bdc def grpc_version = "1.32.2" def guava_version = "25.1-jre" def hadoop_version = "2.8.5" @@ -420,12 +411,7 @@ class BeamModulePlugin implements Plugin { def netty_version = "4.1.51.Final" def postgres_version = "42.2.16" def powermock_version = "2.0.2" -<<<<<<< HEAD - def protobuf_version = "3.11.1" -======= - def proto_google_common_protos_version = "1.17.0" def protobuf_version = "3.12.0" ->>>>>>> 168d442314a3bd012eedf2915d1aaef7f4092bdc def quickcheck_version = "0.8" def slf4j_version = "1.7.30" def spark_version = "2.4.7"