diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml
index 103c160fe79..b3f6053fcbc 100644
--- a/demos/demo-jetty-webapp/pom.xml
+++ b/demos/demo-jetty-webapp/pom.xml
@@ -61,7 +61,7 @@
war
- jakarta.servlet.jsp.*;version="[5,6)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",*
+ jakarta.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",*
!com.acme*
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index c98afb4a8c2..adcf6fe01cf 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -452,5 +452,11 @@
4.2.2.Final
provided
+
+ com.sun.activation
+ jakarta.activation
+ 2.0.0
+ provided
+
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index d758a56bd2d..384ea34d121 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -84,7 +84,7 @@
jakarta.el;version="[4.0,5.0)",
jakarta.servlet;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))",
jakarta.servlet.resources;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))",
- jakarta.servlet.jsp.resources;version="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))",
+ jakarta.servlet.jsp.resources;version="[$(version;==;${jsp.api.version}),$(version;+;${jsp.api.version}))",
jakarta.servlet.jsp;version="[$(version;==;${jsp.api.version}),$(version;+;${jsp.api.version}))",
jakarta.servlet.jsp.el;version="[$(version;==;${jsp.api.version}),$(version;+;${jsp.api.version}))",
jakarta.servlet.jsp.tagext;version="[$(version;==;${jsp.api.version}),$(version;+;${jsp.api.version}))",
diff --git a/pom.xml b/pom.xml
index dc3eb004d02..5d6d264232e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,8 +27,8 @@
5.0.1
2.0.0
- 10.0.0-1-M7
- 5.0
+ 10.0.0-M10
+ 3.0
2.0.0
2.0.0-RC1
2.0.0-RC6
diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java
index 5ef39c67f9b..1d42dac6214 100644
--- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java
+++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java
@@ -63,7 +63,7 @@ public class JakartaWebSocketTest
@Test
public void testChatEndpoint() throws Exception
{
- URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/demo-jetty-webapp/jakarta.websocket"));
+ URI uri = WSURI.toWebsocket(server.getServerURI().resolve("/demo-jetty-webapp/jakarta.websocket/"));
WebSocketContainer container = ContainerProvider.getWebSocketContainer();