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 31118fc57a44150e20dbc10871cedf03a709eb7b Author: bonampak <[email protected]> AuthorDate: Wed Mar 11 13:14:24 2026 +0100 KNOX-3238: replacing jetty.servlet classes with jetty.ee9.servlet classes, deleting NoOpLogger (Log class removed in Jetty 12) and defining log4j2.xml configuration files for tests. --- gateway-provider-identity-assertion-common/pom.xml | 6 -- .../function/UsernameFunctionProcessorTest.java | 10 +-- .../src/test/resources/log4j2.xml | 29 ++++++++ .../pom.xml | 12 --- .../impl/ServiceRegistryFunctionsTest.java | 10 +-- .../src/test/resources/log4j2.xml | 29 ++++++++ gateway-provider-rewrite/pom.xml | 12 --- .../api/UrlRewriteServletContextListenerTest.java | 6 +- .../rewrite/api/UrlRewriteServletFilterTest.java | 6 +- .../impl/FrontendFunctionProcessorTest.java | 10 +-- gateway-server/pom.xml | 13 +--- gateway-test-utils/pom.xml | 10 --- .../main/java/org/apache/knox/test/TestUtils.java | 2 +- .../java/org/apache/knox/test/log/NoOpLogger.java | 87 ---------------------- .../java/org/apache/knox/test/mock/MockServer.java | 6 +- .../apache/knox/test/mock/MockServletContext.java | 35 +++++++++ .../org/apache/knox/gateway/WebHdfsHaFuncTest.java | 1 - pom.xml | 31 ++++++-- 18 files changed, 137 insertions(+), 178 deletions(-) diff --git a/gateway-provider-identity-assertion-common/pom.xml b/gateway-provider-identity-assertion-common/pom.xml index 8294d9b73..c891ed878 100644 --- a/gateway-provider-identity-assertion-common/pom.xml +++ b/gateway-provider-identity-assertion-common/pom.xml @@ -118,12 +118,6 @@ <artifactId>gateway-test-utils</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> 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 415ca02e5..f3f4a7471 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 @@ -25,15 +25,13 @@ import org.apache.knox.gateway.identityasserter.common.function.UsernameFunction import org.apache.knox.gateway.security.PrimaryPrincipal; import org.apache.knox.gateway.util.urltemplate.Parser; import org.apache.knox.test.TestUtils; -import org.apache.knox.test.log.NoOpLogger; import org.apache.knox.test.mock.MockInteraction; import org.apache.knox.test.mock.MockServlet; import org.apache.http.auth.BasicUserPrincipal; -import org.eclipse.jetty.servlet.FilterHolder; -import org.eclipse.jetty.servlet.ServletHolder; +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.http.HttpTester; -import org.eclipse.jetty.servlet.ServletTester; -import org.eclipse.jetty.util.log.Log; import org.hamcrest.core.Is; import org.junit.After; import org.junit.Test; @@ -81,8 +79,6 @@ public class UsernameFunctionProcessorTest { private void testSetup(String username, Map<String,String> initParams ) throws Exception { String descriptorUrl = getTestResource( "rewrite.xml" ).toExternalForm(); - Log.setLog( new NoOpLogger() ); - server = new ServletTester(); server.setContextPath( "/" ); server.getContext().addEventListener( new UrlRewriteServletContextListener() ); diff --git a/gateway-provider-identity-assertion-common/src/test/resources/log4j2.xml b/gateway-provider-identity-assertion-common/src/test/resources/log4j2.xml new file mode 100644 index 000000000..b91f3c0df --- /dev/null +++ b/gateway-provider-identity-assertion-common/src/test/resources/log4j2.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<Configuration> + <Appenders> + <Console name="stdout" target="SYSTEM_OUT"> + <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="info"> + <AppenderRef ref="stdout"/> + </Root> + </Loggers> +</Configuration> diff --git a/gateway-provider-rewrite-func-service-registry/pom.xml b/gateway-provider-rewrite-func-service-registry/pom.xml index 0a9a23a60..39e2989e1 100644 --- a/gateway-provider-rewrite-func-service-registry/pom.xml +++ b/gateway-provider-rewrite-func-service-registry/pom.xml @@ -83,18 +83,6 @@ <artifactId>gateway-test-utils</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.velocity</groupId> 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 4b4fd16ad..78737aadc 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 @@ -26,15 +26,13 @@ import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.registry.ServiceRegistry; import org.apache.knox.gateway.util.urltemplate.Parser; import org.apache.knox.test.TestUtils; -import org.apache.knox.test.log.NoOpLogger; 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.http.HttpTester; -import org.eclipse.jetty.servlet.FilterHolder; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.servlet.ServletTester; -import org.eclipse.jetty.util.log.Log; import org.hamcrest.core.Is; import org.junit.Test; @@ -85,8 +83,6 @@ public class ServiceRegistryFunctionsTest { String descriptorUrl = getTestResource( "rewrite.xml" ).toExternalForm(); - Log.setLog( new NoOpLogger() ); - server = new ServletTester(); server.setContextPath( "/" ); server.getContext().addEventListener( new UrlRewriteServletContextListener() ); diff --git a/gateway-provider-rewrite-func-service-registry/src/test/resources/log4j2.xml b/gateway-provider-rewrite-func-service-registry/src/test/resources/log4j2.xml new file mode 100644 index 000000000..25f8f9d54 --- /dev/null +++ b/gateway-provider-rewrite-func-service-registry/src/test/resources/log4j2.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<Configuration> + <Appenders> + <Console name="stdout" target="SYSTEM_OUT"> + <PatternLayout pattern="%5p [%c] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="error"> + <AppenderRef ref="stdout"/> + </Root> + </Loggers> +</Configuration> diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml index 5e64aa04a..985f183c1 100644 --- a/gateway-provider-rewrite/pom.xml +++ b/gateway-provider-rewrite/pom.xml @@ -163,18 +163,6 @@ <artifactId>gateway-test-utils</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> <dependency> <groupId>org.eclipse.jetty.ee9</groupId> 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 a63c124bb..fa5f07c5d 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.servlet.FilterHolder; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.servlet.ServletTester; +import org.eclipse.jetty.ee9.servlet.FilterHolder; +import org.eclipse.jetty.ee9.servlet.ServletHolder; +import org.eclipse.jetty.ee9.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 a932cfbc9..ee89c7aab 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.servlet.FilterHolder; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.servlet.ServletTester; +import org.eclipse.jetty.ee9.servlet.FilterHolder; +import org.eclipse.jetty.ee9.servlet.ServletHolder; +import org.eclipse.jetty.ee9.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 bf6d879a2..81aff49ee 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 @@ -29,18 +29,16 @@ import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.registry.ServiceRegistry; import org.apache.knox.gateway.util.urltemplate.Parser; import org.apache.knox.test.TestUtils; -import org.apache.knox.test.log.NoOpLogger; 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.http.HttpTester; -import org.eclipse.jetty.servlet.FilterHolder; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.servlet.ServletTester; import org.eclipse.jetty.util.Attributes; import org.eclipse.jetty.util.AttributesMap; -import org.eclipse.jetty.util.log.Log; import org.hamcrest.core.Is; import org.junit.Test; @@ -136,8 +134,6 @@ public class FrontendFunctionProcessorTest { String descriptorUrl = TestUtils.getResourceUrl( FrontendFunctionProcessorTest.class, "rewrite.xml" ).toExternalForm(); - Log.setLog( new NoOpLogger() ); - server = new ServletTester(); server.setContextPath( "/" ); server.getContext().addEventListener( new UrlRewriteServletContextListener() ); diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml index 58d1384fe..f81b16656 100644 --- a/gateway-server/pom.xml +++ b/gateway-server/pom.xml @@ -324,10 +324,6 @@ <groupId>org.eclipse.jetty.ee9</groupId> <artifactId>jetty-ee9-apache-jsp</artifactId> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>apache-jstl</artifactId> - </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> @@ -349,8 +345,8 @@ </dependency> <dependency> - <groupId>org.eclipse.jetty.websocket</groupId> - <artifactId>websocket-servlet</artifactId> + <groupId>org.eclipse.jetty.ee9.websocket</groupId> + <artifactId>jetty-ee9-websocket-servlet</artifactId> </dependency> <dependency> @@ -373,11 +369,6 @@ <artifactId>jetty-client</artifactId> </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee9.websocket</groupId> - <artifactId>jetty-ee9-websocket-jakarta-client</artifactId> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> diff --git a/gateway-test-utils/pom.xml b/gateway-test-utils/pom.xml index 53e5047d5..3a9e8cbfe 100644 --- a/gateway-test-utils/pom.xml +++ b/gateway-test-utils/pom.xml @@ -134,15 +134,5 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-servlet</artifactId> - <classifier>tests</classifier> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <classifier>tests</classifier> - </dependency> </dependencies> </project> 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 31106bdf2..0e055e4e5 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.servlet.ServletTester; +import org.eclipse.jetty.ee9.servlet.ServletTester; import java.io.File; import java.io.FileNotFoundException; diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/log/NoOpLogger.java b/gateway-test-utils/src/main/java/org/apache/knox/test/log/NoOpLogger.java deleted file mode 100644 index 9fa532a7b..000000000 --- a/gateway-test-utils/src/main/java/org/apache/knox/test/log/NoOpLogger.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.knox.test.log; - -import org.eclipse.jetty.util.log.Logger; - -public class NoOpLogger implements Logger { - - @Override - public String getName() { - return ""; - } - - @Override - public void warn( String msg, Object... args ) { - } - - @Override - public void warn( Throwable thrown ) { - } - - @Override - public void warn( String msg, Throwable thrown ) { - } - - @Override - public void info( String msg, Object... args ) { - } - - @Override - public void info( Throwable thrown ) { - } - - @Override - public void info( String msg, Throwable thrown ) { - } - - @Override - public boolean isDebugEnabled() { - return false; - } - - @Override - public void setDebugEnabled( boolean enabled ) { - } - - @Override - public void debug( String msg, Object... args ) { - } - - @Override - public void debug( String msg, long arg ) { - } - - @Override - public void debug( Throwable thrown ) { - } - - @Override - public void debug( String msg, Throwable thrown ) { - } - - @Override - public Logger getLogger( String name ) { - return this; - } - - @Override - public void ignore( Throwable ignored ) { - } - -} 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 3af1c338a..f1e35ccd9 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 @@ -21,8 +21,8 @@ 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.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.ee9.servlet.ServletContextHandler; +import org.eclipse.jetty.ee9.servlet.ServletHolder; import jakarta.servlet.Servlet; import java.util.LinkedList; @@ -67,7 +67,7 @@ public class MockServer { } public void start() throws Exception { - Handler context = createHandler(); + ServletContextHandler context = createHandler(); jetty = new Server(0); jetty.setHandler( context ); jetty.start(); 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 210ee084c..2a830e8b4 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 @@ -186,6 +186,11 @@ public class MockServletContext implements ServletContext { return null; } + @Override + public ServletRegistration.Dynamic addJspFile(String s, String s1) { + return null; + } + @Override public <T extends Servlet> T createServlet( Class<T> tClass ) throws ServletException { return null; @@ -285,4 +290,34 @@ public class MockServletContext implements ServletContext { public String getVirtualServerName() { throw new UnsupportedOperationException(); } + + @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/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java index 401ad202f..28d5f526f 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/WebHdfsHaFuncTest.java @@ -67,7 +67,6 @@ public class WebHdfsHaFuncTest { @Before public void setup() throws Exception { LOG_ENTER(); - //Log.setLog(new NoOpLogger()); masterServer = new MockServer("master", true); standbyServer = new MockServer("standby", true); GatewayTestConfig config = new GatewayTestConfig(); diff --git a/pom.xml b/pom.xml index f9eb24f9b..23bfeb370 100644 --- a/pom.xml +++ b/pom.xml @@ -1467,6 +1467,27 @@ <artifactId>jetty-ee9-servlet</artifactId> <version>${jetty.version}</version> </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee9</groupId> + <artifactId>jetty-ee9-annotations</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee9</groupId> + <artifactId>jetty-ee9-apache-jsp</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee9</groupId> + <artifactId>jetty-ee9-servlets</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.ee9</groupId> + <artifactId>jetty-ee9-webapp</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> <groupId>org.eclipse.jetty.ee9.websocket</groupId> <artifactId>jetty-ee9-websocket-jakarta-server</artifactId> @@ -1483,14 +1504,8 @@ <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-apache-jsp</artifactId> - <version>${jetty.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty.ee9</groupId> - <artifactId>jetty-ee9-webapp</artifactId> + <groupId>org.eclipse.jetty.ee9.websocket</groupId> + <artifactId>jetty-ee9-websocket-servlet</artifactId> <version>${jetty.version}</version> </dependency>
