Add conscrypt dependency to resolve gax conflict

This commit is contained in:
Chris Eager
2026-08-20 15:48:08 -04:00
committed by Chris Eager
parent f31fb14667
commit 5b18ecafaa
+16 -10
View File
@@ -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>