[BEAM-5559] Upgrade version of guava to 32.1.1-jre for all vendored a…

…rtifacts containing guava (apache#27766)
liferoad · Aug 3, 2023 · 5d32ae2 · 5d32ae2
1 parent 39d3c6f
commit 5d32ae2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/VendorJavaPlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/VendorJavaPlugin.groovy
@@ -36,11 +36,11 @@ import org.gradle.api.publish.maven.MavenPublication
  *   <li>Increment the vendored artifact version only if we need to release a new version.
  * </ul>
  *
- * <p>Example for com.google.guava:guava:26.0-jre:
+ * <p>Example for com.google.guava:guava:32.1.2-jre:
  * <ul>
  *   <li>groupId: org.apache.beam
- *   <li>artifactId: guava-26_0-jre
- *   <li>namespace: org.apache.beam.vendor.guava.v26_0_jre
+ *   <li>artifactId: guava-32_1_2-jre
+ *   <li>namespace: org.apache.beam.vendor.guava.v32_1_2_jre
  *   <li>version: 0.1
  * </ul>
  *

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -308,7 +308,7 @@ include(":sdks:typescript:container")
 include(":vendor:bytebuddy-1_12_8")
 include(":vendor:grpc-1_54_0")
 include(":vendor:calcite-1_28_0")
-include(":vendor:guava-26_0-jre")
+include(":vendor:guava-32_1_2-jre")
 include(":website")
 include(":runners:google-cloud-dataflow-java:worker")
 include(":runners:google-cloud-dataflow-java:worker:windmill")

diff --git a/vendor/guava-26_0-jre/build.gradle → vendor/guava-32_1_2-jre/build.gradle b/vendor/guava-26_0-jre/build.gradle → vendor/guava-32_1_2-jre/build.gradle
@@ -18,16 +18,16 @@
 
 plugins { id 'org.apache.beam.vendor-java' }
 
-description = "Apache Beam :: Vendored Dependencies :: Guava 26.0-jre"
+description = "Apache Beam :: Vendored Dependencies :: Guava 32.1.2-jre"
 
 group = "org.apache.beam"
 version = "0.1"
 
 vendorJava(
-  dependencies: ["com.google.guava:guava:26.0-jre"],
+  dependencies: ["com.google.guava:guava:32.1.2-jre"],
   relocations: [
-    "com.google.common": "org.apache.beam.vendor.guava.v26_0_jre.com.google.common",
-    "com.google.thirdparty": "org.apache.beam.vendor.guava.v26_0_jre.com.google.thirdparty",
+    "com.google.common": "org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common",
+    "com.google.thirdparty": "org.apache.beam.vendor.guava.v32_1_2_jre.com.google.thirdparty",
   ],
   exclusions: [
     "com/google/errorprone/**",
@@ -37,6 +37,6 @@ vendorJava(
     "org/codehaus/mojo/animal_sniffer/**",
   ],
   groupId: group,
-  artifactId: "beam-vendor-guava-26_0-jre",
+  artifactId: "beam-vendor-guava-32_1_2-jre",
   version: version,
 )