Fix problems caused by upgrade to jstl version.

Signed-off-by: Jan Bartel <janb@webtide.com>
jetty · Nov 24, 2020 · f432ec0 · f432ec0
1 parent 018fddd
commit f432ec0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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>