This is an automated email from the ASF dual-hosted git repository. paulrutter pushed a commit to branch http.jetty12.ee10 in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit c03fd4b41f8a88229553035a173cc5eddf968820 Author: Paul Rütter <[email protected]> AuthorDate: Thu May 28 11:44:15 2026 +0200 FELIX-6750-Jetty-12.1.0-tryout - Use Jetty EE10 artifacts instead of EE11 on Jetty 12.1.9 - pom.xml: org.eclipse.jetty.ee11(.websocket) groupIds -> ee10, jetty-ee11-* artifactIds -> jetty-ee10-*, bnd Export-Package and groovy-magic skip list updated to ee10. - JettyService / JettyErrorHandler: switch imports and log messages from ee11 to ee10 servlet/websocket packages. - PaxExam integration tests: ee11 maven bundle coords -> ee10. Co-Authored-By: Claude Opus 4.7 (1M context) <[email protected]> --- http/jetty12/pom.xml | 38 +++++++++++----------- .../http/jetty/internal/JettyErrorHandler.java | 2 +- .../felix/http/jetty/internal/JettyService.java | 38 +++++++++++----------- .../http/jetty/it/JakartaSpecificWebsocketIT.java | 12 +++---- .../felix/http/jetty/it/JettyMaxFormSizeIT.java | 4 +-- .../http/jetty/it/JettySizeLimitHandlerIT.java | 4 +-- .../http/jetty/it/JettySpecificWebsocketIT.java | 12 +++---- .../jetty/it/JettyUriComplianceModeDefaultIT.java | 4 +-- .../felix/http/jetty/it/JettyVirtualThreadsIT.java | 4 +-- .../felix/http/jetty/it/LightClassifierIT.java | 4 +-- .../jetty/it/MissingWebsocketDependenciesIT.java | 8 ++--- 11 files changed, 65 insertions(+), 65 deletions(-) diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index a50a2f2294..69cba17dcc 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -30,7 +30,7 @@ <description>This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description> <artifactId>org.apache.felix.http.jetty12</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <scm> @@ -75,9 +75,9 @@ if (artifact.getArtifactHandler().isAddedToClasspath() && !org.apache.maven.artifact.Artifact.SCOPE_TEST.equals( artifact.getScope() ) && !"org.eclipse.jetty.websocket".equals(artifact.getGroupId()) // skip the optional websocket artifacts - && !"org.eclipse.jetty.ee11.websocket".equals(artifact.getGroupId()) // skip the optional websocket artifacts - && !"jetty-ee11-annotations".equals(artifact.getArtifactId()) // skip the transitive artifacts from the optional websocket artifacts - && !"jetty-ee11-plus".equals(artifact.getArtifactId()) + && !"org.eclipse.jetty.ee10.websocket".equals(artifact.getGroupId()) // skip the optional websocket artifacts + && !"jetty-ee10-annotations".equals(artifact.getArtifactId()) // skip the transitive artifacts from the optional websocket artifacts + && !"jetty-ee10-plus".equals(artifact.getArtifactId()) && !"jetty-webapp".equals(artifact.getArtifactId()) && !"jetty-ee".equals(artifact.getArtifactId())) { def jar; @@ -184,8 +184,8 @@ org.eclipse.jetty.server.*, org.eclipse.jetty.util.*, org.eclipse.jetty.ee.*, - !org.eclipse.jetty.ee11.websocket.*, - org.eclipse.jetty.ee11.servlet.*, + !org.eclipse.jetty.ee10.websocket.*, + org.eclipse.jetty.ee10.servlet.*, org.eclipse.jetty.compression.*, org.apache.felix.http.jetty, org.apache.felix.http.jakartawrappers, @@ -366,9 +366,9 @@ org.eclipse.jetty.server.*, org.eclipse.jetty.util.*, org.eclipse.jetty.ee.*, - org.eclipse.jetty.ee11.servlet.*, - !org.eclipse.jetty.ee11.websocket.jakarta.*, - org.eclipse.jetty.ee11.websocket.*, + org.eclipse.jetty.ee10.servlet.*, + !org.eclipse.jetty.ee10.websocket.jakarta.*, + org.eclipse.jetty.ee10.websocket.*, org.eclipse.jetty.websocket.*, org.eclipse.jetty.compression.*, org.apache.felix.http.jetty, @@ -470,10 +470,10 @@ org.eclipse.jetty.server.*, org.eclipse.jetty.util.*, org.eclipse.jetty.ee.*, - !org.eclipse.jetty.ee11.websocket.server.*, - !org.eclipse.jetty.ee11.websocket.servlet.*, - org.eclipse.jetty.ee11.websocket.jakarta.*, - org.eclipse.jetty.ee11.servlet.*, + !org.eclipse.jetty.ee10.websocket.server.*, + !org.eclipse.jetty.ee10.websocket.servlet.*, + org.eclipse.jetty.ee10.websocket.jakarta.*, + org.eclipse.jetty.ee10.servlet.*, org.eclipse.jetty.websocket.*, org.eclipse.jetty.compression.*, org.apache.felix.http.jetty, @@ -624,8 +624,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee11</groupId> - <artifactId>jetty-ee11-servlet</artifactId> + <groupId>org.eclipse.jetty.ee10</groupId> + <artifactId>jetty-ee10-servlet</artifactId> <version>${jetty.version}</version> </dependency> <dependency> @@ -674,14 +674,14 @@ <version>${jetty.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee11.websocket</groupId> - <artifactId>jetty-ee11-websocket-jakarta-server</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jakarta-server</artifactId> <version>${jetty.version}</version> <optional>true</optional> </dependency> <dependency> - <groupId>org.eclipse.jetty.ee11.websocket</groupId> - <artifactId>jetty-ee11-websocket-jetty-server</artifactId> + <groupId>org.eclipse.jetty.ee10.websocket</groupId> + <artifactId>jetty-ee10-websocket-jetty-server</artifactId> <version>${jetty.version}</version> <optional>true</optional> </dependency> diff --git a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyErrorHandler.java b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyErrorHandler.java index 9fdfbda0de..1a6c82bb7e 100644 --- a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyErrorHandler.java +++ b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyErrorHandler.java @@ -18,7 +18,7 @@ package org.apache.felix.http.jetty.internal; import java.util.Map; -import org.eclipse.jetty.ee11.servlet.ErrorHandler; +import org.eclipse.jetty.ee10.servlet.ErrorHandler; import org.eclipse.jetty.http.HttpFields.Mutable; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; diff --git a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java index a84cec1993..db6ab4fba6 100644 --- a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java +++ b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java @@ -43,10 +43,10 @@ import jakarta.servlet.SessionTrackingMode; import org.apache.felix.http.base.internal.HttpServiceController; import org.apache.felix.http.base.internal.logger.SystemLogger; import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory; -import org.eclipse.jetty.ee11.servlet.ServletContextHandler; -import org.eclipse.jetty.ee11.servlet.ServletHolder; -import org.eclipse.jetty.ee11.servlet.SessionHandler; -import org.eclipse.jetty.ee11.servlet.ServletHandler; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.servlet.SessionHandler; +import org.eclipse.jetty.ee10.servlet.ServletHandler; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.UriCompliance; import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory; @@ -595,32 +595,32 @@ public final class JettyService * @param handler the sevlet context handler to initialize */ private void maybeInitializeJakartaWebsocket(ServletContextHandler handler) { - if (isClassNameVisible("org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer")) { + if (isClassNameVisible("org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer")) { // Ensure that JakartaWebSocketServletContainerInitializer is initialized, // to setup the ServerContainer for this web application context. - org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.configure(handler, null); - SystemLogger.LOGGER.info("Jakarta WebSocket ee11 servlet container initialized"); + org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.configure(handler, null); + SystemLogger.LOGGER.info("Jakarta WebSocket ee10 servlet container initialized"); } else { - SystemLogger.LOGGER.warn("Failed to initialize jakarta ee11 standard websocket support since the initializer class was not found. " - + "Check if the jetty-ee11-websocket-jakarta-server bundle is deployed."); + SystemLogger.LOGGER.warn("Failed to initialize jakarta ee10 standard websocket support since the initializer class was not found. " + + "Check if the jetty-ee10-websocket-jakarta-server bundle is deployed."); } } /** - * Initialize the jetty ee11 websocket support for the servlet context handler. + * Initialize the jetty ee10 websocket support for the servlet context handler. * If the optional initializer class is not present then a warning will be logged. * * @param handler the sevlet context handler to initialize */ private void maybeInitializeJettyWebsocket(ServletContextHandler handler) { - if (isClassNameVisible("org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer")) { + if (isClassNameVisible("org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer")) { // Ensure that JettyWebSocketServletContainerInitializer is initialized, // to setup the JettyWebSocketServerContainer for this web application context. - org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer.configure(handler, null); - SystemLogger.LOGGER.info("Jetty WebSocket ee11 servlet container initialized"); + org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer.configure(handler, null); + SystemLogger.LOGGER.info("Jetty WebSocket ee10 servlet container initialized"); } else { - SystemLogger.LOGGER.warn("Failed to initialize jetty ee11 specific websocket support since the initializer class was not found. " - + "Check if the jetty-ee11-websocket-jetty-server bundle is deployed."); + SystemLogger.LOGGER.warn("Failed to initialize jetty ee10 specific websocket support since the initializer class was not found. " + + "Check if the jetty-ee10-websocket-jetty-server bundle is deployed."); } } @@ -633,13 +633,13 @@ public final class JettyService // when the server is started, retrieve the container attribute and // set it on the shared servlet context once available if (this.config.isUseJettyWebsocket() && - isClassNameVisible("org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer")) { - String attribute = org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer.JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE; + isClassNameVisible("org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer")) { + String attribute = org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer.JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE; this.controller.setAttributeSharedServletContext(attribute, context.getServletContext().getAttribute(attribute)); } if (this.config.isUseJakartaWebsocket() && - isClassNameVisible("org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer")) { - String attribute = org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.ATTR_JAKARTA_SERVER_CONTAINER; + isClassNameVisible("org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer")) { + String attribute = org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.ATTR_JAKARTA_SERVER_CONTAINER; this.controller.setAttributeSharedServletContext(attribute, context.getServletContext().getAttribute(attribute)); } } diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java index 1df344f2d9..7fe9357ada 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java @@ -43,7 +43,7 @@ import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerEndpoint; import org.awaitility.Awaitility; -import org.eclipse.jetty.ee11.websocket.jakarta.client.JakartaWebSocketClientContainerProvider; +import org.eclipse.jetty.ee10.websocket.jakarta.client.JakartaWebSocketClientContainerProvider; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Option; @@ -75,16 +75,16 @@ public class JakartaSpecificWebsocketIT extends AbstractJettyTestSupport { mavenBundle().groupId("jakarta.websocket").artifactId("jakarta.websocket-client-api").version("2.2.0"), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-client").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-gzip").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-client").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-common").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-server").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-jakarta-client").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-jakarta-common").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-jakarta-server").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-servlet").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jakarta-client").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jakarta-common").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jakarta-server").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-servlet").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion) }; } diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyMaxFormSizeIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyMaxFormSizeIT.java index b193661c78..b672720ad7 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyMaxFormSizeIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyMaxFormSizeIT.java @@ -63,8 +63,8 @@ public class JettyMaxFormSizeIT extends AbstractJettyTestSupport { spifly(), // bundles for the server side - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion), // additional bundles for the client side diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySizeLimitHandlerIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySizeLimitHandlerIT.java index 6da37832df..30fc407ae3 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySizeLimitHandlerIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySizeLimitHandlerIT.java @@ -67,8 +67,8 @@ public class JettySizeLimitHandlerIT extends AbstractJettyTestSupport { spifly(), // bundles for the server side - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion), // additional bundles for the client side diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java index 9e8d75d08f..4aa6bb32a2 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java @@ -41,9 +41,9 @@ import org.apache.felix.http.javaxwrappers.ServletWrapper; import org.awaitility.Awaitility; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP; -import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer; -import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServlet; -import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServletFactory; +import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer; +import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServlet; +import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServletFactory; import org.eclipse.jetty.websocket.api.Callback; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; @@ -80,14 +80,14 @@ public class JettySpecificWebsocketIT extends AbstractJettyTestSupport { spifly(), // bundles for the server side - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-common").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-server").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-jetty-api").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-jetty-common").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-jetty-server").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-servlet").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-jetty-server").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-servlet").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jetty-server").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion), diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java index 5d90217097..666cb5f698 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java @@ -59,8 +59,8 @@ public class JettyUriComplianceModeDefaultIT extends AbstractJettyTestSupport { spifly(), // bundles for the server side - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion), diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyVirtualThreadsIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyVirtualThreadsIT.java index d18958c642..0cd02e353c 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyVirtualThreadsIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyVirtualThreadsIT.java @@ -59,8 +59,8 @@ public class JettyVirtualThreadsIT extends AbstractJettyTestSupport { spifly(), // bundles for the server side - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion), diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java index 2891823454..76bdb75384 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/LightClassifierIT.java @@ -69,8 +69,8 @@ public class LightClassifierIT extends AbstractJettyTestSupport { mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-security").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-server").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-session").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion), - mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion), + mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty.ee").artifactId("jetty-ee-webapp").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-util").version(jettyVersion), mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion), diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java index d15f38f695..7f6b7e2876 100644 --- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java +++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java @@ -68,11 +68,11 @@ public class MissingWebsocketDependenciesIT extends AbstractJettyTestSupport { .until(() -> containsString(logFile, "org.apache.felix.http.jetty12 [org.apache.felix.http]")); assertTrue(containsString(logFile, "org.apache.felix.http.jetty12 [org.apache.felix.http] WARN : Failed to " - + "initialize jetty ee11 specific websocket support since the initializer class was not found. " - + "Check if the jetty-ee11-websocket-jetty-server bundle is deployed.")); + + "initialize jetty ee10 specific websocket support since the initializer class was not found. " + + "Check if the jetty-ee10-websocket-jetty-server bundle is deployed.")); assertTrue(containsString(logFile, "org.apache.felix.http.jetty12 [org.apache.felix.http] WARN : Failed to " - + "initialize jakarta ee11 standard websocket support since the initializer class was not found. " - + "Check if the jetty-ee11-websocket-jakarta-server bundle is deployed.")); + + "initialize jakarta ee10 standard websocket support since the initializer class was not found. " + + "Check if the jetty-ee10-websocket-jakarta-server bundle is deployed.")); } /**
