From 6030284329b9ea098c48f93bda0762ace213851c Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 14 Oct 2025 11:21:55 -0400
Subject: [PATCH 1/2] deps: Upgrade to use Guava v33.5.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8ec5aa94d..6f71a5305 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,7 +555,7 @@
     <project.jackson-core2.version>2.18.2</project.jackson-core2.version>
     <project.protobuf-java.version>3.21.12</project.protobuf-java.version>
 	<!-- We use the Java 8 compatible version due to https://www.cvedetails.com/cve/CVE-2023-2976/ -->
-    <project.guava.version>33.4.8-android</project.guava.version>
+    <project.guava.version>33.5.0-android</project.guava.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>
     <project.apache-httpclient-4.version>4.5.14</project.apache-httpclient-4.version>
     <project.apache-httpcore-4.version>4.4.16</project.apache-httpcore-4.version>

From 2db2bedd5ddd9f0e5b8f9f299cbd9fa5de452445 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 14 Oct 2025 11:59:49 -0400
Subject: [PATCH 2/2] chore: Exclude j2objc from guava

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6f71a5305..699a938d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,12 @@
         <groupId>com.google.guava</groupId>
         <artifactId>guava-testlib</artifactId>
         <version>${project.guava.version}</version>
+		<exclusions>
+          <exclusion>
+            <groupId>com.google.j2objc</groupId>
+            <artifactId>j2objc-annotations</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>