From 1bebd5488ab15efd0c3b621a2ac5e3db1df1650e Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie+github@signal.org>
Date: Thu, 4 Apr 2019 14:54:05 -0700
Subject: [PATCH] Update to JDK 11

---
 pom.xml                                       | 32 +++++-----
 .../textsecuregcm/entities/RelayMessage.java  | 64 -------------------
 2 files changed, 15 insertions(+), 81 deletions(-)
 delete mode 100644 src/main/java/org/whispersystems/textsecuregcm/entities/RelayMessage.java

diff --git a/pom.xml b/pom.xml
index 36313ef10..a62f70ccf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.7.22</version>
+            <version>2.25.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -181,6 +181,17 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
     </dependencies>
 
     <dependencyManagement>
@@ -211,27 +222,14 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.1.1</version>
                 <configuration>
                     <archive>
                         <manifest>
diff --git a/src/main/java/org/whispersystems/textsecuregcm/entities/RelayMessage.java b/src/main/java/org/whispersystems/textsecuregcm/entities/RelayMessage.java
deleted file mode 100644
index 6faf25736..000000000
--- a/src/main/java/org/whispersystems/textsecuregcm/entities/RelayMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (C) 2013 Open WhisperSystems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.whispersystems.textsecuregcm.entities;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.hibernate.validator.constraints.NotEmpty;
-import org.whispersystems.textsecuregcm.util.ByteArrayAdapter;
-
-import javax.validation.constraints.NotNull;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-public class RelayMessage {
-
-  @JsonProperty
-  @NotEmpty
-  private String destination;
-
-  @JsonProperty
-  @NotEmpty
-  private long destinationDeviceId;
-
-  @JsonProperty
-  @NotNull
-  @JsonSerialize(using = ByteArrayAdapter.Serializing.class)
-  @JsonDeserialize(using = ByteArrayAdapter.Deserializing.class)
-  private byte[] outgoingMessageSignal;
-
-  public RelayMessage() {}
-
-  public RelayMessage(String destination, long destinationDeviceId, byte[] outgoingMessageSignal) {
-    this.destination           = destination;
-    this.destinationDeviceId   = destinationDeviceId;
-    this.outgoingMessageSignal = outgoingMessageSignal;
-  }
-
-  public String getDestination() {
-    return destination;
-  }
-
-  public long getDestinationDeviceId() {
-    return destinationDeviceId;
-  }
-
-  public byte[] getOutgoingMessageSignal() {
-    return outgoingMessageSignal;
-  }
-}