diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml index b517d2ac49..cdc710e4c2 100644 --- a/containers/jetty-http/pom.xml +++ b/containers/jetty-http/pom.xml @@ -46,6 +46,18 @@ org.eclipse.jetty jetty-server + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + provided org.eclipse.jetty diff --git a/ext/mvc-mustache/pom.xml b/ext/mvc-mustache/pom.xml index 7470123a92..5ad74c695b 100644 --- a/ext/mvc-mustache/pom.xml +++ b/ext/mvc-mustache/pom.xml @@ -67,12 +67,6 @@ compiler ${mustache.version} - - - javax.servlet - servlet-api - ${servlet2.version} - diff --git a/tests/e2e-server/pom.xml b/tests/e2e-server/pom.xml index a4a2cbe14d..fa1791974f 100644 --- a/tests/e2e-server/pom.xml +++ b/tests/e2e-server/pom.xml @@ -129,6 +129,11 @@ jersey-grizzly-connector test + + org.glassfish.jersey.connectors + jersey-jetty-connector + test + org.glassfish.jersey.security oauth1-signature @@ -158,7 +163,6 @@ jaxb-osgi test - com.google.guava guava @@ -211,42 +215,6 @@ - - JettyExclude - - 1.8 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org/glassfish/jersey/tests/e2e/server/mvc/spi/AbstractTemplateProcessorTest.java - org/glassfish/jersey/tests/e2e/server/mvc/MvcEncodingTest.java - org/glassfish/jersey/tests/e2e/server/monitoring/StatisticsDestroyTest.java - org/glassfish/jersey/tests/e2e/server/monitoring/ReloadApplicationEventTest.java - - - - - - - - Jetty11 - - [11,) - - - - org.glassfish.jersey.connectors - jersey-jetty-connector - ${project.version} - test - - - diff --git a/tests/integration/async-jersey-filter/pom.xml b/tests/integration/async-jersey-filter/pom.xml index 233b2e133a..1293eb5bb1 100644 --- a/tests/integration/async-jersey-filter/pom.xml +++ b/tests/integration/async-jersey-filter/pom.xml @@ -63,28 +63,10 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/jersey2730/Jersey2730ITCase.java - org/glassfish/jersey/tests/integration/jersey2812/Jersey2812ITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/jersey-2322/pom.xml b/tests/integration/jersey-2322/pom.xml index 82bb0e0f50..0cb8d60d73 100644 --- a/tests/integration/jersey-2322/pom.xml +++ b/tests/integration/jersey-2322/pom.xml @@ -37,10 +37,10 @@ org.glassfish.jersey.containers jersey-container-servlet-core - - - - + + org.glassfish.jersey.media + jersey-media-json-jackson + org.glassfish.jersey.ext jersey-metainf-services @@ -70,27 +70,10 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/jersey2322/Jersey2322ITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/jersey-2892/pom.xml b/tests/integration/jersey-2892/pom.xml index d699c1a376..70299cd57f 100644 --- a/tests/integration/jersey-2892/pom.xml +++ b/tests/integration/jersey-2892/pom.xml @@ -70,7 +70,7 @@ maven-failsafe-plugin - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin diff --git a/tests/integration/jetty-response-close/pom.xml b/tests/integration/jetty-response-close/pom.xml deleted file mode 100644 index e8d9d2f522..0000000000 --- a/tests/integration/jetty-response-close/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - project - org.glassfish.jersey.tests.integration - 3.0.0-SNAPSHOT - - 4.0.0 - - jetty-response-close - - - - org.glassfish.jersey.containers - jersey-container-jetty-http - ${project.version} - test - - - org.eclipse.jetty - jetty-server - - - - - org.eclipse.jetty - jetty-server - - 9.4.17.v20190418 - - - - org.junit.jupiter - junit-jupiter-engine - test - - - - - -Djava.security.manager -Djava.security.policy=${project.build.directory}/test-classes/surefire.policy - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - 1 - false - false - - - - - default-test - - - - org/glassfish/jersey/tests/jettyresponseclose/JettyHttpContainerCloseTest.java - - - - - - - - \ 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 ee620f4e0c..0000000000 --- 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 3ffa47972c..0000000000 --- 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 f012633e76..0000000000 --- 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 "<>", "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 "<>", "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 97f2cb8cb7..6127158ac0 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml @@ -34,7 +34,6 @@ asm - async-jersey-filter cdi-integration client-connector-provider ejb-multimodule @@ -46,7 +45,6 @@ jersey-2136 jersey-2137 jersey-2154 - jersey-2421 @@ -59,37 +57,6 @@ jersey-4507 jersey-4542 microprofile - servlet-2.5-autodiscovery-1 - servlet-2.5-filter - servlet-2.5-inflector-1 - servlet-2.5-init-1 - servlet-2.5-init-2 - servlet-2.5-init-3 - servlet-2.5-init-4 - servlet-2.5-init-5 - servlet-2.5-init-6 - servlet-2.5-init-7 - servlet-2.5-init-8 - servlet-2.5-mvc-2 - servlet-2.5-reload - servlet-3-async - servlet-3-chunked-io - servlet-3-filter - servlet-3-gf-async - servlet-3-inflector-1 - servlet-3-init-1 - servlet-3-init-2 - servlet-3-init-3 - servlet-3-init-4 - servlet-3-init-5 - servlet-3-init-6 - servlet-3-init-7 - servlet-3-init-8 - servlet-3-init-provider - servlet-3-params - servlet-3-sse-1 - servlet-request-wrapper-binding-2 - servlet-request-wrapper-binding sonar-test @@ -161,6 +128,7 @@ [11,) + async-jersey-filter jaxrs-component-inject jersey-780 jersey-1107 @@ -179,6 +147,7 @@ jersey-2176 jersey-2184 jersey-2255 + jersey-2322 jersey-2335 jersey-2551 jersey-2612 @@ -188,16 +157,46 @@ jersey-2794 jersey-2846 jersey-2878 - + jersey-2892 - jetty-response-close property-check security-digest + servlet-2.5-autodiscovery-1 servlet-2.5-autodiscovery-2 + servlet-2.5-filter + servlet-2.5-inflector-1 + servlet-2.5-init-1 + servlet-2.5-init-2 + servlet-2.5-init-3 + servlet-2.5-init-4 + servlet-2.5-init-5 + servlet-2.5-init-6 + servlet-2.5-init-7 + servlet-2.5-init-8 servlet-2.5-mvc-1 + servlet-2.5-mvc-2 servlet-2.5-mvc-3 + servlet-2.5-reload + servlet-3-async + servlet-3-chunked-io + servlet-3-filter + servlet-3-gf-async + servlet-3-inflector-1 + servlet-3-init-1 + servlet-3-init-2 + servlet-3-init-3 + servlet-3-init-4 + servlet-3-init-5 + servlet-3-init-6 + servlet-3-init-7 + servlet-3-init-8 + servlet-3-init-provider + servlet-3-params + servlet-3-sse-1 servlet-4.0-mvc-1 servlet-tests + servlet-request-wrapper-binding + servlet-request-wrapper-binding-2 tracing-support diff --git a/tests/integration/servlet-2.5-autodiscovery-1/pom.xml b/tests/integration/servlet-2.5-autodiscovery-1/pom.xml index 670dff9cc8..c84ab96664 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 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-2.5-filter/pom.xml b/tests/integration/servlet-2.5-filter/pom.xml index 92878941c4..e88ca9d209 100644 --- a/tests/integration/servlet-2.5-filter/pom.xml +++ b/tests/integration/servlet-2.5-filter/pom.xml @@ -58,49 +58,11 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - - - - - jdk8 - - 1.8 - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - org/glassfish/jersey/tests/integration/servlet_2_5_filter/MyResourceITCase.java - - - - - - - - diff --git a/tests/integration/servlet-2.5-inflector-1/pom.xml b/tests/integration/servlet-2.5-inflector-1/pom.xml index 2d9f3f1a13..0957cdf021 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 @@ jersey-container-servlet-core - javax.servlet - servlet-api - ${servlet2.version} + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} provided @@ -63,25 +63,10 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - 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 3d444d3348..4ec21a7b71 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 3128c55216..4477827079 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 @@ - javax.servlet - servlet-api - ${servlet2.version} + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} provided @@ -61,27 +61,11 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - - 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 66a91ee82e..d3fd6ca35b 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 560bfaedb9..7ae2df77f1 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 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-2.5-init-3/pom.xml b/tests/integration/servlet-2.5-init-3/pom.xml index 1959f65264..de06f0769e 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 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-2.5-init-4/pom.xml b/tests/integration/servlet-2.5-init-4/pom.xml index 29299f951e..8ed720ad9e 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 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-2.5-init-5/pom.xml b/tests/integration/servlet-2.5-init-5/pom.xml index 78dcd3b9fe..d61491121e 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 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-2.5-init-6/pom.xml b/tests/integration/servlet-2.5-init-6/pom.xml index 61fd9a917e..17b504e45a 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 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-2.5-init-7/pom.xml b/tests/integration/servlet-2.5-init-7/pom.xml index 11bf44fdbc..6273c001d9 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 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-2.5-init-8/pom.xml b/tests/integration/servlet-2.5-init-8/pom.xml index 9f6b6ed00b..071b8e12c5 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 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-2.5-reload/pom.xml b/tests/integration/servlet-2.5-reload/pom.xml index 67dc566939..1b49383018 100644 --- a/tests/integration/servlet-2.5-reload/pom.xml +++ b/tests/integration/servlet-2.5-reload/pom.xml @@ -54,25 +54,10 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-3-async/pom.xml b/tests/integration/servlet-3-async/pom.xml index 5c7e41bcf8..9f4f9fef9c 100644 --- a/tests/integration/servlet-3-async/pom.xml +++ b/tests/integration/servlet-3-async/pom.xml @@ -54,17 +54,9 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_async/AsyncServletResourceITCase.java - org/glassfish/jersey/tests/integration/servlet_3_async/AsyncTimeoutResourceITCase.java - - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin diff --git a/tests/integration/servlet-3-chunked-io/pom.xml b/tests/integration/servlet-3-chunked-io/pom.xml index bf16251a5d..7b4101f34f 100644 --- a/tests/integration/servlet-3-chunked-io/pom.xml +++ b/tests/integration/servlet-3-chunked-io/pom.xml @@ -63,15 +63,9 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_chunked_io/ChunkedInputOutputITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin diff --git a/tests/integration/servlet-3-filter/pom.xml b/tests/integration/servlet-3-filter/pom.xml index b23d7d97c7..a5c1e407a4 100644 --- a/tests/integration/servlet-3-filter/pom.xml +++ b/tests/integration/servlet-3-filter/pom.xml @@ -43,6 +43,11 @@ jersey-test-framework-provider-external test + + + com.sun.xml.bind + jaxb-osgi + @@ -54,61 +59,11 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - - - - - jdk11+ - - [11,) - - - - com.sun.xml.bind - jaxb-osgi - - - - - jdk8 - - 1.8 - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - org/glassfish/jersey/tests/integration/servlet_3_filter/MyResourceITCase.java - - - - - - - - diff --git a/tests/integration/servlet-3-inflector-1/pom.xml b/tests/integration/servlet-3-inflector-1/pom.xml index d469b152a4..9aba89a392 100644 --- a/tests/integration/servlet-3-inflector-1/pom.xml +++ b/tests/integration/servlet-3-inflector-1/pom.xml @@ -41,9 +41,9 @@ jersey-container-servlet - javax.servlet - javax.servlet-api - ${servlet3.version} + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} provided @@ -63,15 +63,9 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_inflector_1/InflectorInjectionTestITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin 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 3d2cd16d08..ed32a2344e 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 b7b0e2e22f..1df9546d43 100644 --- a/tests/integration/servlet-3-init-1/pom.xml +++ b/tests/integration/servlet-3-init-1/pom.xml @@ -54,15 +54,9 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_init_1/HelloWorldResourceITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin diff --git a/tests/integration/servlet-3-init-2/pom.xml b/tests/integration/servlet-3-init-2/pom.xml index 6f972dc8b3..f1d4d7e2c3 100644 --- a/tests/integration/servlet-3-init-2/pom.xml +++ b/tests/integration/servlet-3-init-2/pom.xml @@ -43,8 +43,6 @@ junit junit - 4.12 - compile @@ -63,15 +61,9 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_init_2/HelloWorldResourceITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin diff --git a/tests/integration/servlet-3-init-3/pom.xml b/tests/integration/servlet-3-init-3/pom.xml index dee672753e..b4c55aba68 100644 --- a/tests/integration/servlet-3-init-3/pom.xml +++ b/tests/integration/servlet-3-init-3/pom.xml @@ -37,12 +37,6 @@ org.glassfish.jersey.containers jersey-container-servlet - - javax.servlet - javax.servlet-api - ${servlet3.version} - provided - org.glassfish.jersey.test-framework.providers @@ -60,15 +54,9 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_init_3/EmptyApplicationTestITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin diff --git a/tests/integration/servlet-3-init-4/pom.xml b/tests/integration/servlet-3-init-4/pom.xml index 1ae5032eb9..72cb431904 100644 --- a/tests/integration/servlet-3-init-4/pom.xml +++ b/tests/integration/servlet-3-init-4/pom.xml @@ -40,12 +40,6 @@ org.glassfish.jersey.containers jersey-container-servlet - - javax.servlet - javax.servlet-api - ${servlet3.version} - provided - org.glassfish.jersey.test-framework.providers @@ -63,15 +57,9 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_init_4/EmptyApplicationTestITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin diff --git a/tests/integration/servlet-3-init-5/pom.xml b/tests/integration/servlet-3-init-5/pom.xml index 29c9254bba..1c73fb920f 100644 --- a/tests/integration/servlet-3-init-5/pom.xml +++ b/tests/integration/servlet-3-init-5/pom.xml @@ -38,13 +38,6 @@ org.glassfish.jersey.containers jersey-container-servlet - - javax.servlet - javax.servlet-api - ${servlet3.version} - provided - - org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-external @@ -61,15 +54,9 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_init_5/HelloWorldResourceITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin diff --git a/tests/integration/servlet-3-init-6/pom.xml b/tests/integration/servlet-3-init-6/pom.xml index f33dea38bd..a60e796038 100644 --- a/tests/integration/servlet-3-init-6/pom.xml +++ b/tests/integration/servlet-3-init-6/pom.xml @@ -38,12 +38,6 @@ org.glassfish.jersey.containers jersey-container-servlet - - javax.servlet - javax.servlet-api - ${servlet3.version} - provided - org.glassfish.jersey.test-framework.providers @@ -61,27 +55,10 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_init_6/EmptyApplicationITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-3-init-7/pom.xml b/tests/integration/servlet-3-init-7/pom.xml index 8bdcb7ab63..74566eac43 100644 --- a/tests/integration/servlet-3-init-7/pom.xml +++ b/tests/integration/servlet-3-init-7/pom.xml @@ -39,12 +39,6 @@ org.glassfish.jersey.containers jersey-container-servlet - - javax.servlet - javax.servlet-api - ${servlet3.version} - provided - org.glassfish.jersey.test-framework.providers @@ -62,27 +56,10 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - org/glassfish/jersey/tests/integration/servlet_3_init_7/HelloWorldResourceITCase.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-3-init-8/pom.xml b/tests/integration/servlet-3-init-8/pom.xml index 8552451a4a..1d1ece9899 100644 --- a/tests/integration/servlet-3-init-8/pom.xml +++ b/tests/integration/servlet-3-init-8/pom.xml @@ -56,25 +56,10 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-3-init-provider/pom.xml b/tests/integration/servlet-3-init-provider/pom.xml index 80ca2357da..76f9cd2340 100644 --- a/tests/integration/servlet-3-init-provider/pom.xml +++ b/tests/integration/servlet-3-init-provider/pom.xml @@ -62,13 +62,13 @@ maven-failsafe-plugin - - **/**/*.java + + **/**/HelloWorld3ResourceITCase.java - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin diff --git a/tests/integration/servlet-3-params/pom.xml b/tests/integration/servlet-3-params/pom.xml index 5f251cb5f7..512b462a63 100644 --- a/tests/integration/servlet-3-params/pom.xml +++ b/tests/integration/servlet-3-params/pom.xml @@ -38,9 +38,9 @@ jersey-container-servlet - javax.servlet - javax.servlet-api - ${servlet3.version} + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} provided @@ -60,25 +60,10 @@ org.apache.maven.plugins maven-failsafe-plugin - - - true - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - 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 a726339286..ae0c6723e7 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 7b8ec8d4ac..a282968542 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 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - **/**/*.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/integration/servlet-request-wrapper-binding/pom.xml b/tests/integration/servlet-request-wrapper-binding/pom.xml index e16f4cbc32..ff8323740a 100644 --- a/tests/integration/servlet-request-wrapper-binding/pom.xml +++ b/tests/integration/servlet-request-wrapper-binding/pom.xml @@ -66,27 +66,10 @@ org.apache.maven.plugins maven-failsafe-plugin - - - - **/**/*.java - - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - - - - jakarta.servlet - jakarta.servlet-api - ${servlet5.version} - - - - true - diff --git a/tests/jmockit/pom.xml b/tests/jmockit/pom.xml index 2feb71379e..9fba1f93df 100644 --- a/tests/jmockit/pom.xml +++ b/tests/jmockit/pom.xml @@ -45,6 +45,11 @@ jersey-media-multipart ${project.version} + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-bundle + pom + org.jmockit @@ -73,7 +78,6 @@ org.apache.maven.plugins maven-surefire-plugin - true -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar