MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reapply "Update to Dropwizard 3.0.6" 

This reverts commit 95e83c52fa.
This commit is contained in:
Chris Eager 2024-02-28 16:02:29 -06:00 committed by Chris Eager
parent 40eb82adbe
commit 1f1de353de
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -41,10 +41,10 @@
<braintree.version>3.27.0</braintree.version> <braintree.version>3.27.0</braintree.version>
<commons-csv.version>1.10.0</commons-csv.version> <commons-csv.version>1.10.0</commons-csv.version>
<commons-io.version>2.14.0</commons-io.version> <commons-io.version>2.14.0</commons-io.version>
<dropwizard.version>3.0.4</dropwizard.version> <dropwizard.version>3.0.6</dropwizard.version>
<dropwizard-metrics-datadog.version>1.1.13</dropwizard-metrics-datadog.version> <dropwizard-metrics-datadog.version>1.1.13</dropwizard-metrics-datadog.version>
<google-cloud-libraries.version>26.25.0</google-cloud-libraries.version> <google-cloud-libraries.version>26.33.0</google-cloud-libraries.version>
<grpc.version>1.58.0</grpc.version> <!-- should be kept in sync with the value from Google libraries-bom --> <grpc.version>1.61.1</grpc.version> <!-- should be kept in sync with the value from Google libraries-bom -->
<gson.version>2.10.1</gson.version> <gson.version>2.10.1</gson.version>
<!-- several libraries (AWS, Google Cloud) use Apache http components transitively, and we need to align them --> <!-- several libraries (AWS, Google Cloud) use Apache http components transitively, and we need to align them -->
<httpcore.version>4.4.16</httpcore.version> <httpcore.version>4.4.16</httpcore.version>

21
service/pom.xml
View File

@ -218,6 +218,13 @@
<groupId>com.google.firebase</groupId> <groupId>com.google.firebase</groupId>
<artifactId>firebase-admin</artifactId> <artifactId>firebase-admin</artifactId>
<version>${firebase-admin.version}</version> <version>${firebase-admin.version}</version>
<exclusions>
<exclusion>
<!-- fix dependency convergence from older 1.0.1 -->
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -241,6 +248,13 @@
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId> <artifactId>grpc-netty</artifactId>
<exclusions>
<!-- fix dependency convergence from older 0.26.0 -->
<exclusion>
<groupId>io.perfmark</groupId>
<artifactId>perfmark-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
@ -455,6 +469,13 @@
<dependency> <dependency>
<groupId>com.google.cloud</groupId> <groupId>com.google.cloud</groupId>
<artifactId>google-cloud-recaptchaenterprise</artifactId> <artifactId>google-cloud-recaptchaenterprise</artifactId>
<exclusions>
<!-- fix dependency convergence from older 1.0.1 -->
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>