Moving tests to servlet 4.0
Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index 11509c6..31714df 100644
--- a/tests/integration/pom.xml
+++ b/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>
diff --git a/tests/integration/servlet-2.5-mvc-4/pom.xml b/tests/integration/servlet-4.0-mvc-1/pom.xml
similarity index 92%
rename from tests/integration/servlet-2.5-mvc-4/pom.xml
rename to tests/integration/servlet-4.0-mvc-1/pom.xml
index 32a77b6..01f5af4 100644
--- a/tests/integration/servlet-2.5-mvc-4/pom.xml
+++ b/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>
diff --git a/tests/integration/servlet-2.5-mvc-4/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/MyApplication.java b/tests/integration/servlet-4.0-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/MyApplication.java
similarity index 100%
rename from tests/integration/servlet-2.5-mvc-4/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/MyApplication.java
rename to tests/integration/servlet-4.0-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/MyApplication.java
diff --git a/tests/integration/servlet-2.5-mvc-4/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/resource/ExampleResource.java b/tests/integration/servlet-4.0-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/resource/ExampleResource.java
similarity index 100%
rename from tests/integration/servlet-2.5-mvc-4/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/resource/ExampleResource.java
rename to tests/integration/servlet-4.0-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/resource/ExampleResource.java
diff --git a/tests/integration/servlet-2.5-mvc-4/src/main/webapp/WEB-INF/jsp/main.jsp b/tests/integration/servlet-4.0-mvc-1/src/main/webapp/WEB-INF/jsp/main.jsp
similarity index 100%
rename from tests/integration/servlet-2.5-mvc-4/src/main/webapp/WEB-INF/jsp/main.jsp
rename to tests/integration/servlet-4.0-mvc-1/src/main/webapp/WEB-INF/jsp/main.jsp
diff --git a/tests/integration/servlet-2.5-mvc-4/src/main/webapp/WEB-INF/web.xml b/tests/integration/servlet-4.0-mvc-1/src/main/webapp/WEB-INF/web.xml
similarity index 82%
rename from tests/integration/servlet-2.5-mvc-4/src/main/webapp/WEB-INF/web.xml
rename to tests/integration/servlet-4.0-mvc-1/src/main/webapp/WEB-INF/web.xml
index d68cdfc..15296fd 100644
--- a/tests/integration/servlet-2.5-mvc-4/src/main/webapp/WEB-INF/web.xml
+++ b/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>
diff --git a/tests/integration/servlet-2.5-mvc-4/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/GzipITCase.java b/tests/integration/servlet-4.0-mvc-1/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/GzipITCase.java
similarity index 100%
rename from tests/integration/servlet-2.5-mvc-4/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/GzipITCase.java
rename to tests/integration/servlet-4.0-mvc-1/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/GzipITCase.java
diff --git a/tests/integration/servlet-2.5-mvc-4/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/TestSupport.java b/tests/integration/servlet-4.0-mvc-1/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/TestSupport.java
similarity index 100%
rename from tests/integration/servlet-2.5-mvc-4/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/TestSupport.java
rename to tests/integration/servlet-4.0-mvc-1/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_4/TestSupport.java
