Make more integration tests working Signed-off-by: Jan Supol <jan.supol@oracle.com>
diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml index b517d2a..cdc710e 100644 --- a/containers/jetty-http/pom.xml +++ b/containers/jetty-http/pom.xml
@@ -46,6 +46,18 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty.toolchain</groupId> + <artifactId>jetty-jakarta-servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>${servlet5.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId>
diff --git a/ext/mvc-mustache/pom.xml b/ext/mvc-mustache/pom.xml index 7470123..5ad74c6 100644 --- a/ext/mvc-mustache/pom.xml +++ b/ext/mvc-mustache/pom.xml
@@ -67,12 +67,6 @@ <artifactId>compiler</artifactId> <version>${mustache.version}</version> </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet2.version}</version> - </dependency> </dependencies> </project>
diff --git a/tests/e2e-server/pom.xml b/tests/e2e-server/pom.xml index a4a2cbe..fa17919 100644 --- a/tests/e2e-server/pom.xml +++ b/tests/e2e-server/pom.xml
@@ -130,6 +130,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.glassfish.jersey.connectors</groupId> + <artifactId>jersey-jetty-connector</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.glassfish.jersey.security</groupId> <artifactId>oauth1-signature</artifactId> <version>${project.version}</version> @@ -158,7 +163,6 @@ <artifactId>jaxb-osgi</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -211,42 +215,6 @@ </pluginManagement> </build> </profile> - <profile> - <id>JettyExclude</id> - <activation> - <jdk>1.8</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <testExcludes> - <testExclude>org/glassfish/jersey/tests/e2e/server/mvc/spi/AbstractTemplateProcessorTest.java</testExclude> - <testExclude>org/glassfish/jersey/tests/e2e/server/mvc/MvcEncodingTest.java</testExclude> - <testExclude>org/glassfish/jersey/tests/e2e/server/monitoring/StatisticsDestroyTest.java</testExclude> - <testExclude>org/glassfish/jersey/tests/e2e/server/monitoring/ReloadApplicationEventTest.java</testExclude> - </testExcludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>Jetty11</id> - <activation> - <jdk>[11,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>org.glassfish.jersey.connectors</groupId> - <artifactId>jersey-jetty-connector</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> </profiles> </project>
diff --git a/tests/integration/async-jersey-filter/pom.xml b/tests/integration/async-jersey-filter/pom.xml index 233b2e1..1293eb5 100644 --- a/tests/integration/async-jersey-filter/pom.xml +++ b/tests/integration/async-jersey-filter/pom.xml
@@ -63,28 +63,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/jersey2730/Jersey2730ITCase.java</exclude> - <exclude>org/glassfish/jersey/tests/integration/jersey2812/Jersey2812ITCase.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-2322/pom.xml b/tests/integration/jersey-2322/pom.xml index 82bb0e0..0cb8d60 100644 --- a/tests/integration/jersey-2322/pom.xml +++ b/tests/integration/jersey-2322/pom.xml
@@ -37,10 +37,10 @@ <groupId>org.glassfish.jersey.containers</groupId> <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.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + </dependency> <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-metainf-services</artifactId> @@ -70,27 +70,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/jersey2322/Jersey2322ITCase.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-2892/pom.xml b/tests/integration/jersey-2892/pom.xml index d699c1a..70299cd 100644 --- a/tests/integration/jersey-2892/pom.xml +++ b/tests/integration/jersey-2892/pom.xml
@@ -70,7 +70,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/jetty-response-close/pom.xml b/tests/integration/jetty-response-close/pom.xml deleted file mode 100644 index e8d9d2f..0000000 --- a/tests/integration/jetty-response-close/pom.xml +++ /dev/null
@@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Copyright (c) 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <artifactId>project</artifactId> - <groupId>org.glassfish.jersey.tests.integration</groupId> - <version>3.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>jetty-response-close</artifactId> - - <dependencies> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-jetty-http</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <!-- Test Backward compatibility with this version --> - <version>9.4.17.v20190418</version> - </dependency> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <properties> - <surefire.security.argline>-Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/surefire.policy</surefire.security.argline> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkCount>1</forkCount> - <reuseForks>false</reuseForks> - <enableAssertions>false</enableAssertions> - </configuration> - <!-- TODO remove after jakartification --> - <executions> - <execution> - <id>default-test</id> <!-- jakartification-excluded-tests --> - <configuration> - <excludes> - <!--JDK 8 --> - <exclude>org/glassfish/jersey/tests/jettyresponseclose/JettyHttpContainerCloseTest.java</exclude> - </excludes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file
diff --git a/tests/integration/jetty-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java b/tests/integration/jetty-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java deleted file mode 100644 index ee620f4..0000000 --- a/tests/integration/jetty-response-close/src/main/java/org/glassfish/jersey/tests/jettyresponseclose/Resource.java +++ /dev/null
@@ -1,28 +0,0 @@ -/* - * Copyright (c) 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.jersey.tests.jettyresponseclose; - -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; - -@Path("/") -public class Resource { - @GET - public String get() { - return Resource.class.getName(); - } -}
diff --git a/tests/integration/jetty-response-close/src/test/java/org/glassfish/jersey/tests/jettyresponseclose/JettyHttpContainerCloseTest.java b/tests/integration/jetty-response-close/src/test/java/org/glassfish/jersey/tests/jettyresponseclose/JettyHttpContainerCloseTest.java deleted file mode 100644 index 3ffa479..0000000 --- a/tests/integration/jetty-response-close/src/test/java/org/glassfish/jersey/tests/jettyresponseclose/JettyHttpContainerCloseTest.java +++ /dev/null
@@ -1,58 +0,0 @@ -/* - * Copyright (c) 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -package org.glassfish.jersey.tests.jettyresponseclose; - -import org.eclipse.jetty.server.Server; -import org.glassfish.jersey.jetty.JettyHttpContainer; -import org.glassfish.jersey.jetty.JettyHttpContainerFactory; -import org.glassfish.jersey.server.ResourceConfig; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - -import jakarta.ws.rs.client.ClientBuilder; -import jakarta.ws.rs.core.Response; -import java.net.URI; - -public class JettyHttpContainerCloseTest { - - private static Server server; - private static JettyHttpContainer container; - private static final String URL = "http://localhost:9080"; - - @BeforeAll - public static void setup() { - server = JettyHttpContainerFactory.createServer(URI.create(URL), - new ResourceConfig(Resource.class)); - container = (JettyHttpContainer) server.getHandler(); - } - - @AfterAll - public static void teardown() throws Exception { - container.doStop(); - } - - @Test - public void testResponseClose() { - try (Response response = ClientBuilder.newClient().target(URL).request().get()) { - Assertions.assertEquals(200, response.getStatus()); - Assertions.assertEquals(Resource.class.getName(), response.readEntity(String.class)); - - } - } -}
diff --git a/tests/integration/jetty-response-close/src/test/resources/surefire.policy b/tests/integration/jetty-response-close/src/test/resources/surefire.policy deleted file mode 100644 index f012633..0000000 --- a/tests/integration/jetty-response-close/src/test/resources/surefire.policy +++ /dev/null
@@ -1,45 +0,0 @@ -/* - * Copyright (c) 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 - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the - * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - * version 2 with the GNU Classpath Exception, which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - */ - -// we do not care about java lib itself -grant codebase "file:${java.home}/-" { - permission java.security.AllPermission; -}; - -// we do not care about our dependencies -grant codebase "file:${settings.localRepository}/-" { - permission java.security.AllPermission; -}; - -grant codebase "file:${user.home}/-" { - permission java.io.FilePermission "<<ALL FILES>>", "read"; -}; - -grant { - permission java.lang.management.ManagementPermission "monitor"; - permission java.util.PropertyPermission "*", "read, write"; - permission java.util.logging.LoggingPermission "control"; - permission java.lang.RuntimePermission "setIO"; - permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; - - permission java.lang.RuntimePermission "accessDeclaredMembers"; - permission java.lang.RuntimePermission "modifyThread"; - permission java.io.FilePermission "<<ALL FILES>>", "read"; - - permission java.lang.RuntimePermission "getenv.JETTY_AVAILABLE_PROCESSORS"; - permission java.net.SocketPermission "localhost", "accept,connect,listen,resolve"; - permission java.lang.RuntimePermission "setContextClassLoader"; -};
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index 97f2cb8..6127158 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml
@@ -34,7 +34,6 @@ <modules> <module>asm</module> - <module>async-jersey-filter</module> <module>cdi-integration</module> <module>client-connector-provider</module> <module>ejb-multimodule</module> @@ -46,7 +45,6 @@ <module>jersey-2136</module> <module>jersey-2137</module> <module>jersey-2154</module> -<!-- <module>jersey-2322</module> Jakartification--> <module>jersey-2421</module> <!-- <module>jersey-2673</module> Jakartification--> <!-- <module>jersey-2689</module> Jakartification--> @@ -59,37 +57,6 @@ <module>jersey-4507</module> <module>jersey-4542</module> <module>microprofile</module> - <module>servlet-2.5-autodiscovery-1</module> - <module>servlet-2.5-filter</module> - <module>servlet-2.5-inflector-1</module> - <module>servlet-2.5-init-1</module> - <module>servlet-2.5-init-2</module> - <module>servlet-2.5-init-3</module> - <module>servlet-2.5-init-4</module> - <module>servlet-2.5-init-5</module> - <module>servlet-2.5-init-6</module> - <module>servlet-2.5-init-7</module> - <module>servlet-2.5-init-8</module> - <module>servlet-2.5-mvc-2</module> - <module>servlet-2.5-reload</module> - <module>servlet-3-async</module> - <module>servlet-3-chunked-io</module> - <module>servlet-3-filter</module> - <module>servlet-3-gf-async</module> - <module>servlet-3-inflector-1</module> - <module>servlet-3-init-1</module> - <module>servlet-3-init-2</module> - <module>servlet-3-init-3</module> - <module>servlet-3-init-4</module> - <module>servlet-3-init-5</module> - <module>servlet-3-init-6</module> - <module>servlet-3-init-7</module> - <module>servlet-3-init-8</module> - <module>servlet-3-init-provider</module> - <module>servlet-3-params</module> - <module>servlet-3-sse-1</module> - <module>servlet-request-wrapper-binding-2</module> - <module>servlet-request-wrapper-binding</module> <module>sonar-test</module> <!-- <module>spring4</module>--> <!-- <module>spring5</module>--> @@ -161,6 +128,7 @@ <jdk>[11,)</jdk> </activation> <modules> + <module>async-jersey-filter</module> <module>jaxrs-component-inject</module> <module>jersey-780</module> <module>jersey-1107</module> @@ -179,6 +147,7 @@ <module>jersey-2176</module> <module>jersey-2184</module> <module>jersey-2255</module> + <module>jersey-2322</module> <module>jersey-2335</module> <module>jersey-2551</module> <module>jersey-2612</module> @@ -188,16 +157,46 @@ <module>jersey-2794</module> <module>jersey-2846</module> <module>jersey-2878</module> -<!-- <module>jersey-2892</module> Jakartification--> + <module>jersey-2892</module> <!-- <module>jersey-3796</module> jakartification --> - <module>jetty-response-close</module> <module>property-check</module> <module>security-digest</module> + <module>servlet-2.5-autodiscovery-1</module> <module>servlet-2.5-autodiscovery-2</module> + <module>servlet-2.5-filter</module> + <module>servlet-2.5-inflector-1</module> + <module>servlet-2.5-init-1</module> + <module>servlet-2.5-init-2</module> + <module>servlet-2.5-init-3</module> + <module>servlet-2.5-init-4</module> + <module>servlet-2.5-init-5</module> + <module>servlet-2.5-init-6</module> + <module>servlet-2.5-init-7</module> + <module>servlet-2.5-init-8</module> <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-reload</module> + <module>servlet-3-async</module> + <module>servlet-3-chunked-io</module> + <module>servlet-3-filter</module> + <module>servlet-3-gf-async</module> + <module>servlet-3-inflector-1</module> + <module>servlet-3-init-1</module> + <module>servlet-3-init-2</module> + <module>servlet-3-init-3</module> + <module>servlet-3-init-4</module> + <module>servlet-3-init-5</module> + <module>servlet-3-init-6</module> + <module>servlet-3-init-7</module> + <module>servlet-3-init-8</module> + <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-tests</module> + <module>servlet-request-wrapper-binding</module> + <module>servlet-request-wrapper-binding-2</module> <module>tracing-support</module> </modules> </profile>
diff --git a/tests/integration/servlet-2.5-autodiscovery-1/pom.xml b/tests/integration/servlet-2.5-autodiscovery-1/pom.xml index 670dff9..c84ab96 100644 --- a/tests/integration/servlet-2.5-autodiscovery-1/pom.xml +++ b/tests/integration/servlet-2.5-autodiscovery-1/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/servlet-2.5-filter/pom.xml b/tests/integration/servlet-2.5-filter/pom.xml index 9287894..e88ca9d 100644 --- a/tests/integration/servlet-2.5-filter/pom.xml +++ b/tests/integration/servlet-2.5-filter/pom.xml
@@ -58,49 +58,11 @@ <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> - - <profiles> - <profile> - <id>jdk8</id> - <activation> - <jdk>1.8</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/servlet_2_5_filter/MyResourceITCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project>
diff --git a/tests/integration/servlet-2.5-inflector-1/pom.xml b/tests/integration/servlet-2.5-inflector-1/pom.xml index 2d9f3f1..0957cdf 100644 --- a/tests/integration/servlet-2.5-inflector-1/pom.xml +++ b/tests/integration/servlet-2.5-inflector-1/pom.xml
@@ -41,9 +41,9 @@ <artifactId>jersey-container-servlet-core</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> @@ -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/servlet-2.5-inflector-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_inflector_1/MyInflector.java b/tests/integration/servlet-2.5-inflector-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_inflector_1/MyInflector.java index 3d444d3..4ec21a7 100644 --- a/tests/integration/servlet-2.5-inflector-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_inflector_1/MyInflector.java +++ b/tests/integration/servlet-2.5-inflector-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_inflector_1/MyInflector.java
@@ -21,8 +21,8 @@ import jakarta.inject.Inject; import jakarta.inject.Provider; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.process.Inflector;
diff --git a/tests/integration/servlet-2.5-init-1/pom.xml b/tests/integration/servlet-2.5-init-1/pom.xml index 3128c55..4477827 100644 --- a/tests/integration/servlet-2.5-init-1/pom.xml +++ b/tests/integration/servlet-2.5-init-1/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,11 @@ <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> - </project>
diff --git a/tests/integration/servlet-2.5-init-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_init_1/HelloWorldResource.java b/tests/integration/servlet-2.5-init-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_init_1/HelloWorldResource.java index 66a91ee..d3fd6ca 100644 --- a/tests/integration/servlet-2.5-init-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_init_1/HelloWorldResource.java +++ b/tests/integration/servlet-2.5-init-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_init_1/HelloWorldResource.java
@@ -21,10 +21,10 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; -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.servlet.WebConfig;
diff --git a/tests/integration/servlet-2.5-init-2/pom.xml b/tests/integration/servlet-2.5-init-2/pom.xml index 560bfae..7ae2df7 100644 --- a/tests/integration/servlet-2.5-init-2/pom.xml +++ b/tests/integration/servlet-2.5-init-2/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/servlet-2.5-init-3/pom.xml b/tests/integration/servlet-2.5-init-3/pom.xml index 1959f65..de06f07 100644 --- a/tests/integration/servlet-2.5-init-3/pom.xml +++ b/tests/integration/servlet-2.5-init-3/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/servlet-2.5-init-4/pom.xml b/tests/integration/servlet-2.5-init-4/pom.xml index 29299f9..8ed720a 100644 --- a/tests/integration/servlet-2.5-init-4/pom.xml +++ b/tests/integration/servlet-2.5-init-4/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/servlet-2.5-init-5/pom.xml b/tests/integration/servlet-2.5-init-5/pom.xml index 78dcd3b..d614911 100644 --- a/tests/integration/servlet-2.5-init-5/pom.xml +++ b/tests/integration/servlet-2.5-init-5/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/servlet-2.5-init-6/pom.xml b/tests/integration/servlet-2.5-init-6/pom.xml index 61fd9a9..17b504e 100644 --- a/tests/integration/servlet-2.5-init-6/pom.xml +++ b/tests/integration/servlet-2.5-init-6/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/servlet-2.5-init-7/pom.xml b/tests/integration/servlet-2.5-init-7/pom.xml index 11bf44f..6273c00 100644 --- a/tests/integration/servlet-2.5-init-7/pom.xml +++ b/tests/integration/servlet-2.5-init-7/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/servlet-2.5-init-8/pom.xml b/tests/integration/servlet-2.5-init-8/pom.xml index 9f6b6ed..071b8e1 100644 --- a/tests/integration/servlet-2.5-init-8/pom.xml +++ b/tests/integration/servlet-2.5-init-8/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/servlet-2.5-reload/pom.xml b/tests/integration/servlet-2.5-reload/pom.xml index 67dc566..1b49383 100644 --- a/tests/integration/servlet-2.5-reload/pom.xml +++ b/tests/integration/servlet-2.5-reload/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/servlet-3-async/pom.xml b/tests/integration/servlet-3-async/pom.xml index 5c7e41b..9f4f9fe 100644 --- a/tests/integration/servlet-3-async/pom.xml +++ b/tests/integration/servlet-3-async/pom.xml
@@ -54,17 +54,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/servlet_3_async/AsyncServletResourceITCase.java</exclude> - <exclude>org/glassfish/jersey/tests/integration/servlet_3_async/AsyncTimeoutResourceITCase.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/servlet-3-chunked-io/pom.xml b/tests/integration/servlet-3-chunked-io/pom.xml index bf16251..7b4101f 100644 --- a/tests/integration/servlet-3-chunked-io/pom.xml +++ b/tests/integration/servlet-3-chunked-io/pom.xml
@@ -63,15 +63,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/servlet_3_chunked_io/ChunkedInputOutputITCase.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/servlet-3-filter/pom.xml b/tests/integration/servlet-3-filter/pom.xml index b23d7d9..a5c1e40 100644 --- a/tests/integration/servlet-3-filter/pom.xml +++ b/tests/integration/servlet-3-filter/pom.xml
@@ -43,6 +43,11 @@ <artifactId>jersey-test-framework-provider-external</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-osgi</artifactId> + </dependency> </dependencies> <build> @@ -54,61 +59,11 @@ <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> - - <profiles> - <profile> - <id>jdk11+</id> - <activation> - <jdk>[11,)</jdk> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-osgi</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>jdk8</id> - <activation> - <jdk>1.8</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/glassfish/jersey/tests/integration/servlet_3_filter/MyResourceITCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - </profiles> </project>
diff --git a/tests/integration/servlet-3-inflector-1/pom.xml b/tests/integration/servlet-3-inflector-1/pom.xml index d469b15..9aba89a 100644 --- a/tests/integration/servlet-3-inflector-1/pom.xml +++ b/tests/integration/servlet-3-inflector-1/pom.xml
@@ -41,9 +41,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> @@ -63,15 +63,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/servlet_3_inflector_1/InflectorInjectionTestITCase.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/servlet-3-inflector-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_inflector_1/MyInflector.java b/tests/integration/servlet-3-inflector-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_inflector_1/MyInflector.java index 3d2cd16..ed32a23 100644 --- a/tests/integration/servlet-3-inflector-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_inflector_1/MyInflector.java +++ b/tests/integration/servlet-3-inflector-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_inflector_1/MyInflector.java
@@ -21,8 +21,8 @@ import jakarta.inject.Inject; import jakarta.inject.Provider; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.process.Inflector;
diff --git a/tests/integration/servlet-3-init-1/pom.xml b/tests/integration/servlet-3-init-1/pom.xml index b7b0e2e..1df9546 100644 --- a/tests/integration/servlet-3-init-1/pom.xml +++ b/tests/integration/servlet-3-init-1/pom.xml
@@ -54,15 +54,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/servlet_3_init_1/HelloWorldResourceITCase.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/servlet-3-init-2/pom.xml b/tests/integration/servlet-3-init-2/pom.xml index 6f972dc..f1d4d7e 100644 --- a/tests/integration/servlet-3-init-2/pom.xml +++ b/tests/integration/servlet-3-init-2/pom.xml
@@ -43,8 +43,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> - <scope>compile</scope> </dependency> <dependency> @@ -63,15 +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/servlet_3_init_2/HelloWorldResourceITCase.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/servlet-3-init-3/pom.xml b/tests/integration/servlet-3-init-3/pom.xml index dee6727..b4c55ab 100644 --- a/tests/integration/servlet-3-init-3/pom.xml +++ b/tests/integration/servlet-3-init-3/pom.xml
@@ -37,12 +37,6 @@ <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet3.version}</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> @@ -60,15 +54,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/servlet_3_init_3/EmptyApplicationTestITCase.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/servlet-3-init-4/pom.xml b/tests/integration/servlet-3-init-4/pom.xml index 1ae5032..72cb431 100644 --- a/tests/integration/servlet-3-init-4/pom.xml +++ b/tests/integration/servlet-3-init-4/pom.xml
@@ -40,12 +40,6 @@ <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet3.version}</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> @@ -63,15 +57,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/servlet_3_init_4/EmptyApplicationTestITCase.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/servlet-3-init-5/pom.xml b/tests/integration/servlet-3-init-5/pom.xml index 29c9254..1c73fb9 100644 --- a/tests/integration/servlet-3-init-5/pom.xml +++ b/tests/integration/servlet-3-init-5/pom.xml
@@ -39,13 +39,6 @@ <artifactId>jersey-container-servlet</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet3.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> <artifactId>jersey-test-framework-provider-external</artifactId> <scope>test</scope> @@ -61,15 +54,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/servlet_3_init_5/HelloWorldResourceITCase.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/servlet-3-init-6/pom.xml b/tests/integration/servlet-3-init-6/pom.xml index f33dea3..a60e796 100644 --- a/tests/integration/servlet-3-init-6/pom.xml +++ b/tests/integration/servlet-3-init-6/pom.xml
@@ -38,12 +38,6 @@ <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet3.version}</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> @@ -61,27 +55,10 @@ <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/servlet_3_init_6/EmptyApplicationITCase.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/servlet-3-init-7/pom.xml b/tests/integration/servlet-3-init-7/pom.xml index 8bdcb7a..74566ea 100644 --- a/tests/integration/servlet-3-init-7/pom.xml +++ b/tests/integration/servlet-3-init-7/pom.xml
@@ -39,12 +39,6 @@ <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${servlet3.version}</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> @@ -62,27 +56,10 @@ <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/servlet_3_init_7/HelloWorldResourceITCase.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/servlet-3-init-8/pom.xml b/tests/integration/servlet-3-init-8/pom.xml index 8552451..1d1ece9 100644 --- a/tests/integration/servlet-3-init-8/pom.xml +++ b/tests/integration/servlet-3-init-8/pom.xml
@@ -56,25 +56,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <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/servlet-3-init-provider/pom.xml b/tests/integration/servlet-3-init-provider/pom.xml index 80ca235..76f9cd2 100644 --- a/tests/integration/servlet-3-init-provider/pom.xml +++ b/tests/integration/servlet-3-init-provider/pom.xml
@@ -62,13 +62,13 @@ <artifactId>maven-failsafe-plugin</artifactId> <!-- TODO remove after jakartification --> <configuration> - <excludes> <!--JDK 11 --> - <exclude>**/**/*.java</exclude> + <excludes> + <exclude>**/**/HelloWorld3ResourceITCase.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/servlet-3-params/pom.xml b/tests/integration/servlet-3-params/pom.xml index 5f251cb..512b462 100644 --- a/tests/integration/servlet-3-params/pom.xml +++ b/tests/integration/servlet-3-params/pom.xml
@@ -38,9 +38,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> @@ -60,25 +60,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/servlet-3-params/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_params/CustomContextListener.java b/tests/integration/servlet-3-params/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_params/CustomContextListener.java index a726339..ae0c672 100644 --- a/tests/integration/servlet-3-params/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_params/CustomContextListener.java +++ b/tests/integration/servlet-3-params/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_params/CustomContextListener.java
@@ -16,9 +16,9 @@ package org.glassfish.jersey.tests.integration.servlet_3_params; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; /** * @author Pavel Bucek
diff --git a/tests/integration/servlet-request-wrapper-binding-2/pom.xml b/tests/integration/servlet-request-wrapper-binding-2/pom.xml index 7b8ec8d..a282968 100644 --- a/tests/integration/servlet-request-wrapper-binding-2/pom.xml +++ b/tests/integration/servlet-request-wrapper-binding-2/pom.xml
@@ -66,27 +66,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <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> - <!--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/servlet-request-wrapper-binding/pom.xml b/tests/integration/servlet-request-wrapper-binding/pom.xml index e16f4cb..ff83237 100644 --- a/tests/integration/servlet-request-wrapper-binding/pom.xml +++ b/tests/integration/servlet-request-wrapper-binding/pom.xml
@@ -66,27 +66,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <!-- TODO remove after jakartification --> - <configuration> - <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> - <!--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/jmockit/pom.xml b/tests/jmockit/pom.xml index 2feb713..9fba1f9 100644 --- a/tests/jmockit/pom.xml +++ b/tests/jmockit/pom.xml
@@ -45,6 +45,11 @@ <artifactId>jersey-media-multipart</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.glassfish.jersey.test-framework.providers</groupId> + <artifactId>jersey-test-framework-provider-bundle</artifactId> + <type>pom</type> + </dependency> <dependency> <groupId>org.jmockit</groupId> @@ -73,7 +78,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <skip>true</skip> <!-- TODO remove after jakartification --> <!-- for convenience reasons, 'argLine' should not be overridden in child poms. if needed, a property should be declared and used here --> <argLine> -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar