Update to libraries-bom 26.21.0 (#27780)

apache · Aug 1, 2023 · a1dd170 · a1dd170
1 parent a1ab841
commit a1dd170
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 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
@@ -539,7 +539,7 @@ class BeamModulePlugin implements Plugin<Project> {
     def google_oauth_clients_version = "1.34.1"
     // Try to keep grpc_version consistent with gRPC version in google_cloud_platform_libraries_bom
     def grpc_version = "1.56.1"
-    def guava_version = "32.1.1-jre"
+    def guava_version = "32.1.2-jre"
     def hadoop_version = "2.10.2"
     def hamcrest_version = "2.1"
     def influxdb_version = "2.19"
@@ -677,9 +677,9 @@ class BeamModulePlugin implements Plugin<Project> {
         google_cloud_pubsub                         : "com.google.cloud:google-cloud-pubsub", // google_cloud_platform_libraries_bom sets version
         google_cloud_pubsublite                     : "com.google.cloud:google-cloud-pubsublite",  // google_cloud_platform_libraries_bom sets version
         // The release notes shows the versions set by the BOM:
-        // https://github.com/googleapis/java-cloud-bom/releases/tag/v26.20.0
+        // https://github.com/googleapis/java-cloud-bom/releases/tag/v26.21.0
         // Update libraries-bom version on sdks/java/container/license_scripts/dep_urls_java.yaml
-        google_cloud_platform_libraries_bom         : "com.google.cloud:libraries-bom:26.20.0",
+        google_cloud_platform_libraries_bom         : "com.google.cloud:libraries-bom:26.21.0",
         google_cloud_spanner                        : "com.google.cloud:google-cloud-spanner", // google_cloud_platform_libraries_bom sets version
         google_cloud_spanner_test                   : "com.google.cloud:google-cloud-spanner:$google_cloud_spanner_version:tests",
         google_code_gson                            : "com.google.code.gson:gson:$google_code_gson_version",
@@ -1137,10 +1137,6 @@ class BeamModulePlugin implements Plugin<Project> {
         // test libraries classes causing version conflicts. Users should rely
         // on using the yyy-core package instead of the yyy-all package.
         exclude group: "org.hamcrest", module: "hamcrest-all"
-
-        // https://github.com/google/guava/releases/tag/v32.1.0#user-content-overlap
-        // Guava starting on v32.1.0 report classes as duplicate
-        exclude group: "com.google.guava", module: "listenablefuture"
       }
 
       // Force usage of the libraries defined within our common set found in the root

diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml
@@ -39,14 +39,14 @@ jcip-annotations:
     license: "https://raw.githubusercontent.com/stephenc/jcip-annotations/master/LICENSE.txt"
     type: "Apache License 2.0"
 guava-parent:
-  '32.1.1-jre':
+  '32.1.2-jre':
     license: "https://raw.githubusercontent.com/google/guava/master/LICENSE"
     type: "Apache License 2.0"
 jaxen:
   '1.1.6':
     type: "3-Clause BSD"
 libraries-bom:
-  '26.20.0':
+  '26.21.0':
     license: "https://raw.githubusercontent.com/GoogleCloudPlatform/cloud-opensource-java/master/LICENSE"
     type: "Apache License 2.0"
 paranamer: