From aaa1fd2a35982a7f2a1e6fa929ca7f0640153486 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Fri, 27 Aug 2021 12:10:54 +1000
Subject: [PATCH] Issue #6671 Update to apache jsp 8.5.70

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

diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 0c3915aac924..9d74c9b44d27 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -73,20 +73,20 @@
                 javax.servlet.jsp.jstl.fmt;version="1.2";resolution:=optional,
                 javax.servlet.jsp.jstl.sql;version="1.2";resolution:=optional,
                 javax.servlet.jsp.jstl.tlv;version="1.2";resolution:=optional,
-                org.apache.el;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.el.lang;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.el.stream;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.el.util;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.el.parser;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.jasper;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.jasper.compiler;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.jasper.compiler.tagplugin;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.jasper.runtime;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.jasper.security;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.jasper.servlet;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.jasper.tagplugins.jstl;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.jasper.util;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
-                org.apache.jasper.xmlparser;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
+                org.apache.el;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.el.lang;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.el.stream;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.el.util;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.el.parser;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.jasper;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.compiler;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.compiler.tagplugin;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.runtime;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.security;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.servlet;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.tagplugins.jstl;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.util;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.xmlparser;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
                 org.apache.taglibs.standard;version="1.2";resolution:=optional,
                 org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional,
                 org.apache.taglibs.standard.functions;version="1.2";resolution:=optional,
@@ -110,7 +110,7 @@
                 org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional,
                 org.apache.taglibs.standard.tei;version="1.2";resolution:=optional,
                 org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional,
-                org.apache.tomcat;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))";resolution:=optional,
+                org.apache.tomcat;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))";resolution:=optional,
                 org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional,
                 org.osgi.*,
                 org.xml.*;resolution:=optional,
@@ -121,8 +121,8 @@
                 javax.xml.parser;resolution:=optional
             </Import-Package>
             <DynamicImport-Package>org.eclipse.jetty.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",
-                org.apache.jasper.*;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))",
-                org.apache.el.*;version="[$(version;===;${jsp.version}),$(version;+;${jsp.version}))"</DynamicImport-Package>
+                org.apache.jasper.*;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))",
+                org.apache.el.*;version="[$(version;===;${parsedJspVersion.osgiVersion}),$(version;+;${parsedJspVersion.osgiVersion}))"</DynamicImport-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index bbaa5a5dd0eb..a6aa6cd4830b 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -79,6 +79,23 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>set-jsp-osgi-version</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
+            <configuration>
+                <propertyPrefix>parsedJspVersion</propertyPrefix>
+                <versionString>${jsp.version}</versionString>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index d0bf802a30d8..6d3174801463 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <logback.version>1.2.3</logback.version>
     <jetty-test-policy.version>1.2</jetty-test-policy.version>
     <alpn.api.version>1.1.3.v20160715</alpn.api.version>
-    <jsp.version>8.5.68</jsp.version>
+    <jsp.version>8.5.70</jsp.version>
     <infinispan.version>9.4.8.Final</infinispan.version>
     <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
     <gson.version>2.8.6</gson.version>