Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-08-21 08:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conscrypt version conflict by moving libraries-bom before dropwizard-dependencies

Browse Source
This commit is contained in:
Chris Eager
2026-08-20 17:38:49 -04:00
committed by Chris Eager
parent 2bcecc7f7d
commit e92c3bb8aa
2 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+7 -7
View File
@@ -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>
service/pom.xml
-18
View File
@@ -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>