From a5433704d96c92e3e8dc66ab72c43ca99b121e75 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 14 Mar 2024 17:07:46 -0400
Subject: [PATCH 1/7] deps: update `guava.version` to `33.1.0-jre`

---
 gapic-generator-java-pom-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
index 883f97629a..4896786785 100644
--- a/gapic-generator-java-pom-parent/pom.xml
+++ b/gapic-generator-java-pom-parent/pom.xml
@@ -30,7 +30,7 @@
     <google.auth.version>1.23.0</google.auth.version>
     <google.http-client.version>1.44.1</google.http-client.version>
     <gson.version>2.10.1</gson.version>
-    <guava.version>32.1.3-jre</guava.version>
+    <guava.version>33.1.0-jre</guava.version>
     <protobuf.version>3.25.2</protobuf.version>
     <opentelemetry.version>1.35.0</opentelemetry.version>
     <maven.compiler.release>8</maven.compiler.release>

From 333f40a6436ef44764a01dffa2d7825289506895 Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 14 Mar 2024 17:25:10 -0400
Subject: [PATCH 2/7] add `error_prone_annotations` to java-core

---
 java-core/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/java-core/pom.xml b/java-core/pom.xml
index 168704c6d7..a9ee9e6d76 100644
--- a/java-core/pom.xml
+++ b/java-core/pom.xml
@@ -68,6 +68,11 @@
         <version>1.10.19</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.errorprone</groupId>
+        <artifactId>error_prone_annotationsa</artifactId>
+        <version>${errorprone.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

From adfd96d5cfb45dbc10a976f489e106b0c66f0f4a Mon Sep 17 00:00:00 2001
From: Diego Marquez <diegomarquezp@google.com>
Date: Thu, 14 Mar 2024 17:28:38 -0400
Subject: [PATCH 3/7] add `errorprone.version` to api-common-java

---
 api-common-java/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml
index 502c56a8d0..02fb3be2be 100644
--- a/api-common-java/pom.xml
+++ b/api-common-java/pom.xml
@@ -80,6 +80,11 @@
             <version>1.4.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotationsa</artifactId>
+            <version>${errorprone.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -125,4 +130,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

From 6f9be8290729be91977b64d6c02e57adc4fed9b3 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 14 Mar 2024 21:31:44 +0000
Subject: [PATCH 4/7] use `errorprone.version` from gapic-generator-parent

---
 api-common-java/pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml
index 02fb3be2be..aee8e98886 100644
--- a/api-common-java/pom.xml
+++ b/api-common-java/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.google.errorprone</groupId>
             <artifactId>error_prone_annotations</artifactId>
-            <version>2.24.1</version>
+            <version>${errorprone.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -80,11 +80,6 @@
             <version>1.4.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotationsa</artifactId>
-            <version>${errorprone.version}</version>
-        </dependency>
     </dependencies>
 
     <build>

From b4dc183934ac5cc47044863cc086d6e43c964c34 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 14 Mar 2024 21:33:29 +0000
Subject: [PATCH 5/7] add errorprone.version to gapic-generator-java-pom-parent

---
 gapic-generator-java-pom-parent/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
index 4896786785..30ceb9abdf 100644
--- a/gapic-generator-java-pom-parent/pom.xml
+++ b/gapic-generator-java-pom-parent/pom.xml
@@ -34,6 +34,7 @@
     <protobuf.version>3.25.2</protobuf.version>
     <opentelemetry.version>1.35.0</opentelemetry.version>
     <maven.compiler.release>8</maven.compiler.release>
+    <errorprone.version>2.26.1</errorprone.version>
   </properties>
 
   <developers>

From 7da86a2a0b14c84f74997114f2f2d8a0f0f0a15b Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 14 Mar 2024 21:48:11 +0000
Subject: [PATCH 6/7] normalize j2objc annotaitons

---
 api-common-java/pom.xml                                   | 5 +++++
 gapic-generator-java-pom-parent/pom.xml                   | 1 +
 java-shared-dependencies/third-party-dependencies/pom.xml | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml
index aee8e98886..ed7683c376 100644
--- a/api-common-java/pom.xml
+++ b/api-common-java/pom.xml
@@ -80,6 +80,11 @@
             <version>1.4.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>com.google.j2objc</groupId>
+          <artifactId>j2objc-annotations</artifactId>
+          <version>${j2objc-annotations.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
index 30ceb9abdf..ac19c44cec 100644
--- a/gapic-generator-java-pom-parent/pom.xml
+++ b/gapic-generator-java-pom-parent/pom.xml
@@ -35,6 +35,7 @@
     <opentelemetry.version>1.35.0</opentelemetry.version>
     <maven.compiler.release>8</maven.compiler.release>
     <errorprone.version>2.26.1</errorprone.version>
+    <j2objc-annotations.version>3.0.0</j2objc-annotations.version>
   </properties>
 
   <developers>
diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
index 708caff83a..d5469c4654 100644
--- a/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -37,7 +37,7 @@
     <!-- ensure checker-qual version matches what Guava uses -->
     <checker-qual.version>3.42.0</checker-qual.version>
     <perfmark-api.version>0.27.0</perfmark-api.version>
-    <j2objc-annotations.version>2.8</j2objc-annotations.version>
+    <j2objc-annotations.version>3.0.0</j2objc-annotations.version>
     <opentelemetry.version>1.36.0</opentelemetry.version>
     <flogger.version>0.8</flogger.version>
     <arrow.version>15.0.1</arrow.version>
@@ -184,4 +184,4 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-</project>
\ No newline at end of file
+</project>

From 61c6e6a0ffb74910e1e5734867dd1ca4f3ab8e22 Mon Sep 17 00:00:00 2001
From: diegomarquezp <diegomarquezp@google.com>
Date: Thu, 14 Mar 2024 21:52:32 +0000
Subject: [PATCH 7/7] use centralized errorprone.version in
 gapic-generator-java

---
 gapic-generator-java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
index f4128af38d..0bbd66061f 100644
--- a/gapic-generator-java/pom.xml
+++ b/gapic-generator-java/pom.xml
@@ -451,7 +451,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>2.24.1</version>
+      <version>${errorprone.version}</version>
     </dependency>
 
     <!--