From ba73f757e23391df549b9e3740074fdc4a16831e Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Thu, 12 Jan 2023 18:15:28 -0600
Subject: [PATCH] Update google libraries-bom to 26.1.3, firebase-admin to
 9.1.1

---
 pom.xml         |  5 +++--
 service/pom.xml | 29 +----------------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5029fee23..3170fd286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,8 @@
     <commons-io.version>2.9.0</commons-io.version>
     <dropwizard.version>2.0.34</dropwizard.version>
     <dropwizard-metrics-datadog.version>1.1.13</dropwizard-metrics-datadog.version>
-    <grpc.version>1.49.2</grpc.version>
+    <google-cloud-libraries.version>26.1.3</google-cloud-libraries.version>
+    <grpc.version>1.51.1</grpc.version> <!-- this should be kept in sync with the value from Google’s libraries-bom -->
     <gson.version>2.9.0</gson.version>
     <guava.version>30.1.1-jre</guava.version>
     <jackson.version>2.13.4</jackson.version>
@@ -134,7 +135,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>libraries-bom</artifactId>
-        <version>26.1.0</version>
+        <version>${google-cloud-libraries.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/service/pom.xml b/service/pom.xml
index b6f46e82d..d7b2c8047 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -185,34 +185,7 @@
     <dependency>
       <groupId>com.google.firebase</groupId>
       <artifactId>firebase-admin</artifactId>
-      <version>9.0.0</version>
-
-      <!-- firebase-admin has conflicting versions of these artifacts in its dependency tree; for firebase-admin
-      9.0.0, we'll need to depend directly on com.google.api-client:google-api-client:1.35.1 and
-      com.google.oauth-client:google-oauth-client:1.34.1 -->
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.api-client</groupId>
-          <artifactId>google-api-client</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>com.google.oauth-client</groupId>
-          <artifactId>google-oauth-client</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.api-client</groupId>
-      <artifactId>google-api-client</artifactId>
-      <version>1.35.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.oauth-client</groupId>
-      <artifactId>google-oauth-client</artifactId>
-      <version>1.34.1</version>
+      <version>9.1.1</version>
     </dependency>
 
     <dependency>