From e92c3bb8aa4da7c720fd3154070ad89f024e0169 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Thu, 20 Aug 2026 17:06:35 -0400
Subject: [PATCH] Resolve conscrypt version conflict by moving libraries-bom
 before dropwizard-dependencies

---
 pom.xml         | 14 +++++++-------
 service/pom.xml | 18 ------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2669a9db..12fd2d83a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>libraries-bom</artifactId>
+        <version>${google-cloud-libraries.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>io.dropwizard</groupId>
         <artifactId>dropwizard-dependencies</artifactId>
@@ -150,13 +157,6 @@
         <scope>import</scope>
         <version>${protobuf.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>libraries-bom</artifactId>
-        <version>${google-cloud-libraries.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>io.github.resilience4j</groupId>
         <artifactId>resilience4j-bom</artifactId>
diff --git a/service/pom.xml b/service/pom.xml
index cba903e1b..bb728e8ac 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -296,13 +296,6 @@
     <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>
@@ -315,19 +308,8 @@
           <groupId>org.codehaus.woodstox</groupId>
           <artifactId>stax2-api</artifactId>
         </exclusion>
-        <!-- 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>
-    <!-- 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>