Dependabot/maven/jetty.version 11.0.16

.github/workflows/build-and-deploy-troxy.yml

@@ -12,10 +12,10 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'adopt'
         cache: maven
 

.travis.yml

@@ -0,0 +1,21 @@
+os: linux
+language: java
+jdk:
+- openjdk11
+jobs:
+  include:
+    install: ./mvnw -q de.qaware.maven:go-offline-maven-plugin:resolve-dependencies -Prelease
+    script:
+      - bash ./build.sh || travis_terminate 1;
+    before_deploy: 'openssl aes-256-cbc
+      -K $encrypted_7bb25f4185a5_key
+      -iv $encrypted_7bb25f4185a5_iv
+      -in keys.gpg.enc -out keys.gpg -d &&
+      gpg --import ./keys.gpg'
+    deploy:
+      skip_cleanup: true
+      provider: script
+      script: bash ./deploy.sh
+      on:
+        repo: SpareBank1/Troxy
+        branch: master

Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk8:jdk8u292-b10
+FROM adoptopenjdk/openjdk11:latest
 MAINTAINER Stian Conradsen "[email protected]"
 
 RUN mkdir -p /opt/troxy/bin \

build.sh

@@ -7,5 +7,6 @@ dockerBuild() {
 }
 
 
-mvn clean install
-dockerBuild
+mvn -B clean install
+#dockerBuild
+

deploy.sh

@@ -37,6 +37,6 @@ mvnDeploy() {
 
 mvnDeploy || die 'Maven deploy failure'
 
-hasDockerCreds || die 'Missing docker credentials'
-dockerLogin || die 'Docker login failure'
-dockerPush || die 'Docker push failure'
+#hasDockerCreds || die 'Missing docker credentials'
+#dockerLogin || die 'Docker login failure'
+#dockerPush || die 'Docker push failure'

pom.xml

@@ -64,13 +64,15 @@
 
     <!-- Project -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>1.8</java.version>
+    <java.version>17</java.version>
     <!-- Dependency versions -->
-    <jersey.version>2.35</jersey.version>
-    <jetty.version>9.4.44.v20210927</jetty.version>
-    <servlet.version>3.1.0</servlet.version>
+    <jersey.version>3.1.3</jersey.version>
+    <jetty.version>11.0.16</jetty.version>
+    <log4j.version>3.1.0</log4j.version>
+    <servlet.version>5.0.0</servlet.version>
     <slf4j.version>1.7.32</slf4j.version>
     <junit-jupiter.version>5.8.2</junit-jupiter.version>
+    <jakarta.xml.bind-api.version>3.0.0</jakarta.xml.bind-api.version>
   </properties>
 
   <modules>
@@ -83,10 +85,15 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
         <version>${servlet.version}</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>${jakarta.xml.bind-api.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
@@ -181,10 +188,23 @@
             </nonFilteredFileExtensions>
           </configuration>
         </plugin>
+
       </plugins>
     </pluginManagement>
 
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
@@ -198,10 +218,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
           <encoding>${project.build.sourceEncoding}</encoding>
         </configuration>
       </plugin>

troxy-core/pom.xml

@@ -12,8 +12,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

troxy-core/src/main/java/no/sb1/troxy/http/common/Request.java

@@ -7,8 +7,8 @@
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

troxy-core/src/main/java/no/sb1/troxy/http/common/Response.java

@@ -6,7 +6,7 @@
 import java.net.HttpURLConnection;
 import java.util.List;
 import java.util.Map;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

troxy-core/src/main/java/no/sb1/troxy/record/v2/Recording.java

@@ -9,7 +9,7 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

troxy-core/src/main/java/no/sb1/troxy/record/v3/Recording.java

@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
 
 /**
  * This is a container class for a recording.

troxy-core/src/main/java/no/sb1/troxy/util/RequestInterceptor.java

@@ -4,9 +4,9 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 

troxy-core/src/main/java/no/sb1/troxy/util/SimulatorHandler.java

@@ -16,9 +16,9 @@
 import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.*;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.*;

troxy-server/src/main/java/no/sb1/troxy/rest/ApiHandler.java

@@ -11,11 +11,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.io.*;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;