This is an automated email from the ASF dual-hosted git repository. bonampak pushed a commit to branch feature/jakarta-jetty-upgrade in repository https://gitbox.apache.org/repos/asf/knox.git
commit b3282973abea3f573e3db3fb133f30d25edd921f Author: bonampak <[email protected]> AuthorDate: Wed Mar 11 13:58:08 2026 +0100 KNOX-3238: updating jakarta-servlet-api to 6.0.0 and jetty ee9 to ee10. --- gateway-provider-identity-assertion-common/pom.xml | 4 +- .../function/UsernameFunctionProcessorTest.java | 6 +-- gateway-provider-identity-assertion-concat/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- gateway-provider-identity-assertion-pseudo/pom.xml | 4 +- gateway-provider-identity-assertion-regex/pom.xml | 4 +- gateway-provider-jersey/pom.xml | 4 +- .../pom.xml | 4 +- .../impl/ServiceRegistryFunctionsTest.java | 6 +-- gateway-provider-rewrite/pom.xml | 4 +- .../filter/rewrite/impl/UrlRewriteResponse.java | 12 ----- .../api/UrlRewriteServletContextListenerTest.java | 6 +-- .../rewrite/api/UrlRewriteServletFilterTest.java | 6 +-- .../impl/FrontendFunctionProcessorTest.java | 10 ++-- gateway-provider-security-webappsec/pom.xml | 4 +- gateway-server/pom.xml | 32 ++++++------- .../service/knoxtoken/ServletContextWrapper.java | 55 ++++++++++++++-------- gateway-test-release/pom.xml | 28 +++++------ gateway-test-utils/pom.xml | 4 +- .../main/java/org/apache/knox/test/TestUtils.java | 2 +- .../knox/test/mock/MockHttpServletRequest.java | 28 ++++++----- .../knox/test/mock/MockHttpServletResponse.java | 16 ------- .../java/org/apache/knox/test/mock/MockServer.java | 5 +- .../apache/knox/test/mock/MockServletContext.java | 19 -------- gateway-test/pom.xml | 4 +- pom.xml | 38 +++++++-------- 27 files changed, 144 insertions(+), 173 deletions(-) diff --git a/gateway-provider-identity-assertion-common/pom.xml b/gateway-provider-identity-assertion-common/pom.xml index c891ed878..9c4b680d7 100644 --- a/gateway-provider-identity-assertion-common/pom.xml +++ b/gateway-provider-identity-assertion-common/pom.xml @@ -131,8 +131,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java index f3f4a7471..1f6b86804 100644 --- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java +++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java @@ -28,9 +28,9 @@ import org.apache.knox.test.TestUtils; import org.apache.knox.test.mock.MockInteraction; import org.apache.knox.test.mock.MockServlet; import org.apache.http.auth.BasicUserPrincipal; -import org.eclipse.jetty.ee9.servlet.FilterHolder; -import org.eclipse.jetty.ee9.servlet.ServletHolder; -import org.eclipse.jetty.ee9.servlet.ServletTester; +import org.eclipse.jetty.ee10.servlet.FilterHolder; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.ServletTester; import org.eclipse.jetty.http.HttpTester; import org.hamcrest.core.Is; import org.junit.After; diff --git a/gateway-provider-identity-assertion-concat/pom.xml b/gateway-provider-identity-assertion-concat/pom.xml index c1906b21b..adedcc0b0 100644 --- a/gateway-provider-identity-assertion-concat/pom.xml +++ b/gateway-provider-identity-assertion-concat/pom.xml @@ -59,8 +59,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> diff --git a/gateway-provider-identity-assertion-hadoop-groups/pom.xml b/gateway-provider-identity-assertion-hadoop-groups/pom.xml index e941b363b..12e5dbe32 100644 --- a/gateway-provider-identity-assertion-hadoop-groups/pom.xml +++ b/gateway-provider-identity-assertion-hadoop-groups/pom.xml @@ -73,8 +73,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/gateway-provider-identity-assertion-no-doas/pom.xml b/gateway-provider-identity-assertion-no-doas/pom.xml index 10ee112c3..b34388b0d 100644 --- a/gateway-provider-identity-assertion-no-doas/pom.xml +++ b/gateway-provider-identity-assertion-no-doas/pom.xml @@ -74,8 +74,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> diff --git a/gateway-provider-identity-assertion-pseudo/pom.xml b/gateway-provider-identity-assertion-pseudo/pom.xml index 0b7f24acd..4ca21c710 100644 --- a/gateway-provider-identity-assertion-pseudo/pom.xml +++ b/gateway-provider-identity-assertion-pseudo/pom.xml @@ -68,8 +68,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> diff --git a/gateway-provider-identity-assertion-regex/pom.xml b/gateway-provider-identity-assertion-regex/pom.xml index 482d18d6f..5579d971a 100644 --- a/gateway-provider-identity-assertion-regex/pom.xml +++ b/gateway-provider-identity-assertion-regex/pom.xml @@ -60,8 +60,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> diff --git a/gateway-provider-jersey/pom.xml b/gateway-provider-jersey/pom.xml index 9398f2185..b71951455 100644 --- a/gateway-provider-jersey/pom.xml +++ b/gateway-provider-jersey/pom.xml @@ -84,8 +84,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/gateway-provider-rewrite-func-service-registry/pom.xml b/gateway-provider-rewrite-func-service-registry/pom.xml index 39e2989e1..6947315e8 100644 --- a/gateway-provider-rewrite-func-service-registry/pom.xml +++ b/gateway-provider-rewrite-func-service-registry/pom.xml @@ -90,8 +90,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java index 78737aadc..434cff3eb 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java @@ -29,9 +29,9 @@ import org.apache.knox.test.TestUtils; import org.apache.knox.test.mock.MockInteraction; import org.apache.knox.test.mock.MockServlet; import org.easymock.EasyMock; -import org.eclipse.jetty.ee9.servlet.FilterHolder; -import org.eclipse.jetty.ee9.servlet.ServletHolder; -import org.eclipse.jetty.ee9.servlet.ServletTester; +import org.eclipse.jetty.ee10.servlet.FilterHolder; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.ServletTester; import org.eclipse.jetty.http.HttpTester; import org.hamcrest.core.Is; import org.junit.Test; diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml index 985f183c1..9592a60f7 100644 --- a/gateway-provider-rewrite/pom.xml +++ b/gateway-provider-rewrite/pom.xml @@ -165,8 +165,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java index 889b74be6..09fe39815 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java @@ -313,24 +313,12 @@ public class UrlRewriteResponse extends GatewayResponseWrapper implements Params } } - @Override - @SuppressWarnings("deprecation") - public String encodeUrl( String url ) { - return this.encodeURL( url ); - } - //TODO: Route these through the rewriter. @Override public String encodeURL(String url ) { throw new UnsupportedOperationException(); } - @Override - @SuppressWarnings("deprecation") - public String encodeRedirectUrl( String url ) { - return this.encodeRedirectURL( url ); - } - //TODO: Route these through the rewriter. @Override public String encodeRedirectURL(String url ) { diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java index fa5f07c5d..90221db88 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java @@ -19,9 +19,9 @@ package org.apache.knox.gateway.filter.rewrite.api; import org.apache.knox.test.mock.MockInteraction; import org.apache.knox.test.mock.MockServlet; -import org.eclipse.jetty.ee9.servlet.FilterHolder; -import org.eclipse.jetty.ee9.servlet.ServletHolder; -import org.eclipse.jetty.ee9.servlet.ServletTester; +import org.eclipse.jetty.ee10.servlet.FilterHolder; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.ServletTester; import org.junit.After; import org.junit.Before; diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java index ee89c7aab..cdc540f9b 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java @@ -25,9 +25,9 @@ import org.apache.knox.test.mock.MockInteraction; import org.apache.knox.test.mock.MockServlet; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpTester; -import org.eclipse.jetty.ee9.servlet.FilterHolder; -import org.eclipse.jetty.ee9.servlet.ServletHolder; -import org.eclipse.jetty.ee9.servlet.ServletTester; +import org.eclipse.jetty.ee10.servlet.FilterHolder; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.ServletTester; import org.junit.After; import org.junit.Test; diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java index 81aff49ee..f226f1de2 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java @@ -33,9 +33,9 @@ import org.apache.knox.test.mock.MockInteraction; import org.apache.knox.test.mock.MockServlet; import org.apache.http.auth.BasicUserPrincipal; import org.easymock.EasyMock; -import org.eclipse.jetty.ee9.servlet.FilterHolder; -import org.eclipse.jetty.ee9.servlet.ServletHolder; -import org.eclipse.jetty.ee9.servlet.ServletTester; +import org.eclipse.jetty.ee10.servlet.FilterHolder; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.ServletTester; import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.util.Attributes; import org.eclipse.jetty.util.AttributesMap; @@ -140,8 +140,8 @@ public class FrontendFunctionProcessorTest { server.getContext().setInitParameter( UrlRewriteServletContextListener.DESCRIPTOR_LOCATION_INIT_PARAM_NAME, descriptorUrl ); - if( attributes != null ) { - server.getContext().setAttributes( attributes ); + if (attributes != null ) { + attributes.asAttributeMap().forEach((key, value) -> server.getContext().setAttribute(key, value)); } server.getContext().setAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE, "test-cluster" ); server.getContext().setAttribute( GatewayServices.GATEWAY_SERVICES_ATTRIBUTE, mockGatewayServices ); diff --git a/gateway-provider-security-webappsec/pom.xml b/gateway-provider-security-webappsec/pom.xml index 1d1b2eb7c..6bb3d0a94 100644 --- a/gateway-provider-security-webappsec/pom.xml +++ b/gateway-provider-security-webappsec/pom.xml @@ -58,8 +58,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlets</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlets</artifactId> </dependency> <dependency> diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml index f81b16656..5a4104da2 100644 --- a/gateway-server/pom.xml +++ b/gateway-server/pom.xml @@ -159,16 +159,16 @@ <artifactId>jetty-server</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> </dependency> <dependency> @@ -317,12 +317,12 @@ The need to be late in the classpath for some reason otherwise class loading issues occur. --> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-annotations</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-annotations</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-apache-jsp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-apache-jsp</artifactId> </dependency> <dependency> @@ -340,13 +340,13 @@ <artifactId>jetty-websocket-jetty-api</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9.websocket</groupId> - <artifactId>jetty-ee9-websocket-jetty-server</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jetty-server</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9.websocket</groupId> - <artifactId>jetty-ee9-websocket-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-servlet</artifactId> </dependency> <dependency> @@ -355,13 +355,13 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9.websocket</groupId> - <artifactId>jetty-ee9-websocket-jakarta-server</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jakarta-server</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9.websocket</groupId> - <artifactId>jetty-ee9-websocket-jakarta-client</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jakarta-client</artifactId> </dependency> <dependency> diff --git a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/ServletContextWrapper.java b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/ServletContextWrapper.java index 95f6fdb94..d58b3b541 100644 --- a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/ServletContextWrapper.java +++ b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/ServletContextWrapper.java @@ -109,31 +109,11 @@ class ServletContextWrapper implements ServletContext { return delegate.getNamedDispatcher(name); } - @Override - public Servlet getServlet(String name) throws ServletException { - return delegate.getServlet(name); - } - - @Override - public Enumeration<Servlet> getServlets() { - return delegate.getServlets(); - } - - @Override - public Enumeration<String> getServletNames() { - return delegate.getServletNames(); - } - @Override public void log(String msg) { delegate.log(msg); } - @Override - public void log(Exception exception, String msg) { - delegate.log(msg, exception); - } - @Override public void log(String message, Throwable throwable) { delegate.log(message, throwable); @@ -231,6 +211,11 @@ class ServletContextWrapper implements ServletContext { return delegate.addServlet(servletName, servletClass); } + @Override + public ServletRegistration.Dynamic addJspFile(String s, String s1) { + return null; + } + @Override public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException { return delegate.createServlet(clazz); @@ -335,4 +320,34 @@ class ServletContextWrapper implements ServletContext { public String getVirtualServerName() { return delegate.getVirtualServerName(); } + + @Override + public int getSessionTimeout() { + return 0; + } + + @Override + public void setSessionTimeout(int i) { + + } + + @Override + public String getRequestCharacterEncoding() { + return ""; + } + + @Override + public void setRequestCharacterEncoding(String s) { + + } + + @Override + public String getResponseCharacterEncoding() { + return ""; + } + + @Override + public void setResponseCharacterEncoding(String s) { + + } } diff --git a/gateway-test-release/pom.xml b/gateway-test-release/pom.xml index 9dcb23906..7fabaf88b 100644 --- a/gateway-test-release/pom.xml +++ b/gateway-test-release/pom.xml @@ -56,13 +56,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-annotations</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-annotations</artifactId> <version>${jetty.version}</version> <exclusions> <exclusion> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> </exclusion> <exclusion> <groupId>org.eclipse.jetty</groupId> @@ -116,8 +116,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-security</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> <version>${jetty.version}</version> <exclusions> <exclusion> @@ -134,20 +134,20 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <version>${jetty.version}</version> <exclusions> <exclusion> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-security</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> </exclusion> </exclusions> <scope>test</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> <version>${jetty.version}</version> <exclusions> <exclusion> @@ -155,8 +155,8 @@ <artifactId>jetty-xml</artifactId> </exclusion> <exclusion> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> </exclusion> </exclusions> <scope>test</scope> diff --git a/gateway-test-utils/pom.xml b/gateway-test-utils/pom.xml index 3a9e8cbfe..4adf21f4b 100644 --- a/gateway-test-utils/pom.xml +++ b/gateway-test-utils/pom.xml @@ -83,8 +83,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>provided</scope> </dependency> <dependency> diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/TestUtils.java b/gateway-test-utils/src/main/java/org/apache/knox/test/TestUtils.java index 0e055e4e5..08b7da203 100644 --- a/gateway-test-utils/src/main/java/org/apache/knox/test/TestUtils.java +++ b/gateway-test-utils/src/main/java/org/apache/knox/test/TestUtils.java @@ -27,7 +27,7 @@ import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; import org.eclipse.jetty.http.HttpTester; -import org.eclipse.jetty.ee9.servlet.ServletTester; +import org.eclipse.jetty.ee10.servlet.ServletTester; import java.io.File; import java.io.FileNotFoundException; diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockHttpServletRequest.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockHttpServletRequest.java index 62646910e..55bf2c76b 100644 --- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockHttpServletRequest.java +++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockHttpServletRequest.java @@ -20,6 +20,7 @@ package org.apache.knox.test.mock; 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; @@ -181,12 +182,6 @@ public class MockHttpServletRequest implements HttpServletRequest { return false; } - @Override - @SuppressWarnings("deprecation") - public boolean isRequestedSessionIdFromUrl() { - return false; - } - @Override public boolean authenticate( HttpServletResponse httpServletResponse ) throws IOException, ServletException { return false; @@ -346,12 +341,6 @@ public class MockHttpServletRequest implements HttpServletRequest { return null; } - @Override - @SuppressWarnings("deprecation") - public String getRealPath( String s ) { - return null; - } - @Override public int getRemotePort() { return 0; @@ -407,4 +396,19 @@ public class MockHttpServletRequest implements HttpServletRequest { return null; } + @Override + public String getRequestId() { + return ""; + } + + @Override + public String getProtocolRequestId() { + return ""; + } + + @Override + public ServletConnection getServletConnection() { + return null; + } + } diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockHttpServletResponse.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockHttpServletResponse.java index c15cf2d66..1c3afa2de 100644 --- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockHttpServletResponse.java +++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockHttpServletResponse.java @@ -51,17 +51,6 @@ public class MockHttpServletResponse implements HttpServletResponse { return null; } - @Override - @SuppressWarnings("deprecation") - public String encodeUrl( String s ) { - return null; - } - - @Override - public String encodeRedirectUrl( String s ) { - return null; - } - @Override public void sendError( int i, String s ) throws IOException { } @@ -104,11 +93,6 @@ public class MockHttpServletResponse implements HttpServletResponse { public void setStatus( int i ) { } - @Override - @SuppressWarnings("deprecation") - public void setStatus( int i, String s ) { - } - @Override public int getStatus() { return 0; diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServer.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServer.java index f1e35ccd9..4d363b355 100644 --- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServer.java +++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServer.java @@ -19,10 +19,9 @@ package org.apache.knox.test.mock; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.ee9.servlet.ServletContextHandler; -import org.eclipse.jetty.ee9.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import jakarta.servlet.Servlet; import java.util.LinkedList; diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServletContext.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServletContext.java index 2a830e8b4..a6d16ce33 100644 --- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServletContext.java +++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServletContext.java @@ -96,29 +96,10 @@ public class MockServletContext implements ServletContext { return null; } - @Override - public Servlet getServlet( String s ) throws ServletException { - return null; - } - - @Override - public Enumeration<Servlet> getServlets() { - return null; - } - - @Override - public Enumeration<String> getServletNames() { - return null; - } - @Override public void log( String s ) { } - @Override - public void log( Exception e, String s ) { - } - @Override public void log( String s, Throwable throwable ) { } diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml index 2b4f5520a..c5477eabc 100644 --- a/gateway-test/pom.xml +++ b/gateway-test/pom.xml @@ -162,8 +162,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <scope>test</scope> </dependency> diff --git a/pom.xml b/pom.xml index 23bfeb370..9fa8abaa4 100644 --- a/pom.xml +++ b/pom.xml @@ -228,7 +228,7 @@ <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version> <jakarta.json.version>2.0.1</jakarta.json.version> <jakarta.json-api.version>2.1.3</jakarta.json-api.version> - <jakarta.servlet-api.version>5.0.0</jakarta.servlet-api.version> + <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version> <jakarta.websocket-api.version>2.1.1</jakarta.websocket-api.version> <jakarta.ws.rs-api.version>3.0.0</jakarta.ws.rs-api.version> <jakarta.xml.bind.version>4.0.5</jakarta.xml.bind.version> @@ -1463,49 +1463,49 @@ <scope>import</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-annotations</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-annotations</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-apache-jsp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-apache-jsp</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlets</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlets</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-webapp</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-webapp</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9.websocket</groupId> - <artifactId>jetty-ee9-websocket-jakarta-server</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jakarta-server</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9.websocket</groupId> - <artifactId>jetty-ee9-websocket-jakarta-client</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jakarta-client</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9.websocket</groupId> - <artifactId>jetty-ee9-websocket-jetty-server</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jetty-server</artifactId> <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9.websocket</groupId> - <artifactId>jetty-ee9-websocket-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-servlet</artifactId> <version>${jetty.version}</version> </dependency>
