Moving tests to servlet 4.0

Signed-off-by: Jorge Bescos Gascon <[email protected]>

tests/integration/pom.xml

@@ -107,7 +107,6 @@
         <module>servlet-2.5-mvc-1</module>
         <module>servlet-2.5-mvc-2</module>
         <module>servlet-2.5-mvc-3</module>
-	<module>servlet-2.5-mvc-4</module>
         <module>servlet-2.5-reload</module>
         <module>servlet-3-async</module>
         <module>servlet-3-chunked-io</module>
@@ -125,6 +124,7 @@
         <module>servlet-3-init-provider</module>
         <module>servlet-3-params</module>
         <module>servlet-3-sse-1</module>
+        <module>servlet-4.0-mvc-1</module>
         <module>servlet-request-wrapper-binding-2</module>
         <module>servlet-request-wrapper-binding</module>
         <module>servlet-tests</module>

tests/integration/servlet-2.5-mvc-4/pom.xml → tests/integration/servlet-4.0-mvc-1/pom.xml

@@ -26,9 +26,9 @@
         <version>2.32.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>servlet-2.5-mvc-4</artifactId>
+    <artifactId>servlet-4.0-mvc-1</artifactId>
     <packaging>war</packaging>
-    <name>jersey-tests-integration-servlet-2.5-mvc-4</name>
+    <name>jersey-tests-integration-servlet-4.0-mvc-1</name>
 
     <description>Servlet integration test - servlet-2.5-mvc-4 - filter - MVC - jersey.config.servlet.JspTemplatesBasePath</description>
 
@@ -47,9 +47,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet2.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${servlet4.version}</version>
         </dependency>
 
         <dependency>

tests/integration/servlet-2.5-mvc-4/src/main/webapp/WEB-INF/web.xml → tests/integration/servlet-4.0-mvc-1/src/main/webapp/WEB-INF/web.xml

@@ -17,7 +17,12 @@
 
 -->
 
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+<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_4_0.xsd"
+  version="4.0"
+  metadata-complete="true">
     <filter>
         <filter-name>org.glassfish.jersey.tests.integration.servlet_25_mvc_4.MyApplication</filter-name>
         <filter-class>org.glassfish.jersey.servlet.ServletContainer</filter-class>