update data-service to use servlet 6 jakartax namespace

build/checkstyle-import.xml

@@ -83,6 +83,7 @@
     <allow pkg="java.awt"/>
     <allow pkg="javax.security"/>
     <allow pkg="javax.servlet"/>
+    <allow pkg="jakarta.servlet"/>
     <allow pkg="javax.net"/>
     <allow pkg="javax.crypto"/>
     <allow pkg="jakarta.mail"/>
@@ -105,12 +106,14 @@
     <!--servlet -->
     <subpackage name="http.servlet">
         <allow pkg="javax.servlet"/>
+        <allow pkg="jakarta.servlet"/>
     </subpackage>
 
     <!-- web services -->
     <subpackage name="ws.server">
         <allow pkg="javax.ws"/>
         <allow pkg="javax.servlet"/>
+        <allow pkg="jakarta.servlet"/>
         <allow pkg="org.glassfish.jersey"/>
     </subpackage>
 

data-service/pom.xml

@@ -72,6 +72,27 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>io.leonard.maven.plugins</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+                <version>4.0.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <compiler>17</compiler>
+                            <trimSpaces>true</trimSpaces>
+                            <compilerVersion>${maven.compiler.source}</compilerVersion>
+                            <keepSources>false</keepSources>
+                            <threads>20</threads>
+                            <mergeFragment>false</mergeFragment>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.3.0</version>
@@ -112,7 +133,7 @@
                         <configuration>
                             <skip>${skipDocker}</skip>
                             <from>
-                                <image>tomcat:9.0-jdk17-temurin</image>
+                                <image>tomcat:10-jdk17</image>
                             </from>
                             <to>
                                 <image>pwm/pwm-data-service</image>
@@ -174,15 +195,15 @@
 
         <!-- container dependencies -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>4.0.1</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>javax.servlet.jsp-api</artifactId>
-            <version>2.3.3</version>
+            <groupId>jakarta.servlet.jsp</groupId>
+            <artifactId>jakarta.servlet.jsp-api</artifactId>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <!-- / container dependencies -->

data-service/src/main/java/password/pwm/receiver/ContextManager.java

@@ -20,10 +20,10 @@
 
 package password.pwm.receiver;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
 
 @WebListener
 public class ContextManager implements ServletContextListener

data-service/src/main/java/password/pwm/receiver/CsvDownloadServlet.java

@@ -20,7 +20,7 @@
 
 package password.pwm.receiver;
 
-import javax.servlet.annotation.WebServlet;
+import jakarta.servlet.annotation.WebServlet;
 
 @WebServlet(
         name = "CsvDownloadServlet",

data-service/src/main/java/password/pwm/receiver/PublishVersionServlet.java

@@ -23,10 +23,10 @@ package password.pwm.receiver;
 import password.pwm.bean.pub.PublishVersionBean;
 import password.pwm.ws.server.RestResultBean;
 
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Collections;
 

data-service/src/main/java/password/pwm/receiver/ReceiverUtil.java

@@ -20,11 +20,11 @@
 
 package password.pwm.receiver;
 
-import password.pwm.http.PwmHttpRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import password.pwm.PwmConstants;
 import password.pwm.ws.server.RestResultBean;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class ReceiverUtil
@@ -37,7 +37,7 @@ public class ReceiverUtil
     )
             throws IOException
     {
-        final boolean jsonPrettyPrint = PwmHttpRequestWrapper.isPrettyPrintJsonParameterTrue( request );
+        final boolean jsonPrettyPrint = isPrettyPrintJsonParameterTrue( request );
         response.setHeader( "Content", "application/json" );
         response.getWriter().print( restResultBean.toJson( jsonPrettyPrint ) );
     }
@@ -53,4 +53,9 @@ public class ReceiverUtil
             return 0;
         }
     }
+
+    public static boolean isPrettyPrintJsonParameterTrue( final HttpServletRequest request )
+    {
+        return Boolean.parseBoolean( request.getParameter( PwmConstants.PARAM_FORMAT_JSON_PRETTY ) );
+    }
 }

data-service/src/main/java/password/pwm/receiver/RequestLoggerFilter.java

@@ -24,14 +24,14 @@ import password.pwm.util.java.AtomicLoopLongIncrementer;
 import password.pwm.util.java.StringUtil;
 import password.pwm.util.java.TimeDuration;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.time.Instant;

data-service/src/main/java/password/pwm/receiver/TelemetryRestReceiver.java

@@ -20,20 +20,21 @@
 
 package password.pwm.receiver;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import password.pwm.PwmConstants;
 import password.pwm.bean.TelemetryPublishBean;
 import password.pwm.error.ErrorInformation;
 import password.pwm.error.PwmError;
 import password.pwm.error.PwmUnrecoverableException;
-import password.pwm.http.ServletUtility;
 import password.pwm.i18n.Message;
+import password.pwm.util.java.JavaHelper;
 import password.pwm.util.json.JsonFactory;
 import password.pwm.ws.server.RestResultBean;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @WebServlet(
@@ -57,7 +58,7 @@ public class TelemetryRestReceiver extends HttpServlet
             app.getStatisticCounterBundle().increment( PwmReceiverApp.CounterStatsKey.TelemetryPublishRequests );
             app.getStatisticEpsBundle().markEvent( PwmReceiverApp.EpsStatKey.TelemetryPublishRequests );
 
-            final String input = ServletUtility.readRequestBodyAsString( req, 1024 * 1024 );
+            final String input = readRequestBodyAsString( req, 1024 * 1024 );
             final TelemetryPublishBean telemetryPublishBean = JsonFactory.get().deserialize( input, TelemetryPublishBean.class );
             final Storage storage = app.getStorage();
             storage.store( telemetryPublishBean );
@@ -77,4 +78,19 @@ public class TelemetryRestReceiver extends HttpServlet
             ReceiverUtil.outputJsonResponse( req, resp, restResultBean );
         }
     }
+
+    public static String readRequestBodyAsString( final HttpServletRequest req, final int maxChars )
+            throws IOException, PwmUnrecoverableException
+    {
+        final String value = JavaHelper.copyToString( req.getInputStream(), PwmConstants.DEFAULT_CHARSET, maxChars + 1 )
+                .orElse( "" );
+
+        if ( value.length() > maxChars )
+        {
+            final String msg = "input request body is to big, size=" + value.length() + ", max=" + maxChars;
+            throw new PwmUnrecoverableException( new ErrorInformation( PwmError.ERROR_INTERNAL, msg ) );
+        }
+        return value;
+    }
+
 }

data-service/src/main/java/password/pwm/receiver/TelemetryViewerServlet.java

@@ -22,11 +22,11 @@ package password.pwm.receiver;
 
 import password.pwm.util.java.StringUtil;
 
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;

data-service/src/main/webapp/WEB-INF/web.xml

@@ -19,12 +19,12 @@
   ~ limitations under the License.
   -->
 
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-         http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         version="3.1"
-         id="PWM-Data-Service">
+    <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaeeweb-app_6_0.xsd"
+             version="6.0"
+             id="PWM-Data-Service">
+
     <display-name>PWM Data Service</display-name>
     <!-- <distributable/> Clustering/Session replication is not supported -->
     <description>Password Management Servlet - Data Service</description>

onejar/pom.xml

@@ -16,7 +16,7 @@
     <name>PWM Password Self Service: Executable Server JAR</name>
 
     <properties>
-        <tomcat.version>9.0.69</tomcat.version>
+        <tomcat.version>9.0.70</tomcat.version>
     </properties>
 
     <build>

pom.xml

@@ -488,13 +488,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.11.0</version>
+            <version>5.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
-            <version>2.35.0</version>
+            <artifactId>wiremock</artifactId>
+            <version>3.0.0-beta-2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

server/pom.xml

@@ -262,7 +262,7 @@
         <dependency>
             <groupId>com.blueconic</groupId>
             <artifactId>browscap-java</artifactId>
-            <version>1.3.13</version>
+            <version>1.3.14</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.xodus</groupId>

server/src/test/java/password/pwm/util/localdb/LocalDBBasicTest.java

@@ -20,6 +20,7 @@
 
 package password.pwm.util.localdb;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -56,6 +57,12 @@ public class LocalDBBasicTest
         localDB = LocalDBFactory.getInstance( localDbTestFolder, false, pwmApplication.getPwmEnvironment(), pwmApplication.getConfig() );
     }
 
+    @AfterEach
+    public void shutdown() throws Exception
+    {
+        localDB.close();
+    }
+
     @Test
     public void testBasicNarrative() throws LocalDBException
     {

webapp/pom.xml

@@ -124,6 +124,7 @@
                         </goals>
                         <phase>compile</phase>
                         <configuration>
+                            <compilerVersion>1.8</compilerVersion>
                             <trimSpaces>true</trimSpaces>
                             <compilerVersion>${maven.compiler.source}</compilerVersion>
                             <keepSources>false</keepSources>