diff --git a/bundles/jaxrs-ri/pom.xml b/bundles/jaxrs-ri/pom.xml index 13fdd00dd9..8d384ea6b4 100644 --- a/bundles/jaxrs-ri/pom.xml +++ b/bundles/jaxrs-ri/pom.xml @@ -182,7 +182,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided @@ -278,9 +278,9 @@ jersey.repackaged.org.objectweb.asm.*;version=${project.version} jakarta.servlet jakarta.servlet-api - 4.0.3 + ${servlet5.version} @@ -81,7 +81,7 @@ - javax.servlet.*;version="[3.0,6.0)", + jakarta.servlet.*;version="[5.0,6.0)", * diff --git a/containers/grizzly2-servlet/src/main/java/org/glassfish/jersey/grizzly2/servlet/GrizzlyWebContainerFactory.java b/containers/grizzly2-servlet/src/main/java/org/glassfish/jersey/grizzly2/servlet/GrizzlyWebContainerFactory.java index 1eb0bde634..a77a3857b3 100644 --- a/containers/grizzly2-servlet/src/main/java/org/glassfish/jersey/grizzly2/servlet/GrizzlyWebContainerFactory.java +++ b/containers/grizzly2-servlet/src/main/java/org/glassfish/jersey/grizzly2/servlet/GrizzlyWebContainerFactory.java @@ -20,7 +20,7 @@ import java.net.URI; import java.util.Map; -import javax.servlet.Servlet; +import jakarta.servlet.Servlet; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.servlet.ServletContainer; diff --git a/containers/jersey-servlet-core/pom.xml b/containers/jersey-servlet-core/pom.xml index 35bcdd9bad..da491c428e 100644 --- a/containers/jersey-servlet-core/pom.xml +++ b/containers/jersey-servlet-core/pom.xml @@ -36,7 +36,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletContainer.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletContainer.java index 701fceb135..af78da10c7 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletContainer.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletContainer.java @@ -30,16 +30,16 @@ import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriBuilderException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -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.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.internal.inject.Providers; import org.glassfish.jersey.internal.util.ExtendedLogger; @@ -475,19 +475,19 @@ public ServletContext getServletContext() { * to the client. * @param chain the chain of filters from which the next filter can be invoked. * @throws java.io.IOException in case of an I/O error. - * @throws javax.servlet.ServletException in case of an error while executing the + * @throws jakarta.servlet.ServletException in case of an error while executing the * filter chain. */ public void doFilter(final HttpServletRequest request, final HttpServletResponse response, final FilterChain chain) throws IOException, ServletException { - if (request.getAttribute("javax.servlet.include.request_uri") != null) { - final String includeRequestURI = (String) request.getAttribute("javax.servlet.include.request_uri"); + if (request.getAttribute("jakarta.servlet.include.request_uri") != null) { + final String includeRequestURI = (String) request.getAttribute("jakarta.servlet.include.request_uri"); if (!includeRequestURI.equals(request.getRequestURI())) { doFilter(request, response, chain, includeRequestURI, - (String) request.getAttribute("javax.servlet.include.servlet_path"), - (String) request.getAttribute("javax.servlet.include.query_string")); + (String) request.getAttribute("jakarta.servlet.include.servlet_path"), + (String) request.getAttribute("jakarta.servlet.include.query_string")); return; } } diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletPropertiesDelegate.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletPropertiesDelegate.java index 7a17521dd0..3aa2b55161 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletPropertiesDelegate.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/ServletPropertiesDelegate.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.Collections; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.glassfish.jersey.internal.PropertiesDelegate; diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebAppResourcesScanner.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebAppResourcesScanner.java index f80464a1d2..ded3acc920 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebAppResourcesScanner.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebAppResourcesScanner.java @@ -23,7 +23,7 @@ import java.util.NoSuchElementException; import java.util.Set; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.glassfish.jersey.server.internal.AbstractResourceFinderAdapter; import org.glassfish.jersey.server.internal.scanning.JarFileScanner; diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebComponent.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebComponent.java index ac56596e46..3aaf7582f6 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebComponent.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebComponent.java @@ -47,12 +47,12 @@ import jakarta.inject.Inject; import jakarta.inject.Provider; import jakarta.inject.Singleton; -import javax.servlet.FilterConfig; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.internal.ServiceFinderBinder; import org.glassfish.jersey.internal.inject.AbstractBinder; diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebConfig.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebConfig.java index bb469c63dd..d5d7c3dc3e 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebConfig.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebConfig.java @@ -18,9 +18,9 @@ import java.util.Enumeration; -import javax.servlet.FilterConfig; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; /** * The Web configuration for accessing initialization parameters of a Web diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebFilterConfig.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebFilterConfig.java index d375b85c47..9c3112cef7 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebFilterConfig.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebFilterConfig.java @@ -18,9 +18,9 @@ import java.util.Enumeration; -import javax.servlet.FilterConfig; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; /** * A filter based web config. Delegates all invocations to the filter diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebServletConfig.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebServletConfig.java index 5c2a7a7ff3..0fb3c291b1 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebServletConfig.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/WebServletConfig.java @@ -18,9 +18,9 @@ import java.util.Enumeration; -import javax.servlet.FilterConfig; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; /** * A servlet based web config. Delegates all invocations to the servlet diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/PersistenceUnitBinder.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/PersistenceUnitBinder.java index 4527f4fc9c..04910f0ba5 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/PersistenceUnitBinder.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/PersistenceUnitBinder.java @@ -26,7 +26,7 @@ import jakarta.inject.Singleton; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.PersistenceUnit; -import javax.servlet.ServletConfig; +import jakarta.servlet.ServletConfig; import org.glassfish.jersey.internal.inject.AbstractBinder; import org.glassfish.jersey.internal.inject.Injectee; diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java index 4a54e3344f..0db4e76a77 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/ResponseWriter.java @@ -31,7 +31,7 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.server.ContainerException; import org.glassfish.jersey.server.ContainerResponse; diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/Utils.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/Utils.java index 0794beb717..755bc85a72 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/Utils.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/Utils.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.glassfish.jersey.server.ResourceConfig; diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/ExtendedServletContainerProvider.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/ExtendedServletContainerProvider.java index 73e42c7264..4318cc02d7 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/ExtendedServletContainerProvider.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/ExtendedServletContainerProvider.java @@ -16,8 +16,8 @@ package org.glassfish.jersey.servlet.internal.spi; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.spi.RequestScopedInitializer; diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/NoOpServletContainerProvider.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/NoOpServletContainerProvider.java index 2da1b4b009..3b29bc3674 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/NoOpServletContainerProvider.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/NoOpServletContainerProvider.java @@ -21,10 +21,10 @@ import jakarta.ws.rs.core.GenericType; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.internal.util.collection.Ref; import org.glassfish.jersey.server.ResourceConfig; diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/RequestContextProvider.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/RequestContextProvider.java index 792a3a8d3c..12b6d32ec1 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/RequestContextProvider.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/RequestContextProvider.java @@ -16,8 +16,8 @@ package org.glassfish.jersey.servlet.internal.spi; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Provide access to the actual servlet request/response. diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/ServletContainerProvider.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/ServletContainerProvider.java index 628e4baef5..35452bc5b3 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/ServletContainerProvider.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/internal/spi/ServletContainerProvider.java @@ -18,10 +18,10 @@ import java.util.Set; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.spi.RequestScopedInitializer; diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/spi/AsyncContextDelegateProvider.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/spi/AsyncContextDelegateProvider.java index 944b4ce3ef..3879f0b91a 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/spi/AsyncContextDelegateProvider.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/spi/AsyncContextDelegateProvider.java @@ -16,8 +16,8 @@ package org.glassfish.jersey.servlet.spi; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Factory to create {@link AsyncContextDelegate} to deal with asynchronous diff --git a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/spi/FilterUrlMappingsProvider.java b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/spi/FilterUrlMappingsProvider.java index d8c1c0ce74..521e2721a4 100644 --- a/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/spi/FilterUrlMappingsProvider.java +++ b/containers/jersey-servlet-core/src/main/java/org/glassfish/jersey/servlet/spi/FilterUrlMappingsProvider.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.servlet.spi; -import javax.servlet.FilterConfig; +import jakarta.servlet.FilterConfig; import java.util.List; /** diff --git a/containers/jersey-servlet/pom.xml b/containers/jersey-servlet/pom.xml index 5a1676e0f1..50ad885973 100644 --- a/containers/jersey-servlet/pom.xml +++ b/containers/jersey-servlet/pom.xml @@ -36,7 +36,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided @@ -78,7 +78,7 @@ - javax.servlet.*;version="[3.0,6.0)", + jakarta.servlet.*;version="[5.0,6.0)", ${jakarta.annotation.osgi.version}, * diff --git a/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/async/AsyncContextDelegateProviderImpl.java b/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/async/AsyncContextDelegateProviderImpl.java index cb60bafb54..96e8168547 100644 --- a/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/async/AsyncContextDelegateProviderImpl.java +++ b/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/async/AsyncContextDelegateProviderImpl.java @@ -21,9 +21,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.AsyncContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.servlet.init.internal.LocalizationMessages; import org.glassfish.jersey.servlet.spi.AsyncContextDelegate; diff --git a/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/FilterUrlMappingsProviderImpl.java b/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/FilterUrlMappingsProviderImpl.java index 072820c2fe..5a15d5eb0b 100644 --- a/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/FilterUrlMappingsProviderImpl.java +++ b/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/FilterUrlMappingsProviderImpl.java @@ -18,8 +18,8 @@ import org.glassfish.jersey.servlet.spi.FilterUrlMappingsProvider; -import javax.servlet.FilterConfig; -import javax.servlet.FilterRegistration; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.FilterRegistration; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/JerseyServletContainerInitializer.java b/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/JerseyServletContainerInitializer.java index 032b4a9c61..731c62c6a1 100644 --- a/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/JerseyServletContainerInitializer.java +++ b/containers/jersey-servlet/src/main/java/org/glassfish/jersey/servlet/init/JerseyServletContainerInitializer.java @@ -32,12 +32,12 @@ import jakarta.ws.rs.core.Application; import jakarta.ws.rs.ext.Provider; -import javax.servlet.Registration; -import javax.servlet.ServletContainerInitializer; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; -import javax.servlet.annotation.HandlesTypes; +import jakarta.servlet.Registration; +import jakarta.servlet.ServletContainerInitializer; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.annotation.HandlesTypes; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; diff --git a/containers/jetty-servlet/pom.xml b/containers/jetty-servlet/pom.xml index 6e1b06919a..c318d6b019 100644 --- a/containers/jetty-servlet/pom.xml +++ b/containers/jetty-servlet/pom.xml @@ -54,6 +54,12 @@ org.eclipse.jetty jetty-webapp + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + diff --git a/containers/jetty-servlet/src/main/java/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java b/containers/jetty-servlet/src/main/java/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java index dd585ce49a..72a4547751 100644 --- a/containers/jetty-servlet/src/main/java/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java +++ b/containers/jetty-servlet/src/main/java/org/glassfish/jersey/jetty/servlet/JettyWebContainerFactory.java @@ -19,7 +19,7 @@ import java.net.URI; import java.util.Map; -import javax.servlet.Servlet; +import jakarta.servlet.Servlet; import org.glassfish.jersey.jetty.JettyHttpContainerFactory; import org.glassfish.jersey.servlet.ServletContainer; diff --git a/containers/pom.xml b/containers/pom.xml index 2363cd4e68..69128aaf8b 100644 --- a/containers/pom.xml +++ b/containers/pom.xml @@ -41,7 +41,8 @@ jersey-servlet-core jersey-servlet jetty-http - jetty-servlet + + netty-http simple-http diff --git a/examples/helloworld-webapp/pom.xml b/examples/helloworld-webapp/pom.xml index 99ec0b351e..8e878a4e45 100644 --- a/examples/helloworld-webapp/pom.xml +++ b/examples/helloworld-webapp/pom.xml @@ -32,7 +32,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} diff --git a/examples/https-server-glassfish/src/main/java/org/glassfish/jersey/examples/https/glassfish/resources/HelloWorldResource.java b/examples/https-server-glassfish/src/main/java/org/glassfish/jersey/examples/https/glassfish/resources/HelloWorldResource.java index a4dec509ac..3240d99e43 100644 --- a/examples/https-server-glassfish/src/main/java/org/glassfish/jersey/examples/https/glassfish/resources/HelloWorldResource.java +++ b/examples/https-server-glassfish/src/main/java/org/glassfish/jersey/examples/https/glassfish/resources/HelloWorldResource.java @@ -17,7 +17,7 @@ import jakarta.ws.rs.core.Response; import jakarta.annotation.security.RolesAllowed; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * The JAX-RS resource class will be hosted at the URI path {@code "/helloworld"}. diff --git a/ext/mvc-freemarker/pom.xml b/ext/mvc-freemarker/pom.xml index e746ed746c..61225449f3 100644 --- a/ext/mvc-freemarker/pom.xml +++ b/ext/mvc-freemarker/pom.xml @@ -66,7 +66,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided diff --git a/ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerDefaultConfigurationFactory.java b/ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerDefaultConfigurationFactory.java index 7ec7fed4b6..a97d22372c 100644 --- a/ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerDefaultConfigurationFactory.java +++ b/ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerDefaultConfigurationFactory.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import freemarker.cache.ClassTemplateLoader; import freemarker.cache.FileTemplateLoader; @@ -52,7 +52,8 @@ public FreemarkerDefaultConfigurationFactory(ServletContext servletContext) { // Create different loaders. final List loaders = new ArrayList<>(); if (servletContext != null) { - loaders.add(new WebappTemplateLoader(servletContext)); + //todo fix after jakartification + //loaders.add(new WebappTemplateLoader(servletContext)); } loaders.add(new ClassTemplateLoader(FreemarkerDefaultConfigurationFactory.class, "/")); try { diff --git a/ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerViewProcessor.java b/ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerViewProcessor.java index 9a4fb8c786..a3e3eae761 100644 --- a/ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerViewProcessor.java +++ b/ext/mvc-freemarker/src/main/java/org/glassfish/jersey/server/mvc/freemarker/FreemarkerViewProcessor.java @@ -28,7 +28,7 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.inject.Inject; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.glassfish.jersey.internal.inject.InjectionManager; import org.glassfish.jersey.internal.util.collection.Values; diff --git a/ext/mvc-jsp/pom.xml b/ext/mvc-jsp/pom.xml index d249733306..1d6f453563 100644 --- a/ext/mvc-jsp/pom.xml +++ b/ext/mvc-jsp/pom.xml @@ -84,7 +84,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided diff --git a/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/Include.java b/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/Include.java index 60cedc0e65..127ff7cb1a 100644 --- a/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/Include.java +++ b/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/Include.java @@ -19,13 +19,13 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import jakarta.servlet.jsp.JspContext; import jakarta.servlet.jsp.JspException; import jakarta.servlet.jsp.PageContext; diff --git a/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/JspTemplateProcessor.java b/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/JspTemplateProcessor.java index 89dcf85cb3..7baf6f5776 100644 --- a/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/JspTemplateProcessor.java +++ b/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/JspTemplateProcessor.java @@ -28,13 +28,13 @@ import jakarta.inject.Inject; import jakarta.inject.Provider; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import org.glassfish.jersey.internal.util.collection.Ref; import org.glassfish.jersey.message.internal.TracingLogger; diff --git a/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/RequestDispatcherWrapper.java b/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/RequestDispatcherWrapper.java index 761ba90723..a31400a319 100644 --- a/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/RequestDispatcherWrapper.java +++ b/ext/mvc-jsp/src/main/java/org/glassfish/jersey/server/mvc/jsp/RequestDispatcherWrapper.java @@ -18,10 +18,10 @@ import java.io.IOException; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; import org.glassfish.jersey.server.mvc.spi.ResolvedViewable; diff --git a/ext/mvc-mustache/src/main/java/org/glassfish/jersey/server/mvc/mustache/MustacheTemplateProcessor.java b/ext/mvc-mustache/src/main/java/org/glassfish/jersey/server/mvc/mustache/MustacheTemplateProcessor.java index be49f2ad33..fc0838035f 100644 --- a/ext/mvc-mustache/src/main/java/org/glassfish/jersey/server/mvc/mustache/MustacheTemplateProcessor.java +++ b/ext/mvc-mustache/src/main/java/org/glassfish/jersey/server/mvc/mustache/MustacheTemplateProcessor.java @@ -28,7 +28,7 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.glassfish.jersey.internal.inject.InjectionManager; import org.glassfish.jersey.server.mvc.Viewable; diff --git a/ext/mvc/pom.xml b/ext/mvc/pom.xml index 46fc1af017..48ec5beb7c 100644 --- a/ext/mvc/pom.xml +++ b/ext/mvc/pom.xml @@ -37,7 +37,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} diff --git a/ext/mvc/src/main/java/org/glassfish/jersey/server/mvc/spi/AbstractTemplateProcessor.java b/ext/mvc/src/main/java/org/glassfish/jersey/server/mvc/spi/AbstractTemplateProcessor.java index b8ae2f9791..b20c86ac4c 100644 --- a/ext/mvc/src/main/java/org/glassfish/jersey/server/mvc/spi/AbstractTemplateProcessor.java +++ b/ext/mvc/src/main/java/org/glassfish/jersey/server/mvc/spi/AbstractTemplateProcessor.java @@ -43,7 +43,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.glassfish.jersey.internal.util.PropertiesHelper; import org.glassfish.jersey.internal.util.ReflectionHelper; diff --git a/ext/servlet-portability/pom.xml b/ext/servlet-portability/pom.xml index 67641eb33c..bc2b4d5947 100644 --- a/ext/servlet-portability/pom.xml +++ b/ext/servlet-portability/pom.xml @@ -70,7 +70,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided diff --git a/ext/servlet-portability/src/main/java/org/glassfish/jersey/servlet/portability/PortableServletContainer.java b/ext/servlet-portability/src/main/java/org/glassfish/jersey/servlet/portability/PortableServletContainer.java index 4af5008859..c37cdf25ec 100644 --- a/ext/servlet-portability/src/main/java/org/glassfish/jersey/servlet/portability/PortableServletContainer.java +++ b/ext/servlet-portability/src/main/java/org/glassfish/jersey/servlet/portability/PortableServletContainer.java @@ -21,15 +21,15 @@ import java.util.Enumeration; import java.util.HashMap; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.Servlet; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -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.Servlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * Jersey Servlet/Filter class that can be referenced in web.xml instead of Jersey 1.x specific diff --git a/pom.xml b/pom.xml index ef1b8f3bc9..576b8c9883 100644 --- a/pom.xml +++ b/pom.xml @@ -2075,7 +2075,7 @@ 2.3.27-incubating 1.9.59 1.16 - 2.4.4 + 3.0.0-M1 18.0 1.3 1.0.3 @@ -2113,7 +2113,7 @@ 2.4 3.0.1 4.0.3 - + 5.0.0-M1 6.0.1 false 1.7.21 diff --git a/test-framework/core/pom.xml b/test-framework/core/pom.xml index 644a4cd5c9..d7720711ea 100644 --- a/test-framework/core/pom.xml +++ b/test-framework/core/pom.xml @@ -46,7 +46,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} org.glassfish.jersey.core diff --git a/test-framework/core/src/main/java/org/glassfish/jersey/test/ServletDeploymentContext.java b/test-framework/core/src/main/java/org/glassfish/jersey/test/ServletDeploymentContext.java index d106a0758f..ca87db49ea 100644 --- a/test-framework/core/src/main/java/org/glassfish/jersey/test/ServletDeploymentContext.java +++ b/test-framework/core/src/main/java/org/glassfish/jersey/test/ServletDeploymentContext.java @@ -28,16 +28,16 @@ import jakarta.ws.rs.core.Application; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.ServletContextAttributeListener; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletRequestAttributeListener; -import javax.servlet.ServletRequestListener; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpSessionActivationListener; -import javax.servlet.http.HttpSessionAttributeListener; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.ServletContextAttributeListener; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletRequestAttributeListener; +import jakarta.servlet.ServletRequestListener; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpSessionActivationListener; +import jakarta.servlet.http.HttpSessionAttributeListener; +import jakarta.servlet.http.HttpSessionListener; import org.glassfish.jersey.server.ServerProperties; import org.glassfish.jersey.servlet.ServletContainer; diff --git a/test-framework/providers/grizzly2/pom.xml b/test-framework/providers/grizzly2/pom.xml index e103278353..54b4aa57c0 100644 --- a/test-framework/providers/grizzly2/pom.xml +++ b/test-framework/providers/grizzly2/pom.xml @@ -36,7 +36,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} diff --git a/test-framework/providers/grizzly2/src/main/java/org/glassfish/jersey/test/grizzly/GrizzlyWebTestContainerFactory.java b/test-framework/providers/grizzly2/src/main/java/org/glassfish/jersey/test/grizzly/GrizzlyWebTestContainerFactory.java index d239d6a927..5d929939af 100644 --- a/test-framework/providers/grizzly2/src/main/java/org/glassfish/jersey/test/grizzly/GrizzlyWebTestContainerFactory.java +++ b/test-framework/providers/grizzly2/src/main/java/org/glassfish/jersey/test/grizzly/GrizzlyWebTestContainerFactory.java @@ -29,10 +29,10 @@ import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.core.UriBuilder; -import javax.servlet.DispatcherType; -import javax.servlet.FilterRegistration; -import javax.servlet.ServletRegistration; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.http.HttpServlet; import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpContainer; @@ -201,7 +201,7 @@ private void instantiateGrizzlyWebServer() { private EnumSet grizzlyDispatcherTypes(final Set dispatcherTypes) { final Set grizzlyDispatcherTypes = new HashSet<>(); - for (final javax.servlet.DispatcherType servletDispatchType : dispatcherTypes) { + for (final jakarta.servlet.DispatcherType servletDispatchType : dispatcherTypes) { grizzlyDispatcherTypes.add(DispatcherType.valueOf(servletDispatchType.name())); } return EnumSet.copyOf(grizzlyDispatcherTypes); diff --git a/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyRequestDispatchFilterTest.java b/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyRequestDispatchFilterTest.java index 071c008453..d7c04646b0 100644 --- a/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyRequestDispatchFilterTest.java +++ b/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyRequestDispatchFilterTest.java @@ -23,14 +23,14 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.client.WebTarget; -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; import org.glassfish.jersey.server.ServerProperties; import org.glassfish.jersey.servlet.ServletContainer; @@ -190,9 +190,9 @@ public String get() { protected DeploymentContext configureDeployment() { return ServletDeploymentContext.forServlet(RequestDispatcherServlet.class) .addFilter(ForwardFilter.class, "forwardFilter", - EnumSet.of(javax.servlet.DispatcherType.FORWARD)) + EnumSet.of(jakarta.servlet.DispatcherType.FORWARD)) .addFilter(IncludeFilter.class, "includeFilter", - EnumSet.of(javax.servlet.DispatcherType.INCLUDE)) + EnumSet.of(jakarta.servlet.DispatcherType.INCLUDE)) .addFilter(RegularFilter.class, "regularFilter") .initParam(ServerProperties.PROVIDER_PACKAGES, this.getClass().getPackage().getName()) .build(); diff --git a/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyWebInjectionTest.java b/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyWebInjectionTest.java index 86c94781e0..e959498e25 100644 --- a/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyWebInjectionTest.java +++ b/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyWebInjectionTest.java @@ -21,10 +21,10 @@ import jakarta.ws.rs.core.Context; import jakarta.inject.Singleton; -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.server.ResourceConfig; import org.glassfish.jersey.server.ServerProperties; diff --git a/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyWebServletAndFilterTest.java b/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyWebServletAndFilterTest.java index f212cce0cc..76d46c307f 100644 --- a/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyWebServletAndFilterTest.java +++ b/test-framework/providers/grizzly2/src/test/java/org/glassfish/jersey/test/grizzly/web/GrizzlyWebServletAndFilterTest.java @@ -22,14 +22,14 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.client.WebTarget; -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; import org.glassfish.jersey.server.ServerProperties; import org.glassfish.jersey.servlet.ServletContainer; diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/mvc/spi/AbstractTemplateProcessorTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/mvc/spi/AbstractTemplateProcessorTest.java index 92020cc025..780022257f 100644 --- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/mvc/spi/AbstractTemplateProcessorTest.java +++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/mvc/spi/AbstractTemplateProcessorTest.java @@ -28,7 +28,7 @@ import jakarta.ws.rs.core.Response; import jakarta.inject.Inject; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.glassfish.jersey.internal.inject.InjectionManager; import org.glassfish.jersey.internal.util.collection.Value; diff --git a/tests/integration/async-jersey-filter/pom.xml b/tests/integration/async-jersey-filter/pom.xml index 2f23dd8710..233b2e133a 100644 --- a/tests/integration/async-jersey-filter/pom.xml +++ b/tests/integration/async-jersey-filter/pom.xml @@ -49,7 +49,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided @@ -63,10 +63,28 @@ 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 jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2812/TestFilter.java b/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2812/TestFilter.java index 2946229c1f..ccfe4542da 100644 --- a/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2812/TestFilter.java +++ b/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2812/TestFilter.java @@ -21,12 +21,12 @@ import java.util.concurrent.CountDownLatch; import java.util.logging.Logger; -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; /** * This servlet filter class provides a means to detect whether Jersey (in servlet filter based setup) properly freed the diff --git a/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2812/TestWaitResource.java b/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2812/TestWaitResource.java index 2bddc5fab3..e219d2972e 100644 --- a/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2812/TestWaitResource.java +++ b/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2812/TestWaitResource.java @@ -34,7 +34,7 @@ import jakarta.ws.rs.core.Context; import jakarta.inject.Singleton; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * This resource provides a way to reproduce JERSEY-2818. diff --git a/tests/integration/async-jersey-filter/src/test/java/org/glassfish/jersey/tests/integration/jersey2812/Jersey2812ITCase.java b/tests/integration/async-jersey-filter/src/test/java/org/glassfish/jersey/tests/integration/jersey2812/Jersey2812ITCase.java index 2e325c989e..6a2430cf7e 100644 --- a/tests/integration/async-jersey-filter/src/test/java/org/glassfish/jersey/tests/integration/jersey2812/Jersey2812ITCase.java +++ b/tests/integration/async-jersey-filter/src/test/java/org/glassfish/jersey/tests/integration/jersey2812/Jersey2812ITCase.java @@ -26,9 +26,9 @@ import jakarta.ws.rs.container.AsyncResponse; import jakarta.ws.rs.core.Response; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.glassfish.jersey.internal.guava.ThreadFactoryBuilder; import org.glassfish.jersey.tests.integration.async.AbstractAsyncJerseyTest; diff --git a/tests/integration/cdi-integration/cdi-multimodule/war1/pom.xml b/tests/integration/cdi-integration/cdi-multimodule/war1/pom.xml index fe69280cd0..0f66389395 100644 --- a/tests/integration/cdi-integration/cdi-multimodule/war1/pom.xml +++ b/tests/integration/cdi-integration/cdi-multimodule/war1/pom.xml @@ -40,7 +40,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided diff --git a/tests/integration/ejb-test-webapp/pom.xml b/tests/integration/ejb-test-webapp/pom.xml index 7d02faa99d..bdcc35d2a2 100644 --- a/tests/integration/ejb-test-webapp/pom.xml +++ b/tests/integration/ejb-test-webapp/pom.xml @@ -40,7 +40,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided diff --git a/tests/integration/ejb-test-webapp/src/main/java/org/glassfish/jersey/tests/ejb/resources/StandaloneServlet.java b/tests/integration/ejb-test-webapp/src/main/java/org/glassfish/jersey/tests/ejb/resources/StandaloneServlet.java index 5012db34e3..59967dd906 100644 --- a/tests/integration/ejb-test-webapp/src/main/java/org/glassfish/jersey/tests/ejb/resources/StandaloneServlet.java +++ b/tests/integration/ejb-test-webapp/src/main/java/org/glassfish/jersey/tests/ejb/resources/StandaloneServlet.java @@ -20,11 +20,11 @@ import jakarta.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Standalone Servlet instance that has nothing to do with Jersey. diff --git a/tests/integration/jaxrs-component-inject/pom.xml b/tests/integration/jaxrs-component-inject/pom.xml index 9f74a22df9..b63a72b850 100644 --- a/tests/integration/jaxrs-component-inject/pom.xml +++ b/tests/integration/jaxrs-component-inject/pom.xml @@ -52,10 +52,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/jaxrs/inject/ApplicationInjectITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-1107/pom.xml b/tests/integration/jersey-1107/pom.xml index b9def79dda..9293f2e6e8 100644 --- a/tests/integration/jersey-1107/pom.xml +++ b/tests/integration/jersey-1107/pom.xml @@ -54,10 +54,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey1107/ApplicationHandlerITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-1223/pom.xml b/tests/integration/jersey-1223/pom.xml index aa2710e94b..c62ab6fb72 100644 --- a/tests/integration/jersey-1223/pom.xml +++ b/tests/integration/jersey-1223/pom.xml @@ -56,10 +56,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey1223/ApplicationHandlerITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-1604/pom.xml b/tests/integration/jersey-1604/pom.xml index 07d099fb7a..b5ca758247 100644 --- a/tests/integration/jersey-1604/pom.xml +++ b/tests/integration/jersey-1604/pom.xml @@ -59,10 +59,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey1604/ConnectionCloseITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-1667/pom.xml b/tests/integration/jersey-1667/pom.xml index dd680eb616..952aeb74a5 100644 --- a/tests/integration/jersey-1667/pom.xml +++ b/tests/integration/jersey-1667/pom.xml @@ -65,10 +65,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey1667/Jersey1667ITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-1829/pom.xml b/tests/integration/jersey-1829/pom.xml index 3ed7ce4b4d..dba6213a2f 100644 --- a/tests/integration/jersey-1829/pom.xml +++ b/tests/integration/jersey-1829/pom.xml @@ -56,10 +56,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey1829/ApplicationHandlerITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-1960/pom.xml b/tests/integration/jersey-1960/pom.xml index 50f77bb8b7..384abb7064 100644 --- a/tests/integration/jersey-1960/pom.xml +++ b/tests/integration/jersey-1960/pom.xml @@ -61,10 +61,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey1960/Jersey1960ITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-1964/pom.xml b/tests/integration/jersey-1964/pom.xml index 1e66b643aa..d85e039f3c 100644 --- a/tests/integration/jersey-1964/pom.xml +++ b/tests/integration/jersey-1964/pom.xml @@ -72,6 +72,17 @@ org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2031/pom.xml b/tests/integration/jersey-2031/pom.xml index aed9b01bd1..93eaa08b98 100644 --- a/tests/integration/jersey-2031/pom.xml +++ b/tests/integration/jersey-2031/pom.xml @@ -75,6 +75,17 @@ org.eclipse.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + org.apache.maven.plugins diff --git a/tests/integration/jersey-2160/pom.xml b/tests/integration/jersey-2160/pom.xml index a4874fd17d..25f7b87966 100644 --- a/tests/integration/jersey-2160/pom.xml +++ b/tests/integration/jersey-2160/pom.xml @@ -61,10 +61,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey2160/Jersey2160ITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2164/pom.xml b/tests/integration/jersey-2164/pom.xml index 80cdd71160..60b6f9ee66 100644 --- a/tests/integration/jersey-2164/pom.xml +++ b/tests/integration/jersey-2164/pom.xml @@ -58,10 +58,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey2164/Jersey2164ITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2167/pom.xml b/tests/integration/jersey-2167/pom.xml index 7178e9a333..1ac3908256 100644 --- a/tests/integration/jersey-2167/pom.xml +++ b/tests/integration/jersey-2167/pom.xml @@ -54,10 +54,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey2167/Jersey2167ITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2176/pom.xml b/tests/integration/jersey-2176/pom.xml index c2b6b754ff..2a60a5c75c 100644 --- a/tests/integration/jersey-2176/pom.xml +++ b/tests/integration/jersey-2176/pom.xml @@ -72,6 +72,17 @@ org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2184/pom.xml b/tests/integration/jersey-2184/pom.xml index 186ca215b8..4e79ee355d 100644 --- a/tests/integration/jersey-2184/pom.xml +++ b/tests/integration/jersey-2184/pom.xml @@ -72,6 +72,17 @@ org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2255/pom.xml b/tests/integration/jersey-2255/pom.xml index aba1738ddb..e85d3c48bc 100644 --- a/tests/integration/jersey-2255/pom.xml +++ b/tests/integration/jersey-2255/pom.xml @@ -62,10 +62,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey2255/Jersey2255ITCase.java + + org.mortbay.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 e20dc368af..991205f34c 100644 --- a/tests/integration/jersey-2322/pom.xml +++ b/tests/integration/jersey-2322/pom.xml @@ -72,6 +72,17 @@ org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2335/pom.xml b/tests/integration/jersey-2335/pom.xml index 369936819a..3b8b09f5bf 100644 --- a/tests/integration/jersey-2335/pom.xml +++ b/tests/integration/jersey-2335/pom.xml @@ -58,10 +58,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey2335/Jersey2335ITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2551/pom.xml b/tests/integration/jersey-2551/pom.xml index aa3b167550..65b006739f 100644 --- a/tests/integration/jersey-2551/pom.xml +++ b/tests/integration/jersey-2551/pom.xml @@ -54,10 +54,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey2551/Jersey2551ITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2612/pom.xml b/tests/integration/jersey-2612/pom.xml index a7f2fc01a9..406a28fd99 100644 --- a/tests/integration/jersey-2612/pom.xml +++ b/tests/integration/jersey-2612/pom.xml @@ -59,10 +59,27 @@ org.apache.maven.plugins maven-failsafe-plugin + + + + org/glassfish/jersey/tests/integration/jersey2612/Jersey2612ITCase.java + + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2637/pom.xml b/tests/integration/jersey-2637/pom.xml index 994c5a8cd7..a3e11686c1 100644 --- a/tests/integration/jersey-2637/pom.xml +++ b/tests/integration/jersey-2637/pom.xml @@ -63,10 +63,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2654/pom.xml b/tests/integration/jersey-2654/pom.xml index a1604569ee..29d26fd67f 100644 --- a/tests/integration/jersey-2654/pom.xml +++ b/tests/integration/jersey-2654/pom.xml @@ -53,10 +53,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2704/pom.xml b/tests/integration/jersey-2704/pom.xml index 3e1c27e288..784d0529c9 100644 --- a/tests/integration/jersey-2704/pom.xml +++ b/tests/integration/jersey-2704/pom.xml @@ -56,10 +56,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-2704/src/main/java/org/glassfish/jersey/tests/integration/jersey2704/ServiceLocatorSetup.java b/tests/integration/jersey-2704/src/main/java/org/glassfish/jersey/tests/integration/jersey2704/ServiceLocatorSetup.java index 3eb8be85ea..f2f48ac947 100644 --- a/tests/integration/jersey-2704/src/main/java/org/glassfish/jersey/tests/integration/jersey2704/ServiceLocatorSetup.java +++ b/tests/integration/jersey-2704/src/main/java/org/glassfish/jersey/tests/integration/jersey2704/ServiceLocatorSetup.java @@ -16,8 +16,8 @@ package org.glassfish.jersey.tests.integration.jersey2704; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.utilities.ServiceLocatorUtilities; diff --git a/tests/integration/jersey-2892/pom.xml b/tests/integration/jersey-2892/pom.xml index cd785c10a9..cbb0b94597 100644 --- a/tests/integration/jersey-2892/pom.xml +++ b/tests/integration/jersey-2892/pom.xml @@ -72,12 +72,24 @@ org/glassfish/jersey/tests/integration/jersey2892/Jersey2892JacksonITCase.java + org/glassfish/jersey/tests/integration/jersey2892/J605MoxyITCase.java org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-3796/pom.xml b/tests/integration/jersey-3796/pom.xml index 7a7ebd09a7..ccfc136a7c 100644 --- a/tests/integration/jersey-3796/pom.xml +++ b/tests/integration/jersey-3796/pom.xml @@ -78,6 +78,17 @@ org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/jersey-780/pom.xml b/tests/integration/jersey-780/pom.xml index a35e8b0930..82e0e3a7a9 100644 --- a/tests/integration/jersey-780/pom.xml +++ b/tests/integration/jersey-780/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/security-digest/pom.xml b/tests/integration/security-digest/pom.xml index f762ea36ad..17f3572ea1 100644 --- a/tests/integration/security-digest/pom.xml +++ b/tests/integration/security-digest/pom.xml @@ -56,12 +56,17 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + true diff --git a/tests/integration/servlet-2.5-autodiscovery-1/pom.xml b/tests/integration/servlet-2.5-autodiscovery-1/pom.xml index e3374e5e5b..670dff9cc8 100644 --- a/tests/integration/servlet-2.5-autodiscovery-1/pom.xml +++ b/tests/integration/servlet-2.5-autodiscovery-1/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-2.5-autodiscovery-2/pom.xml b/tests/integration/servlet-2.5-autodiscovery-2/pom.xml index d8a441edb2..8baa0bb722 100644 --- a/tests/integration/servlet-2.5-autodiscovery-2/pom.xml +++ b/tests/integration/servlet-2.5-autodiscovery-2/pom.xml @@ -59,10 +59,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + 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 6ff0853926..92878941c4 100644 --- a/tests/integration/servlet-2.5-filter/pom.xml +++ b/tests/integration/servlet-2.5-filter/pom.xml @@ -58,10 +58,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-2.5-inflector-1/pom.xml b/tests/integration/servlet-2.5-inflector-1/pom.xml index 07bad24bbe..2d9f3f1a13 100644 --- a/tests/integration/servlet-2.5-inflector-1/pom.xml +++ b/tests/integration/servlet-2.5-inflector-1/pom.xml @@ -63,10 +63,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-2.5-init-1/pom.xml b/tests/integration/servlet-2.5-init-1/pom.xml index 208c67789c..3128c55216 100644 --- a/tests/integration/servlet-2.5-init-1/pom.xml +++ b/tests/integration/servlet-2.5-init-1/pom.xml @@ -61,10 +61,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-2.5-init-2/pom.xml b/tests/integration/servlet-2.5-init-2/pom.xml index 4f69c088f1..560bfaedb9 100644 --- a/tests/integration/servlet-2.5-init-2/pom.xml +++ b/tests/integration/servlet-2.5-init-2/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.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 e0bc1eed3a..1959f65264 100644 --- a/tests/integration/servlet-2.5-init-3/pom.xml +++ b/tests/integration/servlet-2.5-init-3/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.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 d1b6b53617..29299f951e 100644 --- a/tests/integration/servlet-2.5-init-4/pom.xml +++ b/tests/integration/servlet-2.5-init-4/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.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 8582a8e967..78dcd3b9fe 100644 --- a/tests/integration/servlet-2.5-init-5/pom.xml +++ b/tests/integration/servlet-2.5-init-5/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.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 e227bbbb8e..61fd9a917e 100644 --- a/tests/integration/servlet-2.5-init-6/pom.xml +++ b/tests/integration/servlet-2.5-init-6/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.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 3a9ddfc62b..11bf44fdbc 100644 --- a/tests/integration/servlet-2.5-init-7/pom.xml +++ b/tests/integration/servlet-2.5-init-7/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.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 bb6d6a6a53..9f6b6ed00b 100644 --- a/tests/integration/servlet-2.5-init-8/pom.xml +++ b/tests/integration/servlet-2.5-init-8/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-2.5-mvc-1/pom.xml b/tests/integration/servlet-2.5-mvc-1/pom.xml index 6aa2ffd079..7f7f710bda 100644 --- a/tests/integration/servlet-2.5-mvc-1/pom.xml +++ b/tests/integration/servlet-2.5-mvc-1/pom.xml @@ -70,9 +70,7 @@ maven-failsafe-plugin - - org/glassfish/jersey/tests/integration/servlet_25_mvc_1/ItemITCase.java - + true diff --git a/tests/integration/servlet-2.5-mvc-2/pom.xml b/tests/integration/servlet-2.5-mvc-2/pom.xml index 3588f30578..1f04c0e6b4 100644 --- a/tests/integration/servlet-2.5-mvc-2/pom.xml +++ b/tests/integration/servlet-2.5-mvc-2/pom.xml @@ -68,6 +68,10 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty diff --git a/tests/integration/servlet-2.5-reload/pom.xml b/tests/integration/servlet-2.5-reload/pom.xml index 6688dbb3c6..67dc566939 100644 --- a/tests/integration/servlet-2.5-reload/pom.xml +++ b/tests/integration/servlet-2.5-reload/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-3-filter/pom.xml b/tests/integration/servlet-3-filter/pom.xml index c5bfca1e36..b23d7d97c7 100644 --- a/tests/integration/servlet-3-filter/pom.xml +++ b/tests/integration/servlet-3-filter/pom.xml @@ -54,10 +54,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-3-init-6/pom.xml b/tests/integration/servlet-3-init-6/pom.xml index 2e4455cafe..f33dea38bd 100644 --- a/tests/integration/servlet-3-init-6/pom.xml +++ b/tests/integration/servlet-3-init-6/pom.xml @@ -71,6 +71,17 @@ org.mortbay.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 2aed4f3db2..8bdcb7ab63 100644 --- a/tests/integration/servlet-3-init-7/pom.xml +++ b/tests/integration/servlet-3-init-7/pom.xml @@ -72,6 +72,17 @@ org.mortbay.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 caa38ca096..8552451a4a 100644 --- a/tests/integration/servlet-3-init-8/pom.xml +++ b/tests/integration/servlet-3-init-8/pom.xml @@ -58,15 +58,23 @@ maven-failsafe-plugin - - org/glassfish/jersey/tests/integration/servlet_3_init_8/HelloWorldResourceITCase.java - org/glassfish/jersey/tests/integration/servlet_3_init_8/HelloWorldUnreachableResourceITCase.java - + true org.mortbay.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 a2e78e2b8b..61f88363f4 100644 --- a/tests/integration/servlet-3-init-provider/pom.xml +++ b/tests/integration/servlet-3-init-provider/pom.xml @@ -44,7 +44,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided diff --git a/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld5Resource.java b/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld5Resource.java index fcfae414ed..e11b5f572e 100644 --- a/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld5Resource.java +++ b/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/HelloWorld5Resource.java @@ -16,7 +16,7 @@ package org.glassfish.jersey.tests.integration.servlet_3_init_provider; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Context; diff --git a/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestFilter.java b/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestFilter.java index 1ee7dbd465..80991ec06f 100644 --- a/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestFilter.java +++ b/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestFilter.java @@ -18,13 +18,13 @@ 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 javax.servlet.http.HttpServletRequest; +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; /** * This is just test purpose {@link Filter servlet filter} implementation to demonstrate how to register filter for any Jersey diff --git a/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestServletContainerProvider.java b/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestServletContainerProvider.java index 241c166112..5a2605c2e9 100644 --- a/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestServletContainerProvider.java +++ b/tests/integration/servlet-3-init-provider/src/main/java/org/glassfish/jersey/tests/integration/servlet_3_init_provider/TestServletContainerProvider.java @@ -19,9 +19,9 @@ import java.util.EnumSet; import java.util.Set; -import javax.servlet.DispatcherType; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.internal.spi.RequestScopedInitializerProvider; diff --git a/tests/integration/servlet-3-params/pom.xml b/tests/integration/servlet-3-params/pom.xml index dd1a4221c7..5f251cb5f7 100644 --- a/tests/integration/servlet-3-params/pom.xml +++ b/tests/integration/servlet-3-params/pom.xml @@ -60,10 +60,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-request-wrapper-binding-2/pom.xml b/tests/integration/servlet-request-wrapper-binding-2/pom.xml index 773279e04e..5340baeaae 100644 --- a/tests/integration/servlet-request-wrapper-binding-2/pom.xml +++ b/tests/integration/servlet-request-wrapper-binding-2/pom.xml @@ -44,7 +44,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided @@ -80,6 +80,17 @@ org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseInjectedResource.java b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseInjectedResource.java index 5aaa744aa2..011f7ce27d 100644 --- a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseInjectedResource.java +++ b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseInjectedResource.java @@ -20,10 +20,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Context; diff --git a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseInjectedSingletonResource.java b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseInjectedSingletonResource.java index 6dfa16eb43..61ca93ef45 100644 --- a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseInjectedSingletonResource.java +++ b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseInjectedSingletonResource.java @@ -17,10 +17,10 @@ package org.glassfish.jersey.tests.integration.servlet_request_wrapper_binding2; import jakarta.inject.Singleton; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Context; diff --git a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java index 4496477764..86017ec191 100644 --- a/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java +++ b/tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java @@ -31,27 +31,27 @@ import java.util.Set; import java.util.function.Supplier; -import javax.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.HttpUpgradeHandler; import jakarta.ws.rs.core.GenericType; import jakarta.inject.Inject; import jakarta.inject.Provider; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.HttpSession; -import javax.servlet.http.Part; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.Part; import org.glassfish.jersey.inject.hk2.DelayedHk2InjectionManager; import org.glassfish.jersey.inject.hk2.ImmediateHk2InjectionManager; diff --git a/tests/integration/servlet-request-wrapper-binding/pom.xml b/tests/integration/servlet-request-wrapper-binding/pom.xml index ef9e05b923..8b97ff6981 100644 --- a/tests/integration/servlet-request-wrapper-binding/pom.xml +++ b/tests/integration/servlet-request-wrapper-binding/pom.xml @@ -44,7 +44,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided @@ -80,6 +80,17 @@ org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-request-wrapper-binding/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding/RequestResponseInjectedResource.java b/tests/integration/servlet-request-wrapper-binding/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding/RequestResponseInjectedResource.java index 836a77d634..0f4237ac41 100644 --- a/tests/integration/servlet-request-wrapper-binding/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding/RequestResponseInjectedResource.java +++ b/tests/integration/servlet-request-wrapper-binding/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding/RequestResponseInjectedResource.java @@ -16,8 +16,8 @@ package org.glassfish.jersey.tests.integration.servlet_request_wrapper_binding; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; diff --git a/tests/integration/servlet-request-wrapper-binding/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding/RequestResponseWrapperProvider.java b/tests/integration/servlet-request-wrapper-binding/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding/RequestResponseWrapperProvider.java index 28a18bf5d1..31b7305627 100644 --- a/tests/integration/servlet-request-wrapper-binding/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding/RequestResponseWrapperProvider.java +++ b/tests/integration/servlet-request-wrapper-binding/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding/RequestResponseWrapperProvider.java @@ -16,10 +16,10 @@ package org.glassfish.jersey.tests.integration.servlet_request_wrapper_binding; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import org.glassfish.jersey.internal.util.collection.Ref; import org.glassfish.jersey.server.spi.RequestScopedInitializer; diff --git a/tests/integration/servlet-tests/pom.xml b/tests/integration/servlet-tests/pom.xml index 0bc6955006..056304b12d 100644 --- a/tests/integration/servlet-tests/pom.xml +++ b/tests/integration/servlet-tests/pom.xml @@ -36,7 +36,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} @@ -60,10 +60,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.eclipse.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/servlet-tests/src/main/java/org/glassfish/jersey/tests/integration/servlettests/FormConsumptionFilter.java b/tests/integration/servlet-tests/src/main/java/org/glassfish/jersey/tests/integration/servlettests/FormConsumptionFilter.java index bda0d3a8b8..e77fddea4f 100644 --- a/tests/integration/servlet-tests/src/main/java/org/glassfish/jersey/tests/integration/servlettests/FormConsumptionFilter.java +++ b/tests/integration/servlet-tests/src/main/java/org/glassfish/jersey/tests/integration/servlettests/FormConsumptionFilter.java @@ -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 Martin Matula diff --git a/tests/integration/servlet-tests/src/main/java/org/glassfish/jersey/tests/integration/servlettests/SuppressContentLengthFilter.java b/tests/integration/servlet-tests/src/main/java/org/glassfish/jersey/tests/integration/servlettests/SuppressContentLengthFilter.java index 11f1ff2620..4d9fb9390c 100644 --- a/tests/integration/servlet-tests/src/main/java/org/glassfish/jersey/tests/integration/servlettests/SuppressContentLengthFilter.java +++ b/tests/integration/servlet-tests/src/main/java/org/glassfish/jersey/tests/integration/servlettests/SuppressContentLengthFilter.java @@ -16,14 +16,14 @@ 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 javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +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.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; /** * JERSEY-2936 reproducer filter. diff --git a/tests/integration/sonar-test/pom.xml b/tests/integration/sonar-test/pom.xml index cccb8f85f1..97ebb71333 100644 --- a/tests/integration/sonar-test/pom.xml +++ b/tests/integration/sonar-test/pom.xml @@ -56,10 +56,25 @@ org.apache.maven.plugins maven-failsafe-plugin + + + true + org.mortbay.jetty jetty-maven-plugin + + + + jakarta.servlet + jakarta.servlet-api + ${servlet5.version} + + + + true + diff --git a/tests/integration/tracing-support/pom.xml b/tests/integration/tracing-support/pom.xml index 46a50b086f..939314e753 100644 --- a/tests/integration/tracing-support/pom.xml +++ b/tests/integration/tracing-support/pom.xml @@ -70,6 +70,7 @@ org.mortbay.jetty jetty-maven-plugin + true 16192 diff --git a/tests/jmockit/pom.xml b/tests/jmockit/pom.xml index 9a9ad20d4f..a4dbf10a20 100644 --- a/tests/jmockit/pom.xml +++ b/tests/jmockit/pom.xml @@ -80,6 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin + true -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar diff --git a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml index 9277bf8e98..4eb3e3ec29 100644 --- a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml +++ b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml @@ -125,7 +125,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided diff --git a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/src/main/java/org/glassfish/jersey/tests/memleaks/nojersey/MyServlet.java b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/src/main/java/org/glassfish/jersey/tests/memleaks/nojersey/MyServlet.java index 033c357112..5c97796699 100644 --- a/tests/mem-leaks/redeployment/redeployment-no-jersey-app/src/main/java/org/glassfish/jersey/tests/memleaks/nojersey/MyServlet.java +++ b/tests/mem-leaks/redeployment/redeployment-no-jersey-app/src/main/java/org/glassfish/jersey/tests/memleaks/nojersey/MyServlet.java @@ -22,10 +22,10 @@ import org.glassfish.hk2.api.ServiceLocatorFactory; import org.glassfish.hk2.utilities.binding.AbstractBinder; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml index 2582477e09..6d53134106 100644 --- a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml +++ b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml @@ -106,7 +106,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet4.version} + ${servlet5.version} provided diff --git a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/src/main/java/org/glassfish/jersey/tests/memleaks/threadlocal/ThreadLocalMemoryLeakServlet.java b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/src/main/java/org/glassfish/jersey/tests/memleaks/threadlocal/ThreadLocalMemoryLeakServlet.java index 790e743b28..cb0cebbbd4 100644 --- a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/src/main/java/org/glassfish/jersey/tests/memleaks/threadlocal/ThreadLocalMemoryLeakServlet.java +++ b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/src/main/java/org/glassfish/jersey/tests/memleaks/threadlocal/ThreadLocalMemoryLeakServlet.java @@ -18,10 +18,10 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * A servlet that introduces a memory leak with a single call. All the classes loaded by current classloader won't get GCed even