From be18af82d9489bee365f5f814b74f85ea33bc794 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Mon, 21 Feb 2022 16:02:11 +0100
Subject: [PATCH] Issue #7632 Make osgi build work with snapshot jsp jars

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 53 +++++++++++++++++---------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 370daec91d3a..2d00c5fc9812 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -44,6 +44,25 @@
 
   <build>
     <plugins>
+      <!-- necessary because x.y.x-SNAPSHOT is not a valid osgi version -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+              <id>set-jsp-api-version</id>
+              <phase>validate</phase>
+              <goals>
+                  <goal>parse-version</goal>
+              </goals>
+              <configuration>
+                  <versionString>${jsp.impl.version}</versionString>
+                  <propertyPrefix>jspImpl</propertyPrefix>
+              </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -73,20 +92,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.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.el.lang;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.el.stream;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.el.util;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.el.parser;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.jasper;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.jasper.compiler;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.jasper.compiler.tagplugin;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.jasper.runtime;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.jasper.security;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.jasper.servlet;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.jasper.tagplugins.jstl;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.jasper.util;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
-                org.apache.jasper.xmlparser;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
+                org.apache.el;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.el.lang;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.el.stream;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.el.util;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.el.parser;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.jasper;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.compiler;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.compiler.tagplugin;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.runtime;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.security;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.servlet;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.tagplugins.jstl;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.util;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
+                org.apache.jasper.xmlparser;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.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 +129,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.impl.version}),$(version;+;${jsp.impl.version}))";resolution:=optional,
+                org.apache.tomcat;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))";resolution:=optional,
                 org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional,
                 org.osgi.*,
                 org.xml.*;resolution:=optional,
@@ -121,8 +140,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.impl.version}),$(version;+;${jsp.impl.version}))",
-              org.apache.el.*;version="[$(version;===;${jsp.impl.version}),$(version;+;${jsp.impl.version}))"
+              org.apache.jasper.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))",
+              org.apache.el.*;version="[$(version;===;${jspImpl.osgiVersion}),$(version;+;${jspImpl.osgiVersion}))"
             </DynamicImport-Package>
           </instructions>
         </configuration>