From cbb8e94a81b560aff5b729d7daf7881cfebd8914 Mon Sep 17 00:00:00 2001
From: whowes <whowes@google.com>
Date: Wed, 29 Jul 2026 17:10:35 +0000
Subject: [PATCH] deps: move conscrypt from third-party-dependencies POM to
 gax-java POM

---
 sdk-platform-java/gapic-generator-java-bom/pom.xml           | 5 +++++
 sdk-platform-java/gax-java/gax-httpjson/pom.xml              | 1 -
 sdk-platform-java/gax-java/pom.xml                           | 5 +++++
 .../third-party-dependencies/pom.xml                         | 5 -----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sdk-platform-java/gapic-generator-java-bom/pom.xml b/sdk-platform-java/gapic-generator-java-bom/pom.xml
index 0cda54788cc1..3811d5d96aca 100644
--- a/sdk-platform-java/gapic-generator-java-bom/pom.xml
+++ b/sdk-platform-java/gapic-generator-java-bom/pom.xml
@@ -164,6 +164,11 @@
         <artifactId>grpc-google-iam-v3beta</artifactId>
         <version>1.69.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v3beta:current} -->
       </dependency>
+      <dependency>
+        <groupId>org.conscrypt</groupId>
+        <artifactId>conscrypt-openjdk-uber</artifactId>
+        <version>${conscrypt.version}</version>
+      </dependency>
     </dependencies>
 
   </dependencyManagement>
diff --git a/sdk-platform-java/gax-java/gax-httpjson/pom.xml b/sdk-platform-java/gax-java/gax-httpjson/pom.xml
index 792bee7621d4..64274469c90c 100644
--- a/sdk-platform-java/gax-java/gax-httpjson/pom.xml
+++ b/sdk-platform-java/gax-java/gax-httpjson/pom.xml
@@ -111,7 +111,6 @@
     <dependency>
       <groupId>org.conscrypt</groupId>
       <artifactId>conscrypt-openjdk-uber</artifactId>
-      <version>${conscrypt.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/sdk-platform-java/gax-java/pom.xml b/sdk-platform-java/gax-java/pom.xml
index 7bbfa58bf95b..165eeffbcadd 100644
--- a/sdk-platform-java/gax-java/pom.xml
+++ b/sdk-platform-java/gax-java/pom.xml
@@ -93,6 +93,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.conscrypt</groupId>
+        <artifactId>conscrypt-openjdk-uber</artifactId>
+        <version>${conscrypt.version}</version>
+      </dependency>
       <dependency>
         <groupId>io.opencensus</groupId>
         <artifactId>opencensus-api</artifactId>
diff --git a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml
index d35ef692bda9..266cbfb8c8e9 100644
--- a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -273,11 +273,6 @@
         <artifactId>jspecify</artifactId>
         <version>${jspecify.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.conscrypt</groupId>
-        <artifactId>conscrypt-openjdk-uber</artifactId>
-        <version>${conscrypt.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>