From a6111cd025c3236085812af685427f04932cec10 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Mon, 23 Nov 2020 19:05:20 +0100
Subject: [PATCH 1/3] Fix problems caused by upgrade to jstl version.

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 demos/demo-jetty-webapp/pom.xml        | 2 +-
 jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +-
 pom.xml                                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/demos/demo-jetty-webapp/pom.xml b/demos/demo-jetty-webapp/pom.xml
index 103c160fe793..b3f6053fcbc9 100644
--- a/demos/demo-jetty-webapp/pom.xml
+++ b/demos/demo-jetty-webapp/pom.xml
@@ -61,7 +61,7 @@
             <supportedProjectType>war</supportedProjectType>
           </supportedProjectTypes>
           <instructions>
-            <Import-Package>jakarta.servlet.jsp.*;version="[5,6)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",*</Import-Package>
+            <Import-Package>jakarta.servlet.jsp.*;version="[3,4)",org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",*</Import-Package>
             <Export-Package>!com.acme*</Export-Package>
             <!-- the test webapp is configured via a jetty xml file
             in order to add the security handler. -->
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index d758a56bd2dd..384ea34d1214 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 dc3eb004d020..5d6d264232e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,8 +27,8 @@
     <servlet.api.version>5.0.1</servlet.api.version>
     <!-- change version in jetty-websocket/websocket-jakarta-server/src/main/config/modules/websocket-jakarta.mod -->
     <websocket.api.version>2.0.0</websocket.api.version>
-    <jsp.version>10.0.0-1-M7</jsp.version>
-    <jsp.api.version>5.0</jsp.api.version>
+    <jsp.version>10.0.0-M10</jsp.version>
+    <jsp.api.version>3.0</jsp.api.version>
     <annotation-api.version>2.0.0</annotation-api.version>
     <transaction-api.version>2.0.0-RC1</transaction-api.version>
     <mail-api.version>2.0.0-RC6</mail-api.version>

From bb08e718bf965a5493c06ed93f670c5b852fd5bf Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Tue, 24 Nov 2020 13:06:59 +1000
Subject: [PATCH 2/3] fix upperbound dependency

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 javadoc/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index c98afb4a8c20..adcf6fe01cf5 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -452,5 +452,11 @@
       <version>4.2.2.Final</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.sun.activation</groupId>
+      <artifactId>jakarta.activation</artifactId>
+      <version>2.0.0</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>

From fb6c894584257bc0a3ab0f956bdf8df2ff156df7 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Tue, 24 Nov 2020 20:34:27 +1000
Subject: [PATCH 3/3] add trailing /

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 .../org/eclipse/jetty/test/websocket/JakartaWebSocketTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5ef39c67f9b3..1d42dac62147 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 static void tearDownServer() throws Exception
     @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();