diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml index 52930aaee6e..180b8213d9d 100644 --- a/containers/jetty-http/pom.xml +++ b/containers/jetty-http/pom.xml @@ -50,7 +50,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainer.java b/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainer.java index ec14d86068d..fb0b790b225 100644 --- a/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainer.java +++ b/containers/jetty-http/src/main/java/org/glassfish/jersey/jetty/JettyHttpContainer.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022 Contributors to the Eclipse Foundation * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -36,7 +37,6 @@ import jakarta.servlet.AsyncListener; import jakarta.ws.rs.core.Application; import jakarta.ws.rs.core.GenericType; -import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.SecurityContext; import jakarta.inject.Inject; @@ -198,7 +198,7 @@ private void setResponseForInvalidUri(final HttpServletResponse response, final if (configSetStatusOverSendError) { response.reset(); //noinspection deprecation - response.setStatus(BAD_REQUEST_STATUS.getStatusCode(), BAD_REQUEST_STATUS.getReasonPhrase()); + response.setStatus(BAD_REQUEST_STATUS.getStatusCode()); } else { response.sendError(BAD_REQUEST_STATUS.getStatusCode(), BAD_REQUEST_STATUS.getReasonPhrase()); } diff --git a/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/AbstractJettyServerTester.java b/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/AbstractJettyServerTester.java index e4314ae0592..255f4b34e14 100644 --- a/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/AbstractJettyServerTester.java +++ b/containers/jetty-http/src/test/java/org/glassfish/jersey/jetty/AbstractJettyServerTester.java @@ -82,7 +82,7 @@ public UriBuilder getUri() { return UriBuilder.fromUri("http://localhost").port(getPort()).path(CONTEXT); } - public void startServer(Class... resources) { + public void startServer(Class... resources) { ResourceConfig config = new ResourceConfig(resources); config.register(new LoggingFeature(LOGGER, LoggingFeature.Verbosity.PAYLOAD_ANY)); startServer(config); diff --git a/containers/jetty-servlet/pom.xml b/containers/jetty-servlet/pom.xml index 62d7adc8a32..aad11987274 100644 --- a/containers/jetty-servlet/pom.xml +++ b/containers/jetty-servlet/pom.xml @@ -46,7 +46,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} org.eclipse.jetty diff --git a/examples/bookstore-webapp/pom.xml b/examples/bookstore-webapp/pom.xml index 5cb689572f0..52d4199ca43 100644 --- a/examples/bookstore-webapp/pom.xml +++ b/examples/bookstore-webapp/pom.xml @@ -56,7 +56,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/examples/freemarker-webapp/pom.xml b/examples/freemarker-webapp/pom.xml index fb06cc05386..cee0d386388 100644 --- a/examples/freemarker-webapp/pom.xml +++ b/examples/freemarker-webapp/pom.xml @@ -40,7 +40,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/examples/helloworld-webapp/pom.xml b/examples/helloworld-webapp/pom.xml index 17d288b43c3..aecb50d4507 100644 --- a/examples/helloworld-webapp/pom.xml +++ b/examples/helloworld-webapp/pom.xml @@ -32,7 +32,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} diff --git a/examples/osgi-helloworld-webapp/war-bundle/pom.xml b/examples/osgi-helloworld-webapp/war-bundle/pom.xml index ccd3eaf6ad4..b789a5b8a69 100644 --- a/examples/osgi-helloworld-webapp/war-bundle/pom.xml +++ b/examples/osgi-helloworld-webapp/war-bundle/pom.xml @@ -57,7 +57,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/examples/osgi-http-service/bundle/pom.xml b/examples/osgi-http-service/bundle/pom.xml index efd62d4fa1b..08c440a609b 100644 --- a/examples/osgi-http-service/bundle/pom.xml +++ b/examples/osgi-http-service/bundle/pom.xml @@ -36,7 +36,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} org.glassfish.jersey.containers diff --git a/examples/servlet3-webapp/pom.xml b/examples/servlet3-webapp/pom.xml index ea52217633d..d44fe5a0d6d 100644 --- a/examples/servlet3-webapp/pom.xml +++ b/examples/servlet3-webapp/pom.xml @@ -37,7 +37,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/managed/ServerBootstrapPreinitialization.java b/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/managed/ServerBootstrapPreinitialization.java index c995f48fb78..826c52f8b8f 100644 --- a/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/managed/ServerBootstrapPreinitialization.java +++ b/incubator/cdi-inject-weld/src/main/java/org/glassfish/jersey/inject/weld/internal/managed/ServerBootstrapPreinitialization.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022 Contributors to the Eclipse Foundation * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -46,7 +47,6 @@ import org.glassfish.jersey.internal.inject.Binding; import org.glassfish.jersey.internal.inject.ClassBinding; import org.glassfish.jersey.internal.inject.ReferencingFactory; -import org.glassfish.jersey.internal.spi.AutoDiscoverable; import org.glassfish.jersey.internal.util.collection.Ref; import org.glassfish.jersey.model.internal.CommonConfig; import org.glassfish.jersey.model.internal.ComponentBag; @@ -230,31 +230,11 @@ public RequestDispatcher getNamedDispatcher(String name) { return null; } - @Override - public Servlet getServlet(String name) throws ServletException { - return null; - } - - @Override - public Enumeration getServlets() { - return null; - } - - @Override - public Enumeration getServletNames() { - return null; - } - @Override public void log(String msg) { } - @Override - public void log(Exception exception, String msg) { - - } - @Override public void log(String message, Throwable throwable) { diff --git a/pom.xml b/pom.xml index e37eba9579a..426ec8a58ba 100644 --- a/pom.xml +++ b/pom.xml @@ -1530,7 +1530,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet.version} + ${servlet6.version} @@ -2145,8 +2145,10 @@ 1.2.4 1.2.5 2.0.4 - 3.0.1 + 4.0.3 + 6.0.0 + 6.0.1 false 1.7.21 @@ -2168,7 +2170,7 @@ 3.0.0 4.0.0 - 3.0.1 + 4.0.0-M1 2.0.0 3.0.3 org.glassfish.hk2.*;version="[3.0,4)" @@ -2177,9 +2179,6 @@ 3.1.0 3.0.0 2.0.0 - 5.0.0 - 6.0.0 - 5.0.0 4.0.0 2.1.0 2.0.1 diff --git a/test-framework/core/pom.xml b/test-framework/core/pom.xml index eeb186a0c2c..cf14a948ad4 100644 --- a/test-framework/core/pom.xml +++ b/test-framework/core/pom.xml @@ -40,7 +40,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} org.glassfish.jersey.core diff --git a/tests/integration/j-441/war1/pom.xml b/tests/integration/j-441/war1/pom.xml index 822b8a6711d..5a1ebb5e72e 100644 --- a/tests/integration/j-441/war1/pom.xml +++ b/tests/integration/j-441/war1/pom.xml @@ -42,7 +42,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/j-441/war2/pom.xml b/tests/integration/j-441/war2/pom.xml index f13ec2f7bc9..fc0e19a7a6b 100644 --- a/tests/integration/j-441/war2/pom.xml +++ b/tests/integration/j-441/war2/pom.xml @@ -42,7 +42,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-1960/pom.xml b/tests/integration/jersey-1960/pom.xml index 9a1124f1bb1..73c7cf21313 100644 --- a/tests/integration/jersey-1960/pom.xml +++ b/tests/integration/jersey-1960/pom.xml @@ -36,7 +36,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-1964/pom.xml b/tests/integration/jersey-1964/pom.xml index e639fb95dd4..d54819dc911 100644 --- a/tests/integration/jersey-1964/pom.xml +++ b/tests/integration/jersey-1964/pom.xml @@ -48,7 +48,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-2031/pom.xml b/tests/integration/jersey-2031/pom.xml index 684455a8d6a..17764682004 100644 --- a/tests/integration/jersey-2031/pom.xml +++ b/tests/integration/jersey-2031/pom.xml @@ -46,7 +46,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-2160/pom.xml b/tests/integration/jersey-2160/pom.xml index e22af069b1c..5d2cc162960 100644 --- a/tests/integration/jersey-2160/pom.xml +++ b/tests/integration/jersey-2160/pom.xml @@ -36,7 +36,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-2176/pom.xml b/tests/integration/jersey-2176/pom.xml index 84d8735037f..ce80a2e71eb 100644 --- a/tests/integration/jersey-2176/pom.xml +++ b/tests/integration/jersey-2176/pom.xml @@ -41,7 +41,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-2184/pom.xml b/tests/integration/jersey-2184/pom.xml index 5e635ea194d..0599984b6a9 100644 --- a/tests/integration/jersey-2184/pom.xml +++ b/tests/integration/jersey-2184/pom.xml @@ -42,7 +42,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-2637/pom.xml b/tests/integration/jersey-2637/pom.xml index c20582d8fcf..5d6d2b983b4 100644 --- a/tests/integration/jersey-2637/pom.xml +++ b/tests/integration/jersey-2637/pom.xml @@ -38,7 +38,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-2673/pom.xml b/tests/integration/jersey-2673/pom.xml index 8c23d2391df..bcd11d5ab4c 100644 --- a/tests/integration/jersey-2673/pom.xml +++ b/tests/integration/jersey-2673/pom.xml @@ -53,7 +53,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-2689/pom.xml b/tests/integration/jersey-2689/pom.xml index 1780f966c14..cf66de835d3 100644 --- a/tests/integration/jersey-2689/pom.xml +++ b/tests/integration/jersey-2689/pom.xml @@ -81,7 +81,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-2704/pom.xml b/tests/integration/jersey-2704/pom.xml index cb57dc86e65..c804bee61d0 100644 --- a/tests/integration/jersey-2704/pom.xml +++ b/tests/integration/jersey-2704/pom.xml @@ -48,7 +48,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-3796/pom.xml b/tests/integration/jersey-3796/pom.xml index 4bbaf5f7396..5eca63fe282 100644 --- a/tests/integration/jersey-3796/pom.xml +++ b/tests/integration/jersey-3796/pom.xml @@ -47,7 +47,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/jersey-4722/pom.xml b/tests/integration/jersey-4722/pom.xml index f13e71c3699..43fabebd762 100644 --- a/tests/integration/jersey-4722/pom.xml +++ b/tests/integration/jersey-4722/pom.xml @@ -39,13 +39,11 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 - ${project.version} org.glassfish.jersey.media diff --git a/tests/integration/servlet-2.5-inflector-1/pom.xml b/tests/integration/servlet-2.5-inflector-1/pom.xml index 0c4a305309d..b8af7662a95 100644 --- a/tests/integration/servlet-2.5-inflector-1/pom.xml +++ b/tests/integration/servlet-2.5-inflector-1/pom.xml @@ -43,7 +43,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-2.5-init-1/pom.xml b/tests/integration/servlet-2.5-init-1/pom.xml index 54f437b6c97..04e2cc9ef72 100644 --- a/tests/integration/servlet-2.5-init-1/pom.xml +++ b/tests/integration/servlet-2.5-init-1/pom.xml @@ -36,7 +36,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-2.5-mvc-1/pom.xml b/tests/integration/servlet-2.5-mvc-1/pom.xml index ddf4d532ecf..63892cdb20b 100644 --- a/tests/integration/servlet-2.5-mvc-1/pom.xml +++ b/tests/integration/servlet-2.5-mvc-1/pom.xml @@ -57,7 +57,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-2.5-mvc-2/pom.xml b/tests/integration/servlet-2.5-mvc-2/pom.xml index 7e8cd2117be..cf3515d7a11 100644 --- a/tests/integration/servlet-2.5-mvc-2/pom.xml +++ b/tests/integration/servlet-2.5-mvc-2/pom.xml @@ -57,7 +57,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-2.5-mvc-3/pom.xml b/tests/integration/servlet-2.5-mvc-3/pom.xml index 83bf515a132..32d989dda22 100644 --- a/tests/integration/servlet-2.5-mvc-3/pom.xml +++ b/tests/integration/servlet-2.5-mvc-3/pom.xml @@ -57,7 +57,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-3-inflector-1/pom.xml b/tests/integration/servlet-3-inflector-1/pom.xml index af1d92971ed..95bb384d1f1 100644 --- a/tests/integration/servlet-3-inflector-1/pom.xml +++ b/tests/integration/servlet-3-inflector-1/pom.xml @@ -43,7 +43,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-3-init-9/pom.xml b/tests/integration/servlet-3-init-9/pom.xml index 209e822aa16..bddea9f108d 100644 --- a/tests/integration/servlet-3-init-9/pom.xml +++ b/tests/integration/servlet-3-init-9/pom.xml @@ -42,7 +42,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-3-init-provider/pom.xml b/tests/integration/servlet-3-init-provider/pom.xml index 0406650fc5f..07459d7b757 100644 --- a/tests/integration/servlet-3-init-provider/pom.xml +++ b/tests/integration/servlet-3-init-provider/pom.xml @@ -40,7 +40,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-3-params/pom.xml b/tests/integration/servlet-3-params/pom.xml index 48177f9a876..967c2d07ac2 100644 --- a/tests/integration/servlet-3-params/pom.xml +++ b/tests/integration/servlet-3-params/pom.xml @@ -40,7 +40,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-4.0-mvc-1/pom.xml b/tests/integration/servlet-4.0-mvc-1/pom.xml index ec38922587a..2aa24919af2 100644 --- a/tests/integration/servlet-4.0-mvc-1/pom.xml +++ b/tests/integration/servlet-4.0-mvc-1/pom.xml @@ -49,7 +49,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} jakarta.xml.bind @@ -85,12 +84,11 @@ org.eclipse.jetty jetty-maven-plugin - jakarta.servlet jakarta.servlet-api - ${servlet5.version} + ${servlet6.version} diff --git a/tests/integration/servlet-request-wrapper-binding-2/pom.xml b/tests/integration/servlet-request-wrapper-binding-2/pom.xml index b1d32dec3e5..e5440a0817e 100644 --- a/tests/integration/servlet-request-wrapper-binding-2/pom.xml +++ b/tests/integration/servlet-request-wrapper-binding-2/pom.xml @@ -40,7 +40,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} + ${servlet6.version} provided 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 86017ec1911..e152f646f33 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 @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022 Contributors to the Eclipse Foundation * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -39,6 +40,7 @@ import jakarta.servlet.AsyncContext; import jakarta.servlet.DispatcherType; import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.ServletInputStream; @@ -290,16 +292,6 @@ public String encodeRedirectURL(String s) { return getHttpServletResponse().encodeRedirectURL(s); } - @Override - public String encodeUrl(String s) { - return getHttpServletResponse().encodeUrl(s); - } - - @Override - public String encodeRedirectUrl(String s) { - return getHttpServletResponse().encodeRedirectUrl(s); - } - @Override public void sendError(int i, String s) throws IOException { getHttpServletResponse().sendError(i, s); @@ -330,14 +322,17 @@ public void setHeader(String h, String v) { getHttpServletResponse().setHeader(h, v); } + @Override public Collection getHeaderNames() { return getHttpServletResponse().getHeaderNames(); } + @Override public Collection getHeaders(String s) { return getHttpServletResponse().getHeaders(s); } + @Override public String getHeader(String s) { return getHttpServletResponse().getHeader(s); } @@ -367,11 +362,6 @@ public int getStatus() { return getHttpServletResponse().getStatus(); } - @Override - public void setStatus(int i, String s) { - getHttpServletResponse().setStatus(i, s); - } - @Override public String getCharacterEncoding() { return getHttpServletResponse().getCharacterEncoding(); @@ -500,6 +490,22 @@ private HttpServletResponse finalWrap(final HttpServletResponse response) { private abstract static class MyHttpServletRequestImpl implements HttpServletRequest { + @Override + public String getRequestId() { + return getHttpServletRequest().getRequestId(); + } + + @Override + public String getProtocolRequestId() { + return getHttpServletRequest().getProtocolRequestId(); + } + + @Override + public ServletConnection getServletConnection() { + return getHttpServletRequest().getServletConnection(); + } + + @Override public String getAuthType() { return getHttpServletRequest().getAuthType(); @@ -657,11 +663,6 @@ public boolean isRequestedSessionIdFromURL() { return getHttpServletRequest().isRequestedSessionIdFromURL(); } - @Override - public boolean isRequestedSessionIdFromUrl() { - return getHttpServletRequest().isRequestedSessionIdFromUrl(); - } - @Override public Object getAttribute(String s) { return getHttpServletRequest().getAttribute(s); @@ -782,11 +783,6 @@ public RequestDispatcher getRequestDispatcher(String s) { return getHttpServletRequest().getRequestDispatcher(s); } - @Override - public String getRealPath(String s) { - return getHttpServletRequest().getRealPath(s); - } - @Override public int getRemotePort() { return getHttpServletRequest().getRemotePort(); diff --git a/tests/integration/servlet-request-wrapper-binding/pom.xml b/tests/integration/servlet-request-wrapper-binding/pom.xml index e47b2739981..375227a8d25 100644 --- a/tests/integration/servlet-request-wrapper-binding/pom.xml +++ b/tests/integration/servlet-request-wrapper-binding/pom.xml @@ -40,7 +40,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/integration/servlet-tests/pom.xml b/tests/integration/servlet-tests/pom.xml index b7a2eb5e70f..329b1b57263 100644 --- a/tests/integration/servlet-tests/pom.xml +++ b/tests/integration/servlet-tests/pom.xml @@ -36,7 +36,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} + ${servlet6.version} provided 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 c92c5bf34b8..77337b8ffc9 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 - ${servlet5.version} + ${servlet6.version} provided diff --git a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml index af0c7e3aa31..459badbace3 100644 --- a/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml +++ b/tests/mem-leaks/redeployment/redeployment-threadlocals-app/pom.xml @@ -106,7 +106,6 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} provided diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml index b72e906079c..eb31c6b6aaa 100644 --- a/tests/osgi/functional/pom.xml +++ b/tests/osgi/functional/pom.xml @@ -275,7 +275,7 @@ jakarta.servlet jakarta.servlet-api - ${servlet5.version} + ${servlet6.version} test