From 9d87ed365dc1e15f1d8bfadefc56d41086fc020a Mon Sep 17 00:00:00 2001
From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>
Date: Tue, 1 Aug 2023 16:51:16 +0000
Subject: [PATCH] chore: Bump guava version to 32.1.2-jre (#1895)

---
 gapic-generator-java-pom-parent/pom.xml                       | 2 +-
 gax-java/dependencies.properties                              | 2 +-
 rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl     | 2 --
 rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl | 1 -
 rules_java_gapic/resources/gradle/client_rest.gradle.tmpl     | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
index cb91fb3132..39e9cd5663 100644
--- a/gapic-generator-java-pom-parent/pom.xml
+++ b/gapic-generator-java-pom-parent/pom.xml
@@ -31,7 +31,7 @@
     <google.auth.version>1.19.0</google.auth.version>
     <google.http-client.version>1.43.3</google.http-client.version>
     <gson.version>2.10.1</gson.version>
-    <guava.version>32.1.1-jre</guava.version>
+    <guava.version>32.1.2-jre</guava.version>
     <!--  On next protobuf upgrade (to 3.23.3 or higher),
     remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
       For context: https://github.com/googleapis/sdk-platform-java/pull/1791-->
diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties
index 5d02f411fd..dffdb40f96 100644
--- a/gax-java/dependencies.properties
+++ b/gax-java/dependencies.properties
@@ -60,7 +60,7 @@ maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-nativ
 maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.26.0
 maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53
 maven.com_google_code_gson_gson=com.google.code.gson:gson:2.10.1
-maven.com_google_guava_guava=com.google.guava:guava:32.1.1-jre
+maven.com_google_guava_guava=com.google.guava:guava:32.1.2-jre
 maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.1
 maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.12.0
 maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4
diff --git a/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl b/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl
index 23b656033c..d00e92e891 100644
--- a/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl
+++ b/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl
@@ -14,8 +14,6 @@ dependencies {
   testImplementation 'io.grpc:grpc-stub:{{version.io_grpc}}'
   testImplementation 'io.grpc:grpc-netty-shaded:{{version.io_grpc}}'
   testImplementation '{{maven.junit_junit}}'
-  api '{{maven.com_google_guava_guava}}'
-
 
   // TODO: remove when dropping Java 8 support.
   // https://github.com/googleapis/gapic-generator-java/issues/888
diff --git a/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl b/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl
index c9e8900261..6145198a0a 100644
--- a/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl
+++ b/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl
@@ -16,7 +16,6 @@ dependencies {
   testImplementation 'io.grpc:grpc-stub:{{version.io_grpc}}'
   testImplementation 'io.grpc:grpc-netty-shaded:{{version.io_grpc}}'
   testImplementation '{{maven.junit_junit}}'
-  api '{{maven.com_google_guava_guava}}'
 
   // TODO: remove when dropping Java 8 support.
   // https://github.com/googleapis/gapic-generator-java/issues/888
diff --git a/rules_java_gapic/resources/gradle/client_rest.gradle.tmpl b/rules_java_gapic/resources/gradle/client_rest.gradle.tmpl
index b37553bdb4..74c5020a9d 100644
--- a/rules_java_gapic/resources/gradle/client_rest.gradle.tmpl
+++ b/rules_java_gapic/resources/gradle/client_rest.gradle.tmpl
@@ -11,7 +11,6 @@ dependencies {
   api 'com.google.api:gax-httpjson:{{version.gax_httpjson}}'
   testImplementation 'com.google.api:gax-httpjson:{{version.gax_httpjson}}:testlib'
   testImplementation '{{maven.junit_junit}}'
-  api '{{maven.com_google_guava_guava}}'
 
   // TODO: remove when dropping Java 8 support.
   // https://github.com/googleapis/gapic-generator-java/issues/888