[BEAM-9444] Use GCP BOM to set package versions

examples/java/build.gradle

@@ -48,6 +48,7 @@ configurations.sparkRunnerPreCommit {
 }
 
 dependencies {
+  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")

examples/kotlin/build.gradle

@@ -47,6 +47,7 @@ configurations.sparkRunnerPreCommit {
 }
 
 dependencies {
+  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")

runners/google-cloud-dataflow-java/build.gradle

@@ -63,6 +63,7 @@ configurations {
 }
 
 dependencies {
+  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")

runners/google-cloud-dataflow-java/worker/build.gradle

@@ -67,6 +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 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")

sdks/java/container/license_scripts/dep_urls_java.yaml

@@ -40,6 +40,10 @@ jcip-annotations:
 jaxen:
   '1.1.6':
     type: "3-Clause BSD"
+libraries-bom:
+  '13.2.0':
+    license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE"
+    type: "Apache License 2.0"
 paranamer:
   '2.7':
     license: "https://raw.githubusercontent.com/paul-hammant/paranamer/master/LICENSE.txt"

sdks/java/extensions/google-cloud-platform-core/build.gradle

@@ -36,6 +36,7 @@ test {
 }
 
 dependencies {
+  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

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 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
   }

sdks/java/extensions/sql/zetasql/build.gradle

@@ -31,6 +31,7 @@ ext.summary = "ZetaSQL to Calcite translator"
 def zetasql_version = "2020.10.1"
 
 dependencies {
+  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

sdks/java/io/google-cloud-platform/build.gradle

@@ -29,6 +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 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")

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/GcpApiSurfaceTest.java

@@ -86,14 +86,6 @@ public void testGcpApiSurface() throws Exception {
             Matchers.<Class<?>>equalTo(com.google.cloud.ByteArray.class),
             Matchers.<Class<?>>equalTo(com.google.cloud.Date.class),
             Matchers.<Class<?>>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.<Class<?>>equalTo(com.google.common.collect.ImmutableCollection.class),
-            Matchers.<Class<?>>equalTo(com.google.common.collect.ImmutableCollection.Builder.class),
-            Matchers.<Class<?>>equalTo(com.google.common.collect.ImmutableList.class),
-            Matchers.<Class<?>>equalTo(com.google.common.collect.ImmutableList.Builder.class),
-            Matchers.<Class<?>>equalTo(com.google.common.collect.UnmodifiableIterator.class),
-            Matchers.<Class<?>>equalTo(com.google.common.collect.UnmodifiableListIterator.class),
             classesInPackage("com.google.cloud.spanner"),
             classesInPackage("com.google.datastore.v1"),
             classesInPackage("com.google.protobuf"),

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

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(),

sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml

@@ -31,11 +31,11 @@
 
     <bigquery.version>@bigquery.version@</bigquery.version>
     <google-api-client.version>@google-api-client.version@</google-api-client.version>
-    <google-http-client.version>@google-http-client.version@</google-http-client.version>
     <hamcrest.version>@hamcrest.version@</hamcrest.version>
     <jackson.version>@jackson.version@</jackson.version>
     <joda.version>@joda.version@</joda.version>
     <junit.version>@junit.version@</junit.version>
+    <libraries-bom.version>@libraries-bom.version@</libraries-bom.version>
     <maven-compiler-plugin.version>@maven-compiler-plugin.version@</maven-compiler-plugin.version>
     <maven-exec-plugin.version>@maven-exec-plugin.version@</maven-exec-plugin.version>
     <maven-jar-plugin.version>@maven-jar-plugin.version@</maven-jar-plugin.version>
@@ -379,7 +379,6 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
-      <version>${google-http-client.version}</version>
       <exclusions>
         <!-- Exclude an old version of guava that is being pulled
              in by a transitive dependency of google-api-client -->
@@ -460,4 +459,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <!-- GCP libraries BOM sets the version for google http client -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>libraries-bom</artifactId>
+        <version>${libraries-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>

sdks/java/testing/test-utils/build.gradle

@@ -26,6 +26,7 @@ applyJavaNature(enableChecker:false,
 description = "Apache Beam :: SDKs :: Java :: Test Utils"
 
 dependencies {
+  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