jetty 11

NationalSecurityAgency · Dec 21, 2023 · 924d8f4 · 924d8f4
1 parent be125a0
commit 924d8f4
Show file tree

Hide file tree

Showing 65 changed files with 287 additions and 280 deletions.
diff --git a/pom.xml b/pom.xml
@@ -63,14 +63,13 @@
     <dep.jackson.version>2.13.4</dep.jackson.version>
     <dep.jakarta.activation-api.version>1.2.2</dep.jakarta.activation-api.version>
     <dep.jakarta.servlet-api.version>4.0.3</dep.jakarta.servlet-api.version>
-    <dep.jakarta.xml.bind-api.version>2.3.3</dep.jakarta.xml.bind-api.version>
-    <dep.javax.annotation-api.version>1.3.2</dep.javax.annotation-api.version>
-    <dep.jaxb.runtime.version>2.3.8</dep.jaxb.runtime.version>
+    <dep.jakarta.xml.bind-api.version>3.0.1</dep.jakarta.xml.bind-api.version>
+    <dep.jaxb.runtime.version>3.0.1</dep.jaxb.runtime.version>
     <dep.jdom2.version>2.0.6.1</dep.jdom2.version>
-    <dep.jersey.version>2.40</dep.jersey.version>
-    <dep.jetty.version>10.0.15</dep.jetty.version>
+    <dep.jersey.version>3.1.3</dep.jersey.version>
+    <dep.jetty.version>11.0.16</dep.jetty.version>
     <dep.junit-jupiter.version>5.8.2</dep.junit-jupiter.version>
-    <dep.logback.version>1.3.12</dep.logback.version>
+    <dep.logback.version>1.4.11</dep.logback.version>
     <!-- seems to have an impact with java 11 integration, update with caution -->
     <dep.maven-surefire-plugin.version>3.1.0</dep.maven-surefire-plugin.version>
     <dep.mockito.version>5.4.0</dep.mockito.version>
@@ -199,11 +198,6 @@
         <artifactId>jakarta.xml.bind-api</artifactId>
         <version>${dep.jakarta.xml.bind-api.version}</version>
       </dependency>
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>${dep.javax.annotation-api.version}</version>
-      </dependency>
       <dependency>
         <groupId>net.spy</groupId>
         <artifactId>spymemcached</artifactId>
@@ -308,6 +302,12 @@
         <artifactId>junit-jupiter</artifactId>
         <version>${dep.junit-jupiter.version}</version>
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
@@ -923,6 +923,25 @@
           <artifactId>duplicate-finder-maven-plugin</artifactId>
           <version>1.5.1</version>
           <configuration>
+            <exceptions>
+              <exception>
+                <conflictingDependencies>
+                  <dependency>
+                    <groupId>org.glassfish.jersey.containers</groupId>
+                    <artifactId>jersey-container-jetty-http</artifactId>
+                    <version>${dep.jersey.version}</version>
+                  </dependency>
+                  <dependency>
+                    <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+                    <artifactId>jersey-test-framework-provider-jetty</artifactId>
+                    <version>${dep.jersey.version}</version>
+                  </dependency>
+                </conflictingDependencies>
+                <resources>
+                  <resource>org/glassfish/jersey/jetty/internal/localization.properties</resource>
+                </resources>
+              </exception>
+            </exceptions>
             <printEqualFiles>false</printEqualFiles>
             <failBuildInCaseOfDifferentContentConflict>true</failBuildInCaseOfDifferentContentConflict>
             <failBuildInCaseOfEqualContentConflict>false</failBuildInCaseOfEqualContentConflict>

diff --git a/src/main/java/emissary/client/EmissaryClient.java b/src/main/java/emissary/client/EmissaryClient.java
@@ -5,6 +5,7 @@
 import emissary.config.Configurator;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.hc.client5.http.auth.AuthCache;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
@@ -36,7 +37,6 @@
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
-import javax.ws.rs.core.MediaType;
 
 /**
  * Base class of all the actions that use HttpClient.

diff --git a/src/main/java/emissary/client/EmissaryResponse.java b/src/main/java/emissary/client/EmissaryResponse.java
@@ -3,6 +3,7 @@
 import emissary.client.response.BaseEntity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.io.IOUtils;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.Header;
@@ -17,7 +18,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import javax.ws.rs.core.MediaType;
 
 public class EmissaryResponse {
 

diff --git a/src/main/java/emissary/client/response/Agent.java b/src/main/java/emissary/client/response/Agent.java
@@ -1,12 +1,12 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class Agent implements Comparable<Agent>, Serializable {

diff --git a/src/main/java/emissary/client/response/AgentList.java b/src/main/java/emissary/client/response/AgentList.java
@@ -1,15 +1,15 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class AgentList implements Serializable {

diff --git a/src/main/java/emissary/client/response/AgentsResponseEntity.java b/src/main/java/emissary/client/response/AgentsResponseEntity.java
@@ -1,15 +1,16 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "agents")
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/src/main/java/emissary/client/response/BaseResponseEntity.java b/src/main/java/emissary/client/response/BaseResponseEntity.java
@@ -1,14 +1,15 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessOrder;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorOrder;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.xml.bind.annotation.XmlAccessOrder;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorOrder;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)

diff --git a/src/main/java/emissary/client/response/Config.java b/src/main/java/emissary/client/response/Config.java
@@ -2,11 +2,12 @@
 
 import emissary.config.ConfigEntry;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+
 import java.io.Serializable;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class Config implements Serializable {

diff --git a/src/main/java/emissary/client/response/ConfigList.java b/src/main/java/emissary/client/response/ConfigList.java
@@ -1,15 +1,15 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class ConfigList implements Serializable {

diff --git a/src/main/java/emissary/client/response/ConfigsResponseEntity.java b/src/main/java/emissary/client/response/ConfigsResponseEntity.java
@@ -1,13 +1,12 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 @XmlRootElement(name = "configs")
 @XmlAccessorType(XmlAccessType.NONE)
 public class ConfigsResponseEntity extends BaseResponseEntity {

diff --git a/src/main/java/emissary/client/response/Directory.java b/src/main/java/emissary/client/response/Directory.java
@@ -2,13 +2,13 @@
 
 import emissary.directory.DirectoryEntry;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class Directory implements Comparable<Directory>, Serializable {

diff --git a/src/main/java/emissary/client/response/DirectoryList.java b/src/main/java/emissary/client/response/DirectoryList.java
@@ -1,15 +1,15 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class DirectoryList implements Serializable {

diff --git a/src/main/java/emissary/client/response/DirectoryResponseEntity.java b/src/main/java/emissary/client/response/DirectoryResponseEntity.java
@@ -1,13 +1,12 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 @XmlRootElement(name = "directories")
 @XmlAccessorType(XmlAccessType.NONE)
 public class DirectoryResponseEntity extends BaseResponseEntity {

diff --git a/src/main/java/emissary/client/response/MapResponseEntity.java b/src/main/java/emissary/client/response/MapResponseEntity.java
@@ -1,14 +1,14 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 import java.util.TreeMap;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "mapResponseEntity")
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/src/main/java/emissary/client/response/PeerList.java b/src/main/java/emissary/client/response/PeerList.java
@@ -1,13 +1,13 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class PeerList implements Serializable {

diff --git a/src/main/java/emissary/client/response/PeersResponseEntity.java b/src/main/java/emissary/client/response/PeersResponseEntity.java
@@ -1,14 +1,14 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashSet;
 import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "peers")
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/src/main/java/emissary/client/response/PlaceList.java b/src/main/java/emissary/client/response/PlaceList.java
@@ -1,15 +1,15 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class PlaceList implements Serializable {

diff --git a/src/main/java/emissary/client/response/PlacesResponseEntity.java b/src/main/java/emissary/client/response/PlacesResponseEntity.java
@@ -1,15 +1,15 @@
 package emissary.client.response;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashSet;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "places")
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/src/main/java/emissary/server/InitializeContext.java b/src/main/java/emissary/server/InitializeContext.java
@@ -3,12 +3,11 @@
 import emissary.core.EmissaryException;
 import emissary.directory.EmissaryNode;
 
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
 /**
  * Initialize the application from inside the webapp context This initializer performs the following actions
  * <ol>