From 95e83c52fa5d6391f9deb2b24cf8581680a6d266 Mon Sep 17 00:00:00 2001
From: Ravi Khadiwala <ravi@signal.org>
Date: Wed, 28 Feb 2024 15:58:55 -0600
Subject: [PATCH] Revert "Update to Dropwizard 3.0.6"

This reverts commit 2ad5d332517725d208df64cc240638470179aeda.
---
 pom.xml         |  6 +++---
 service/pom.xml | 21 ---------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index f6345ef20..6be7c1580 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,10 +41,10 @@
     <braintree.version>3.27.0</braintree.version>
     <commons-csv.version>1.10.0</commons-csv.version>
     <commons-io.version>2.14.0</commons-io.version>
-    <dropwizard.version>3.0.6</dropwizard.version>
+    <dropwizard.version>3.0.4</dropwizard.version>
     <dropwizard-metrics-datadog.version>1.1.13</dropwizard-metrics-datadog.version>
-    <google-cloud-libraries.version>26.33.0</google-cloud-libraries.version>
-    <grpc.version>1.61.1</grpc.version> <!-- should be kept in sync with the value from Google libraries-bom -->
+    <google-cloud-libraries.version>26.25.0</google-cloud-libraries.version>
+    <grpc.version>1.58.0</grpc.version> <!-- should be kept in sync with the value from Google libraries-bom -->
     <gson.version>2.10.1</gson.version>
     <!-- several libraries (AWS, Google Cloud) use Apache http components transitively, and we need to align them -->
     <httpcore.version>4.4.16</httpcore.version>
diff --git a/service/pom.xml b/service/pom.xml
index 620f79900..4a3bca6ad 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -218,13 +218,6 @@
       <groupId>com.google.firebase</groupId>
       <artifactId>firebase-admin</artifactId>
       <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>
@@ -248,13 +241,6 @@
     <dependency>
       <groupId>io.grpc</groupId>
       <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>
       <groupId>io.grpc</groupId>
@@ -469,13 +455,6 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <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>