From 19930ec2e4c15d1a99421c3d4a535b73e739051a Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Mon, 23 Oct 2023 09:37:25 -0500
Subject: [PATCH] Update dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- AWS: 2.20.130 → 2.21.5
- Braintree: 3.25.0 → 3.27.0
- commons-csv: 2.13.0 → 2.14.0
- dropwizard: 2.1.7 → 2.1.9
- Google libraries BOM: 26.22.0 → 26.25.0
- grpc: 1.56.1 → 1.58.0
- kotlin: 1.9.0 → 1.9.10
- protobuf: 3.23.2 → 3.24.3
- stripe: 23.1.1 → 23.10.0
- junit-pioneer: 2.0.1 → 2.1.0
- firebase-admin: 9.1.1 → 9.2.0
- swagger-jaxrs2: 2.2.8 → 2.2.17
- java-uuid-generator: 4.2.0 → 4.3.0
- log4j: 2.17.0 → 2.21.0
- reactor-bom: 2022.0.10 → 2022.0.12
---
 api-doc/pom.xml |  2 +-
 pom.xml         | 30 +++++++++++++++++-------------
 service/pom.xml | 16 +++++++++++-----
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/api-doc/pom.xml b/api-doc/pom.xml
index cc108804a..c112c1e08 100644
--- a/api-doc/pom.xml
+++ b/api-doc/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-maven-plugin</artifactId>
-        <version>2.2.8</version>
+        <version>${swagger.version}</version>
         <configuration>
           <outputFileName>signal-server-openapi</outputFileName>
           <outputPath>${project.build.directory}/openapi</outputPath>
diff --git a/pom.xml b/pom.xml
index 9368ff7ba..89b5eb839 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,33 +38,37 @@
   </modules>
 
   <properties>
-    <aws.sdk2.version>2.20.130</aws.sdk2.version>
-    <braintree.version>3.25.0</braintree.version>
-    <commons-csv.version>1.9.0</commons-csv.version>
-    <commons-io.version>2.13.0</commons-io.version>
-    <dropwizard.version>2.1.7</dropwizard.version>
+    <aws.sdk2.version>2.21.5</aws.sdk2.version>
+    <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>2.1.9</dropwizard.version>
     <dropwizard-metrics-datadog.version>1.1.13</dropwizard-metrics-datadog.version>
-    <google-cloud-libraries.version>26.22.0</google-cloud-libraries.version>
-    <grpc.version>1.56.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>
     <jackson.version>2.13.5</jackson.version>
     <jaxb.version>2.3.1</jaxb.version>
-    <kotlin.version>1.9.0</kotlin.version>
+    <junit-pioneer.version>2.1.0</junit-pioneer.version>
+    <kotlin.version>1.9.10</kotlin.version>
     <kotlinx-serialization.version>1.5.1</kotlinx-serialization.version>
     <lettuce.version>6.2.6.RELEASE</lettuce.version>
     <libphonenumber.version>8.13.19</libphonenumber.version>
     <logstash.logback.version>7.3</logstash.logback.version>
+    <log4j-bom.version>2.21.0</log4j-bom.version>
     <luajava.version>3.4.0</luajava.version>
     <micrometer.version>1.10.10</micrometer.version>
     <netty.version>4.1.96.Final</netty.version>
     <opentest4j.version>1.3.0</opentest4j.version>
-    <protobuf.version>3.23.2</protobuf.version> <!-- should be kept in sync with the value from Google libraries-bom -->
+    <protobuf.version>3.24.3</protobuf.version> <!-- should be kept in sync with the value from Google libraries-bom -->
     <pushy.version>0.15.2</pushy.version>
     <reactive.grpc.version>1.2.4</reactive.grpc.version>
+    <reactor-bom.version>2022.0.12</reactor-bom.version> <!-- 3.5.x, see https://github.com/reactor/reactor#bom-versioning-scheme -->
     <resilience4j.version>1.7.0</resilience4j.version>
     <semver4j.version>3.1.0</semver4j.version>
     <slf4j.version>1.7.36</slf4j.version>
-    <stripe.version>23.1.1</stripe.version>
+    <stripe.version>23.10.0</stripe.version>
+    <swagger.version>2.2.17</swagger.version>
     <vavr.version>0.10.4</vavr.version>
 
     <!-- 17.0.8_7-jre-jammy -->
@@ -143,7 +147,7 @@
       <dependency>
         <groupId>io.projectreactor</groupId>
         <artifactId>reactor-bom</artifactId>
-        <version>2022.0.10</version> <!-- 3.5.x, see https://github.com/reactor/reactor#bom-versioning-scheme -->
+        <version>${reactor-bom.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -277,7 +281,7 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-bom</artifactId>
-        <version>2.17.1</version>
+        <version>${log4j-bom.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -325,7 +329,7 @@
     <dependency>
       <groupId>org.junit-pioneer</groupId>
       <artifactId>junit-pioneer</artifactId>
-      <version>2.0.1</version>
+      <version>${junit-pioneer.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/service/pom.xml b/service/pom.xml
index 5cdc6f547..611d01fe5 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -10,11 +10,17 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>service</artifactId>
 
+  <properties>
+    <firebase-admin.version>9.2.0</firebase-admin.version>
+    <java-uuid-generator.version>4.3.0</java-uuid-generator.version>
+    <sqlite4java.version>1.0.392</sqlite4java.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-jaxrs2</artifactId>
-      <version>2.2.8</version>
+      <version>${swagger.version}</version>
       <exclusions>
         <!-- org.yaml:snakeyaml is causing a dependency convergence error -->
         <exclusion>
@@ -208,7 +214,7 @@
     <dependency>
       <groupId>com.google.firebase</groupId>
       <artifactId>firebase-admin</artifactId>
-      <version>9.1.1</version>
+      <version>${firebase-admin.version}</version>
     </dependency>
 
     <dependency>
@@ -392,7 +398,7 @@
     <dependency>
       <groupId>com.almworks.sqlite4java</groupId>
       <artifactId>sqlite4java</artifactId>
-      <version>1.0.392</version>
+      <version>${sqlite4java.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -429,7 +435,7 @@
     <dependency>
       <groupId>com.fasterxml.uuid</groupId>
       <artifactId>java-uuid-generator</artifactId>
-      <version>4.2.0</version>
+      <version>${java-uuid-generator.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -442,7 +448,7 @@
     <dependency>
       <groupId>io.github.ganadist.sqlite4java</groupId>
       <artifactId>libsqlite4java-osx-aarch64</artifactId>
-      <version>1.0.392</version>
+      <version>${sqlite4java.version}</version>
       <type>dylib</type>
       <scope>test</scope>
     </dependency>