Enable integration tests using new jetty plugin Signed-off-by: Jan Supol <jan.supol@oracle.com>
diff --git a/pom.xml b/pom.xml index 4dad891..71f2ef9 100644 --- a/pom.xml +++ b/pom.xml
@@ -701,7 +701,7 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> - <version>${jetty.plugin.version}</version> + <version>${mortbay.jetty.plugin.version}</version> </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> @@ -711,7 +711,7 @@ <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.version}</version> + <version>${jetty.plugin.version}</version> </plugin> <plugin> <groupId>org.glassfish.build</groupId> @@ -1916,14 +1916,14 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>${jetty.plugin.version}</version> + <version>${mortbay.jetty.plugin.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>${jetty.plugin.version}</version> + <version>${mortbay.jetty.plugin.version}</version> <scope>test</scope> </dependency> @@ -2145,6 +2145,8 @@ <jaxb.ri.version>3.0.0-M5</jaxb.ri.version> <jaxrs.api.spec.version>3.0</jaxrs.api.spec.version> <jaxrs.api.impl.version>3.0.0</jaxrs.api.impl.version> + <jetty.version>11.0.0.beta2</jetty.version> + <jetty.plugin.version>11.0.0.beta2</jetty.plugin.version> <jsonb.api.version>2.0.0</jsonb.api.version> <jsonp.ri.version>2.0.0</jsonp.ri.version> <jsonp.jaxrs.version>2.0.0</jsonp.jaxrs.version> @@ -2154,8 +2156,7 @@ <javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests --> - <jetty.plugin.version>6.1.26</jetty.plugin.version> - <jetty.version>11.0.0.beta2</jetty.version> + <mortbay.jetty.plugin.version>6.1.26</mortbay.jetty.plugin.version> <jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version> <mimepull.version>1.9.13</mimepull.version>
diff --git a/tests/integration/j-376/pom.xml b/tests/integration/j-376/pom.xml index 14a219b..ca5c6dd 100644 --- a/tests/integration/j-376/pom.xml +++ b/tests/integration/j-376/pom.xml
@@ -113,23 +113,4 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>jakartification_exclude_tests</id> <!-- TODO remove after jakartification --> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project>
diff --git a/tests/integration/j-376/src/test/java/org/glassfish/jersey/tests/integration/j376/J376Test.java b/tests/integration/j-376/src/test/java/org/glassfish/jersey/tests/integration/j376/J376Test.java index 2872a94..f812f12 100644 --- a/tests/integration/j-376/src/test/java/org/glassfish/jersey/tests/integration/j376/J376Test.java +++ b/tests/integration/j-376/src/test/java/org/glassfish/jersey/tests/integration/j376/J376Test.java
@@ -47,7 +47,6 @@ } @Test - @Ignore //TODO - remove after Jakartification public void testConstructorInjection() { final String response = target.path("constructor").request().post(Entity.entity("name=John&age=32", MediaType.APPLICATION_FORM_URLENCODED_TYPE), String.class); @@ -56,7 +55,6 @@ } @Test - @Ignore //TODO - remove after Jakartification public void testFieldInjection() { final String response = target.path("field").request().post(Entity.entity("name=Bill&age=21", MediaType.APPLICATION_FORM_URLENCODED_TYPE), String.class); @@ -65,7 +63,6 @@ } @Test - @Ignore //TODO - remove after Jakartification public void testMethodInjection() { final String response = target.path("method").request().post(Entity.entity("name=Mike&age=42", MediaType.APPLICATION_FORM_URLENCODED_TYPE), String.class); @@ -90,7 +87,6 @@ } @Test - @Ignore //TODO - remove after Jakartification public void testBeanParamInAppScoped() { final String response = target.path("appScope").request().post(Entity.entity("name=John&age=35", MediaType.APPLICATION_FORM_URLENCODED_TYPE), String.class);
diff --git a/tests/integration/jaxrs-component-inject/pom.xml b/tests/integration/jaxrs-component-inject/pom.xml index b63a72b..588c2a7 100644 --- a/tests/integration/jaxrs-component-inject/pom.xml +++ b/tests/integration/jaxrs-component-inject/pom.xml
@@ -52,27 +52,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/jaxrs/inject/ApplicationInjectITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-1107/pom.xml b/tests/integration/jersey-1107/pom.xml index 9293f2e..8061b60 100644 --- a/tests/integration/jersey-1107/pom.xml +++ b/tests/integration/jersey-1107/pom.xml
@@ -54,27 +54,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey1107/ApplicationHandlerITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-1223/pom.xml b/tests/integration/jersey-1223/pom.xml index c62ab6f..d4d7cc8 100644 --- a/tests/integration/jersey-1223/pom.xml +++ b/tests/integration/jersey-1223/pom.xml
@@ -56,27 +56,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey1223/ApplicationHandlerITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-1604/pom.xml b/tests/integration/jersey-1604/pom.xml index b5ca758..e20044b 100644 --- a/tests/integration/jersey-1604/pom.xml +++ b/tests/integration/jersey-1604/pom.xml
@@ -59,27 +59,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey1604/ConnectionCloseITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-1667/pom.xml b/tests/integration/jersey-1667/pom.xml index 952aeb7..3d3dfee 100644 --- a/tests/integration/jersey-1667/pom.xml +++ b/tests/integration/jersey-1667/pom.xml
@@ -65,27 +65,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey1667/Jersey1667ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-1829/pom.xml b/tests/integration/jersey-1829/pom.xml index dba6213..34040e4 100644 --- a/tests/integration/jersey-1829/pom.xml +++ b/tests/integration/jersey-1829/pom.xml
@@ -56,27 +56,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey1829/ApplicationHandlerITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-1883/pom.xml b/tests/integration/jersey-1883/pom.xml index 30f9e36..1cf2f62 100644 --- a/tests/integration/jersey-1883/pom.xml +++ b/tests/integration/jersey-1883/pom.xml
@@ -56,7 +56,7 @@ <artifactId>maven-failsafe-plugin</artifactId> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> </plugin> </plugins>
diff --git a/tests/integration/jersey-1883/src/test/java/org/glassfish/jersey/tests/integration/jersey1883/Jersey1883ITCase.java b/tests/integration/jersey-1883/src/test/java/org/glassfish/jersey/tests/integration/jersey1883/Jersey1883ITCase.java index fcadcf0..88022d3 100644 --- a/tests/integration/jersey-1883/src/test/java/org/glassfish/jersey/tests/integration/jersey1883/Jersey1883ITCase.java +++ b/tests/integration/jersey-1883/src/test/java/org/glassfish/jersey/tests/integration/jersey1883/Jersey1883ITCase.java
@@ -56,7 +56,6 @@ } @Test - @Ignore //TODO - remove after Jakartification public void testGetRestNoLife() throws Exception { Response response = target("rest1").path("no-life").request().get(); assertThat(response.readEntity(String.class), equalTo("ciao #1")); @@ -72,7 +71,6 @@ } @Test - @Ignore //TODO - remove after Jakartification public void testGetRestSingletonLife() throws Exception { Response response = target("rest2").path("singleton-life").request().get(); assertThat(response.readEntity(String.class), equalTo("hello #1")); @@ -88,7 +86,6 @@ } @Test - @Ignore //TODO - remove after Jakartification public void testGetRestLife() throws Exception { Response response = target("rest3").path("life").request().get(); assertThat(response.readEntity(String.class), equalTo("hi #2"));
diff --git a/tests/integration/jersey-1928/pom.xml b/tests/integration/jersey-1928/pom.xml index 60e6857..bf17e3a 100644 --- a/tests/integration/jersey-1928/pom.xml +++ b/tests/integration/jersey-1928/pom.xml
@@ -55,15 +55,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> <!--JDK 11 --> - <exclude>org/glassfish/jersey/tests/integration/jersey1928/Jersey1928ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> </plugin> </plugins>
diff --git a/tests/integration/jersey-1960/pom.xml b/tests/integration/jersey-1960/pom.xml index 384abb7..ad6c206 100644 --- a/tests/integration/jersey-1960/pom.xml +++ b/tests/integration/jersey-1960/pom.xml
@@ -34,9 +34,9 @@ <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet2.version}</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${servlet5.version}</version> <scope>provided</scope> </dependency> @@ -61,27 +61,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey1960/Jersey1960ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-1960/src/main/java/org/glassfish/jersey/tests/integration/jersey1960/RequestFilter.java b/tests/integration/jersey-1960/src/main/java/org/glassfish/jersey/tests/integration/jersey1960/RequestFilter.java index 8351509..0e54170 100644 --- a/tests/integration/jersey-1960/src/main/java/org/glassfish/jersey/tests/integration/jersey1960/RequestFilter.java +++ b/tests/integration/jersey-1960/src/main/java/org/glassfish/jersey/tests/integration/jersey1960/RequestFilter.java
@@ -25,10 +25,10 @@ import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.Response; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.message.MessageUtils;
diff --git a/tests/integration/jersey-1964/pom.xml b/tests/integration/jersey-1964/pom.xml index ad1026d..5a5cc6d 100644 --- a/tests/integration/jersey-1964/pom.xml +++ b/tests/integration/jersey-1964/pom.xml
@@ -38,6 +38,10 @@ <artifactId>jersey-container-servlet-core</artifactId> </dependency> <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + </dependency> + <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-metainf-services</artifactId> </dependency> @@ -58,27 +62,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey1964/Jersey1964ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2031/pom.xml b/tests/integration/jersey-2031/pom.xml index 93eaa08..39dd5a9 100644 --- a/tests/integration/jersey-2031/pom.xml +++ b/tests/integration/jersey-2031/pom.xml
@@ -44,9 +44,9 @@ <artifactId>jersey-mvc-jsp</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet2.version}</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${servlet5.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -65,27 +65,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove afer jakartification is done--> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey2031/Jersey2031ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
diff --git a/tests/integration/jersey-2160/pom.xml b/tests/integration/jersey-2160/pom.xml index 25f7b87..bf97133 100644 --- a/tests/integration/jersey-2160/pom.xml +++ b/tests/integration/jersey-2160/pom.xml
@@ -34,9 +34,9 @@ <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet2.version}</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${servlet5.version}</version> <scope>provided</scope> </dependency> @@ -61,27 +61,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey2160/Jersey2160ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2160/src/main/java/org/glassfish/jersey/tests/integration/jersey2160/Issue2160ReproducerResource.java b/tests/integration/jersey-2160/src/main/java/org/glassfish/jersey/tests/integration/jersey2160/Issue2160ReproducerResource.java index 9e99d68..8f01b33 100644 --- a/tests/integration/jersey-2160/src/main/java/org/glassfish/jersey/tests/integration/jersey2160/Issue2160ReproducerResource.java +++ b/tests/integration/jersey-2160/src/main/java/org/glassfish/jersey/tests/integration/jersey2160/Issue2160ReproducerResource.java
@@ -21,8 +21,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.hk2.api.ProxyCtl;
diff --git a/tests/integration/jersey-2160/src/main/java/org/glassfish/jersey/tests/integration/jersey2160/RequestFilter.java b/tests/integration/jersey-2160/src/main/java/org/glassfish/jersey/tests/integration/jersey2160/RequestFilter.java index 253b7cc..beb4bef 100644 --- a/tests/integration/jersey-2160/src/main/java/org/glassfish/jersey/tests/integration/jersey2160/RequestFilter.java +++ b/tests/integration/jersey-2160/src/main/java/org/glassfish/jersey/tests/integration/jersey2160/RequestFilter.java
@@ -22,7 +22,7 @@ import jakarta.ws.rs.container.ContainerRequestFilter; import jakarta.ws.rs.container.PreMatching; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * Filter that set a property on actual request. The property value
diff --git a/tests/integration/jersey-2164/pom.xml b/tests/integration/jersey-2164/pom.xml index 2eed430..7d6a41e 100644 --- a/tests/integration/jersey-2164/pom.xml +++ b/tests/integration/jersey-2164/pom.xml
@@ -54,27 +54,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey2164/Jersey2164ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2167/pom.xml b/tests/integration/jersey-2167/pom.xml index 1ac3908..014a7b0 100644 --- a/tests/integration/jersey-2167/pom.xml +++ b/tests/integration/jersey-2167/pom.xml
@@ -54,27 +54,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey2167/Jersey2167ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2176/pom.xml b/tests/integration/jersey-2176/pom.xml index 2a60a5c..e070234 100644 --- a/tests/integration/jersey-2176/pom.xml +++ b/tests/integration/jersey-2176/pom.xml
@@ -39,9 +39,9 @@ <artifactId>jersey-container-servlet</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet3.version}</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${servlet5.version}</version> <scope>provided</scope> </dependency> @@ -61,28 +61,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> <!--JDK 8 --> - <exclude>org/glassfish/jersey/tests/integration/jersey2176/Jersey2176SendErrorITCase.java</exclude> - <exclude>org/glassfish/jersey/tests/integration/jersey2176/Jersey2176SetStatusITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2176/src/main/java/org/glassfish/jersey/tests/integration/jersey2176/TraceResponseFilter.java b/tests/integration/jersey-2176/src/main/java/org/glassfish/jersey/tests/integration/jersey2176/TraceResponseFilter.java index 653c45e..ddb6b60 100644 --- a/tests/integration/jersey-2176/src/main/java/org/glassfish/jersey/tests/integration/jersey2176/TraceResponseFilter.java +++ b/tests/integration/jersey-2176/src/main/java/org/glassfish/jersey/tests/integration/jersey2176/TraceResponseFilter.java
@@ -20,14 +20,14 @@ import jakarta.ws.rs.core.HttpHeaders; -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.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +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.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Libor Kramolis
diff --git a/tests/integration/jersey-2176/src/main/java/org/glassfish/jersey/tests/integration/jersey2176/TraceResponseWrapper.java b/tests/integration/jersey-2176/src/main/java/org/glassfish/jersey/tests/integration/jersey2176/TraceResponseWrapper.java index 6a7b84f..de01bf9 100644 --- a/tests/integration/jersey-2176/src/main/java/org/glassfish/jersey/tests/integration/jersey2176/TraceResponseWrapper.java +++ b/tests/integration/jersey-2176/src/main/java/org/glassfish/jersey/tests/integration/jersey2176/TraceResponseWrapper.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.integration.jersey2176; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter; @@ -48,6 +48,16 @@ public void write(final int b) throws IOException { localStream.write(b); } + + @Override + public void setWriteListener(jakarta.servlet.WriteListener listener) { + // noop + } + + @Override + public boolean isReady() { + return true; + } }; }
diff --git a/tests/integration/jersey-2184/pom.xml b/tests/integration/jersey-2184/pom.xml index 4e79ee3..3bae87a 100644 --- a/tests/integration/jersey-2184/pom.xml +++ b/tests/integration/jersey-2184/pom.xml
@@ -40,9 +40,9 @@ <artifactId>jersey-container-servlet</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet3.version}</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${servlet5.version}</version> <scope>provided</scope> </dependency> @@ -62,27 +62,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> <!--JDK 8 --> - <exclude>org/glassfish/jersey/tests/integration/jersey2184/Jersey2184ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2184/src/main/java/org/glassfish/jersey/tests/integration/jersey2184/App.java b/tests/integration/jersey-2184/src/main/java/org/glassfish/jersey/tests/integration/jersey2184/App.java index 3e424d5..cd4a4f2 100644 --- a/tests/integration/jersey-2184/src/main/java/org/glassfish/jersey/tests/integration/jersey2184/App.java +++ b/tests/integration/jersey-2184/src/main/java/org/glassfish/jersey/tests/integration/jersey2184/App.java
@@ -22,7 +22,7 @@ import jakarta.ws.rs.core.Application; import jakarta.ws.rs.core.Context; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * Test Application subclass for JERSEY-2184 integration test.
diff --git a/tests/integration/jersey-2255/pom.xml b/tests/integration/jersey-2255/pom.xml index e85d3c4..021f608 100644 --- a/tests/integration/jersey-2255/pom.xml +++ b/tests/integration/jersey-2255/pom.xml
@@ -62,27 +62,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey2255/Jersey2255ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2335/pom.xml b/tests/integration/jersey-2335/pom.xml index 3b8b09f..e47ced2 100644 --- a/tests/integration/jersey-2335/pom.xml +++ b/tests/integration/jersey-2335/pom.xml
@@ -58,27 +58,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey2335/Jersey2335ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2551/pom.xml b/tests/integration/jersey-2551/pom.xml index 65b0067..93c59c6 100644 --- a/tests/integration/jersey-2551/pom.xml +++ b/tests/integration/jersey-2551/pom.xml
@@ -54,27 +54,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey2551/Jersey2551ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2612/pom.xml b/tests/integration/jersey-2612/pom.xml index 406a28f..b914c9d 100644 --- a/tests/integration/jersey-2612/pom.xml +++ b/tests/integration/jersey-2612/pom.xml
@@ -59,27 +59,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey2612/Jersey2612ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2637/pom.xml b/tests/integration/jersey-2637/pom.xml index a3e1168..bb66e1d 100644 --- a/tests/integration/jersey-2637/pom.xml +++ b/tests/integration/jersey-2637/pom.xml
@@ -36,9 +36,9 @@ <dependencies> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet2.version}</version> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${servlet5.version}</version> <scope>provided</scope> </dependency> @@ -63,25 +63,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <skip>true</skip> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2637/src/main/java/org/glassfish/jersey/tests/integration/jersey2637/ParamEatingFilter.java b/tests/integration/jersey-2637/src/main/java/org/glassfish/jersey/tests/integration/jersey2637/ParamEatingFilter.java index d1522c6..65ba05c 100644 --- a/tests/integration/jersey-2637/src/main/java/org/glassfish/jersey/tests/integration/jersey2637/ParamEatingFilter.java +++ b/tests/integration/jersey-2637/src/main/java/org/glassfish/jersey/tests/integration/jersey2637/ParamEatingFilter.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -18,12 +18,12 @@ import java.io.IOException; -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 jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * @author Michal Gajdos
diff --git a/tests/integration/jersey-2654/pom.xml b/tests/integration/jersey-2654/pom.xml index 29d26fd..22923a9 100644 --- a/tests/integration/jersey-2654/pom.xml +++ b/tests/integration/jersey-2654/pom.xml
@@ -53,25 +53,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <skip>true</skip> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2704/pom.xml b/tests/integration/jersey-2704/pom.xml index 784d052..fec1bee 100644 --- a/tests/integration/jersey-2704/pom.xml +++ b/tests/integration/jersey-2704/pom.xml
@@ -56,25 +56,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <skip>true</skip> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-2794/pom.xml b/tests/integration/jersey-2794/pom.xml index 77f7095..eed24a2 100644 --- a/tests/integration/jersey-2794/pom.xml +++ b/tests/integration/jersey-2794/pom.xml
@@ -61,16 +61,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> <!--JDK 8 --> - <exclude>org/glassfish/jersey/tests/integration/jersey2794/Jersey2794ITCase.java</exclude> - </excludes> - </configuration> - </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> </plugin> </plugins>
diff --git a/tests/integration/jersey-2846/pom.xml b/tests/integration/jersey-2846/pom.xml index e95245f..c1f1ac6 100644 --- a/tests/integration/jersey-2846/pom.xml +++ b/tests/integration/jersey-2846/pom.xml
@@ -61,16 +61,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> <!--JDK 11 --> - <exclude>org/glassfish/jersey/tests/integration/jersey2846/Jersey2846ITCase.java</exclude> - </excludes> - </configuration> - </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> </plugin> </plugins>
diff --git a/tests/integration/jersey-2878/pom.xml b/tests/integration/jersey-2878/pom.xml index 2988f51..e63d152 100644 --- a/tests/integration/jersey-2878/pom.xml +++ b/tests/integration/jersey-2878/pom.xml
@@ -62,16 +62,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> <!--JDK 11 --> - <exclude>org/glassfish/jersey/tests/integration/jersey2878/Jersey2878ApacheITCase.java</exclude> - <exclude>org/glassfish/jersey/tests/integration/jersey2878/Jersey2878ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> </plugin> </plugins>
diff --git a/tests/integration/jersey-2892/pom.xml b/tests/integration/jersey-2892/pom.xml index ca4b58d..d699c1a 100644 --- a/tests/integration/jersey-2892/pom.xml +++ b/tests/integration/jersey-2892/pom.xml
@@ -53,6 +53,10 @@ <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-moxy</artifactId> </dependency> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + </dependency> </dependencies> <build> @@ -64,28 +68,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey2892/Jersey2892JacksonITCase.java</exclude> - <exclude>org/glassfish/jersey/tests/integration/jersey2892/J605MoxyITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-3796/pom.xml b/tests/integration/jersey-3796/pom.xml index a6cfec6..1e78c91 100644 --- a/tests/integration/jersey-3796/pom.xml +++ b/tests/integration/jersey-3796/pom.xml
@@ -63,27 +63,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/jersey3796/Jersey3796ITCase.java</exclude> - </excludes> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/jersey-3992/pom.xml b/tests/integration/jersey-3992/pom.xml index e2dc1c1..b1ce40d 100644 --- a/tests/integration/jersey-3992/pom.xml +++ b/tests/integration/jersey-3992/pom.xml
@@ -94,22 +94,5 @@ <maven.test.skip>false</maven.test.skip> </properties> </profile> - <profile> - <id>jakartification_exclude_tests</id> <!-- TODO remove after jakartification --> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project>
diff --git a/tests/integration/jersey-4099/pom.xml b/tests/integration/jersey-4099/pom.xml index 103b2cc..e1f40a4 100644 --- a/tests/integration/jersey-4099/pom.xml +++ b/tests/integration/jersey-4099/pom.xml
@@ -80,24 +80,4 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>jakartification_exclude_tests</id> <!-- TODO remove after jakartification --> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project>
diff --git a/tests/integration/jersey-780/pom.xml b/tests/integration/jersey-780/pom.xml index 82e0e3a..5373b94 100644 --- a/tests/integration/jersey-780/pom.xml +++ b/tests/integration/jersey-780/pom.xml
@@ -54,25 +54,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <skip>true</skip> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <!--TODO jakartify this --> - <dependencies> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <version>${servlet5.version}</version> - </dependency> - </dependencies> - <configuration> - <skip>true</skip> - </configuration> </plugin> </plugins> </build>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 65cadd5..97f2cb8 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml
@@ -43,42 +43,14 @@ <module>j-376</module> <module>j-441</module> <module>j-59</module> - <module>jaxrs-component-inject</module> - <module>jersey-1107</module> - <module>jersey-1223</module> - <module>jersey-1604</module> - <module>jersey-1667</module> - <module>jersey-1829</module> - <module>jersey-1883</module> - <module>jersey-1928</module> - <module>jersey-1960</module> - <module>jersey-1964</module> <module>jersey-2136</module> <module>jersey-2137</module> <module>jersey-2154</module> - <module>jersey-2160</module> - <module>jersey-2164</module> - <module>jersey-2167</module> - <module>jersey-2176</module> - <module>jersey-2184</module> - <module>jersey-2255</module> <!-- <module>jersey-2322</module> Jakartification--> - <module>jersey-2335</module> <module>jersey-2421</module> - <module>jersey-2551</module> - <module>jersey-2612</module> - <module>jersey-2637</module> - <module>jersey-2654</module> <!-- <module>jersey-2673</module> Jakartification--> <!-- <module>jersey-2689</module> Jakartification--> - <module>jersey-2704</module> <module>jersey-2776</module> - <module>jersey-2794</module> - <module>jersey-2846</module> - <module>jersey-2878</module> - <module>jersey-2892</module> - <module>jersey-3796</module> - <module>jersey-780</module> <module>jersey-3670</module> <module>jersey-3992</module> <module>jersey-4003</module> @@ -87,7 +59,6 @@ <module>jersey-4507</module> <module>jersey-4542</module> <module>microprofile</module> - <module>security-digest</module> <module>servlet-2.5-autodiscovery-1</module> <module>servlet-2.5-filter</module> <module>servlet-2.5-inflector-1</module> @@ -122,7 +93,6 @@ <module>sonar-test</module> <!-- <module>spring4</module>--> <!-- <module>spring5</module>--> - <module>tracing-support</module> <module>reactive-streams</module> </modules> @@ -134,7 +104,8 @@ <jersey.config.test.container.port>9998</jersey.config.test.container.port> </properties> <activation> - <activeByDefault>true</activeByDefault> + <jdk>[1.8,)</jdk> +<!-- <activeByDefault>true</activeByDefault> does not work ?!--> </activation> </profile> <profile> @@ -190,14 +161,44 @@ <jdk>[11,)</jdk> </activation> <modules> + <module>jaxrs-component-inject</module> + <module>jersey-780</module> + <module>jersey-1107</module> + <module>jersey-1223</module> + <module>jersey-1604</module> + <module>jersey-1667</module> +<!-- <module>jersey-1829</module> Jakartification--> + <module>jersey-1883</module> + <module>jersey-1928</module> + <module>jersey-1960</module> +<!-- <module>jersey-1964</module> jakartification --> <module>jersey-2031</module> + <module>jersey-2160</module> + <module>jersey-2164</module> + <module>jersey-2167</module> + <module>jersey-2176</module> + <module>jersey-2184</module> + <module>jersey-2255</module> + <module>jersey-2335</module> + <module>jersey-2551</module> + <module>jersey-2612</module> + <module>jersey-2637</module> + <module>jersey-2654</module> +<!-- <module>jersey-2704</module> Jakartification --> + <module>jersey-2794</module> + <module>jersey-2846</module> + <module>jersey-2878</module> +<!-- <module>jersey-2892</module> Jakartification--> +<!-- <module>jersey-3796</module> jakartification --> <module>jetty-response-close</module> <module>property-check</module> + <module>security-digest</module> <module>servlet-2.5-autodiscovery-2</module> <module>servlet-2.5-mvc-1</module> <module>servlet-2.5-mvc-3</module> <module>servlet-4.0-mvc-1</module> <module>servlet-tests</module> + <module>tracing-support</module> </modules> </profile> </profiles> @@ -249,11 +250,12 @@ <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> + <version>${jetty.plugin.version}</version> <configuration> <skip>${skip.tests}</skip> - <scanIntervalSeconds>10</scanIntervalSeconds> <stopPort>9999</stopPort> <stopKey>STOP</stopKey> + <stopWait>10</stopWait> <webApp> <contextPath>/</contextPath> <webInfIncludeJarPattern>.*/.*jersey-[^/]\.jar$</webInfIncludeJarPattern>
diff --git a/tests/integration/security-digest/pom.xml b/tests/integration/security-digest/pom.xml index 17f3572..7055a00 100644 --- a/tests/integration/security-digest/pom.xml +++ b/tests/integration/security-digest/pom.xml
@@ -56,17 +56,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification is done --> - <configuration> - <skip>true</skip> - </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> - <skip>true</skip> <!-- TODO remove after jakartification --> <!-- define login service for jetty and the realm to be used --> <loginServices> <loginService implementation="org.eclipse.jetty.security.HashLoginService">
diff --git a/tests/integration/tracing-support/pom.xml b/tests/integration/tracing-support/pom.xml index 939314e..a543674 100644 --- a/tests/integration/tracing-support/pom.xml +++ b/tests/integration/tracing-support/pom.xml
@@ -60,17 +60,12 @@ <java.util.logging.config.file>${project.build.testOutputDirectory}/logging.properties </java.util.logging.config.file> </systemPropertyVariables> - <!-- TODO remove after jakartification --> - <excludes> <!--JDK 11 --> - <exclude>**/**/*.java</exclude> - </excludes> </configuration> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> - <skip>true</skip> <!-- TODO jakartify this --> <connectors> <connector> <responseHeaderSize>16192</responseHeaderSize>