From f56d2198821910f1aa2e3fb51eb30803e1304896 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie+github@signal.org>
Date: Mon, 10 Jun 2019 21:43:52 -0700
Subject: [PATCH] Update dropwizard to 1.3.12

---
 pom.xml                     | 24 ++++++++++++++++++++++--
 service/pom.xml             | 16 +++++-----------
 websocket-resources/pom.xml |  2 +-
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0aa116596..b939ed933 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
     </modules>
 
     <properties>
-        <dropwizard.version>1.3.9</dropwizard.version>
-        <jackson.api.version>2.9.8</jackson.api.version>
+        <dropwizard.version>1.3.12</dropwizard.version>
+        <jackson.api.version>2.9.9</jackson.api.version>
         <resilience4j.version>0.14.1</resilience4j.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -92,10 +92,30 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-server</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlets</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-servlet</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-webapp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/service/pom.xml b/service/pom.xml
index b151cc985..82843ba0e 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -160,22 +160,16 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>4.4.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpcore</artifactId>
-                <version>4.4.1</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
                 <version>${jackson.api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-cbor</artifactId>
+                <version>${jackson.api.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/websocket-resources/pom.xml b/websocket-resources/pom.xml
index db047fd3c..dbb773b02 100644
--- a/websocket-resources/pom.xml
+++ b/websocket-resources/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-server</artifactId>
-            <version>9.4.14.v20181114</version>
+            <version>9.4.18.v20190429</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>