build(deps): Bump guava version to 32.1.1-jre (#1832)

* chore: Bump guava version to 32.1.1-jre * chore: Add guava to gradle template
googleapis · Jul 12, 2023 · 6d64b8f · 6d64b8f
1 parent b1d32b5
commit 6d64b8f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
@@ -30,7 +30,7 @@
     <grpc.version>1.55.3</grpc.version>
     <google.auth.version>1.19.0</google.auth.version>
     <gson.version>2.10.1</gson.version>
-    <guava.version>32.0.1-jre</guava.version>
+    <guava.version>32.1.1-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/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
@@ -381,7 +381,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.0.1-jre</version>
+      <version>${guava.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.api</groupId>

diff --git 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.0.1-jre
+maven.com_google_guava_guava=com.google.guava:guava:32.1.1-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/java-common-protos/pom.xml b/java-common-protos/pom.xml
@@ -54,7 +54,6 @@
     <github.global.server>github</github.global.server>
     <site.installationModule>google-iam-parent</site.installationModule>
     <junit.version>4.13.2</junit.version>
-    <guava.version>32.0.1-jre</guava.version>
   </properties>
 
   <dependencyManagement>

diff --git a/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl b/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl
@@ -14,6 +14,8 @@ 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
@@ -16,6 +16,7 @@ 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
@@ -11,6 +11,7 @@ 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