From 5b18ecafaa61a87c87ec00370fa71d59bacce04c Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Thu, 20 Aug 2026 15:01:38 -0400
Subject: [PATCH] Add conscrypt dependency to resolve gax conflict

---
 service/pom.xml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/service/pom.xml b/service/pom.xml
index 02ea62c0d..cba903e1b 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -296,6 +296,13 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
+      <exclusions>
+        <!-- gax depends on methods only available in 2.6+, and this uses 2.5 -->
+        <exclusion>
+          <groupId>org.conscrypt</groupId>
+          <artifactId>conscrypt-openjdk-uber</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -308,20 +315,19 @@
           <groupId>org.codehaus.woodstox</groupId>
           <artifactId>stax2-api</artifactId>
         </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-firestore</artifactId>
-      <exclusions>
-        <!-- incubator packages aren't included in the opentelemetry BOM, and we don't use them -->
+        <!-- gax depends on methods only available in 2.6+, and this uses 2.5 -->
         <exclusion>
-          <groupId>io.opentelemetry.instrumentation</groupId>
-          <artifactId>opentelemetry-instrumentation-api-incubator</artifactId>
+          <groupId>org.conscrypt</groupId>
+          <artifactId>conscrypt-openjdk-uber</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
+    <!-- gax depends on methods only available in 2.6+ -->
+    <dependency>
+      <groupId>org.conscrypt</groupId>
+      <artifactId>conscrypt-openjdk-uber</artifactId>
+      <version>2.6.0</version>
+    </dependency>
 
     <dependency>
       <groupId>com.google.code.findbugs</groupId>