From 780ad900c8743227a26f511fff856b23023f7892 Mon Sep 17 00:00:00 2001
From: Norbert Becker <becker@roamsys-next.com>
Date: Wed, 9 Apr 2025 16:54:28 +0200
Subject: [PATCH] MISC-717: Upgrade of 3rd party versions and Java 17

---
 pom.xml                                        | 18 +++++++++---------
 .../SwaggerAPIAuthorizationHandler.java        |  6 +++---
 .../com/roamsys/swagger/SwaggerAPIConfig.java  |  2 +-
 .../SwaggerAPICustomRequestHandler.java        |  6 +++---
 .../SwaggerAPIDefaultAuthorizationHandler.java |  6 +++---
 .../roamsys/swagger/SwaggerAPIListener.java    |  6 +++---
 .../com/roamsys/swagger/SwaggerAPIServlet.java |  8 ++++----
 .../swagger/data/SwaggerAPIContext.java        |  6 +++---
 .../swagger/data/SwaggerExceptionHandler.java  |  2 +-
 9 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index b4c8204..8e7e605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.roamsys.opensource</groupId>
     <artifactId>swaggerapi</artifactId>
     <packaging>jar</packaging>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
     <organization>
         <name>ROAMSYS S.A.</name>
         <url>http://www.roamsys.com</url>
@@ -16,25 +16,25 @@
     <description>Swagger API support for server with REST APIs written in Java</description>
     <dependencies>
         <dependency>
-            <groupId>javaee</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>5</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.17.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.14.0</version>
+            <version>2.18.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>2.12.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -51,9 +51,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.14.0</version>
                 <configuration>
-                    <release>11</release>
+                    <release>17</release>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/com/roamsys/swagger/SwaggerAPIAuthorizationHandler.java b/src/main/java/com/roamsys/swagger/SwaggerAPIAuthorizationHandler.java
index f2071de..773fcd6 100644
--- a/src/main/java/com/roamsys/swagger/SwaggerAPIAuthorizationHandler.java
+++ b/src/main/java/com/roamsys/swagger/SwaggerAPIAuthorizationHandler.java
@@ -1,9 +1,9 @@
 package com.roamsys.swagger;
 
 import java.io.IOException;
-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;
 
 /**
  * Interface for authentication handler.
diff --git a/src/main/java/com/roamsys/swagger/SwaggerAPIConfig.java b/src/main/java/com/roamsys/swagger/SwaggerAPIConfig.java
index 4f3ef24..7045e6a 100644
--- a/src/main/java/com/roamsys/swagger/SwaggerAPIConfig.java
+++ b/src/main/java/com/roamsys/swagger/SwaggerAPIConfig.java
@@ -17,7 +17,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 /**
  * The swagger configuration.
diff --git a/src/main/java/com/roamsys/swagger/SwaggerAPICustomRequestHandler.java b/src/main/java/com/roamsys/swagger/SwaggerAPICustomRequestHandler.java
index 054a1a3..a69fd7e 100644
--- a/src/main/java/com/roamsys/swagger/SwaggerAPICustomRequestHandler.java
+++ b/src/main/java/com/roamsys/swagger/SwaggerAPICustomRequestHandler.java
@@ -1,9 +1,9 @@
 package com.roamsys.swagger;
 
 import java.io.IOException;
-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;
 
 /**
  * Interface for pre- and post-request handlers
diff --git a/src/main/java/com/roamsys/swagger/SwaggerAPIDefaultAuthorizationHandler.java b/src/main/java/com/roamsys/swagger/SwaggerAPIDefaultAuthorizationHandler.java
index 132020f..c2d9012 100644
--- a/src/main/java/com/roamsys/swagger/SwaggerAPIDefaultAuthorizationHandler.java
+++ b/src/main/java/com/roamsys/swagger/SwaggerAPIDefaultAuthorizationHandler.java
@@ -1,9 +1,9 @@
 package com.roamsys.swagger;
 
 import java.io.IOException;
-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;
 
 /**
  * Check for a valid API key
diff --git a/src/main/java/com/roamsys/swagger/SwaggerAPIListener.java b/src/main/java/com/roamsys/swagger/SwaggerAPIListener.java
index de8378c..b5e7ef3 100644
--- a/src/main/java/com/roamsys/swagger/SwaggerAPIListener.java
+++ b/src/main/java/com/roamsys/swagger/SwaggerAPIListener.java
@@ -1,8 +1,8 @@
 package com.roamsys.swagger;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 /**
  * The swagger API listener to be executed on startup
diff --git a/src/main/java/com/roamsys/swagger/SwaggerAPIServlet.java b/src/main/java/com/roamsys/swagger/SwaggerAPIServlet.java
index f7e2097..30b5e0f 100644
--- a/src/main/java/com/roamsys/swagger/SwaggerAPIServlet.java
+++ b/src/main/java/com/roamsys/swagger/SwaggerAPIServlet.java
@@ -14,10 +14,10 @@
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.regex.Matcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 
 /**
diff --git a/src/main/java/com/roamsys/swagger/data/SwaggerAPIContext.java b/src/main/java/com/roamsys/swagger/data/SwaggerAPIContext.java
index ae27a81..84cbc56 100644
--- a/src/main/java/com/roamsys/swagger/data/SwaggerAPIContext.java
+++ b/src/main/java/com/roamsys/swagger/data/SwaggerAPIContext.java
@@ -1,8 +1,8 @@
 package com.roamsys.swagger.data;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Context for an swagger API call.
diff --git a/src/main/java/com/roamsys/swagger/data/SwaggerExceptionHandler.java b/src/main/java/com/roamsys/swagger/data/SwaggerExceptionHandler.java
index d8de689..a5e2798 100644
--- a/src/main/java/com/roamsys/swagger/data/SwaggerExceptionHandler.java
+++ b/src/main/java/com/roamsys/swagger/data/SwaggerExceptionHandler.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Handle exceptions thrown while invoking the Swagger API method.