From 6d88f966e1bfe910f03ac1179ee84877c47d01e2 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Tue, 14 Jul 2020 14:22:38 +0200
Subject: [PATCH] Issue #4736 Use variables for osgi import ranges (#4963)

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 jetty-osgi/jetty-osgi-boot-jsp/pom.xml     | 68 +++++++++++++++++++++-
 jetty-osgi/jetty-osgi-boot/pom.xml         | 26 ++++++++-
 jetty-osgi/test-jetty-osgi-context/pom.xml |  2 +-
 jetty-osgi/test-jetty-osgi-server/pom.xml  |  2 +-
 4 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 8628cd9a527..dc879bc09ef 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -56,9 +56,73 @@
             <Bundle-Classpath />
             <Fragment-Host>org.eclipse.jetty.osgi.boot</Fragment-Host>
             <Export-Package>!org.eclipse.jetty.osgi.boot.*</Export-Package>
-            <Import-Package>org.eclipse.jdt.*;resolution:=optional, org.eclipse.jdt.core.compiler.*;resolution:=optional, com.sun.el;resolution:=optional, com.sun.el.lang;resolution:=optional, com.sun.el.parser;resolution:=optional, com.sun.el.util;resolution:=optional, javax.el;version="[3.0,3.1)", javax.servlet;version="[3.1,3.2)", javax.servlet.resources;version="[3.1,3.2)", javax.servlet.jsp.resources;version="[2.3,4)", javax.servlet.jsp;version="[2.3,2.4)", javax.servlet.jsp.el;version="[2.3,2.4)", javax.servlet.jsp.tagext;version="[2.3,2.4)", javax.servlet.jsp.jstl.core;version="1.2";resolution:=optional, 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="[8.0.23,9)";resolution:=optional, org.apache.el.lang;version="[8.0.23,9)";resolution:=optional, org.apache.el.stream;version="[8.0.23,9)";resolution:=optional, org.apache.el.util;version="[8.0.23,9)";resolution:=optional, org.apache.el.parser;version="[8.0.23,9)";resolution:=optional, org.apache.jasper;version="[8.0.23,9)";resolution:=optional, org.apache.jasper.compiler;version="[8.0.23,9)";resolution:=optional, org.apache.jasper.compiler.tagplugin;version="[8.0.23,9)";resolution:=optional, org.apache.jasper.runtime;version="[8.0.23,9)";resolution:=optional, org.apache.jasper.security;version="[8.0.23,9)";resolution:=optional, org.apache.jasper.servlet;version="[8.0.23,9)";resolution:=optional, org.apache.jasper.tagplugins.jstl;version="[8.0.23,9)";resolution:=optional, org.apache.jasper.util;version="[8.0.23,9)";resolution:=optional, org.apache.jasper.xmlparser;version="[8.0.23,9)";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, org.apache.taglibs.standard.lang.jstl;version="1.2";resolution:=optional, org.apache.taglibs.standard.lang.jstl.parser;version="1.2";resolution:=optional, org.apache.taglibs.standard.lang.jstl.test;version="1.2";resolution:=optional, org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2";resolution:=optional, org.apache.taglibs.standard.lang.support;version="1.2";resolution:=optional, org.apache.taglibs.standard.resources;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.common.core;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.common.fmt;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.common.sql;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.common.xml;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.el.core;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.el.fmt;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.el.sql;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.el.xml;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.rt.core;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.rt.fmt;version="1.2";resolution:=optional, org.apache.taglibs.standard.tag.rt.sql;version="1.2";resolution:=optional, 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="[8.0.23,9)";resolution:=optional, org.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional, org.osgi.*, org.xml.*;resolution:=optional, org.xml.sax.*;resolution:=optional, javax.xml.*;resolution:=optional, org.w3c.dom;resolution:=optional, org.w3c.dom.ls;resolution:=optional, javax.xml.parser;resolution:=optional
+            <Import-Package>org.eclipse.jdt.*;resolution:=optional,
+                org.eclipse.jdt.core.compiler.*;resolution:=optional,
+                com.sun.el;resolution:=optional,
+                com.sun.el.lang;resolution:=optional,
+                com.sun.el.parser;resolution:=optional,
+                com.sun.el.util;resolution:=optional,
+                javax.el;version="[3.0,3.1)",
+                javax.servlet;version="[$(version;===;${javax.servlet.api.version}),$(version;+;${javax.servlet.api.version}))",
+                javax.servlet.resources;version="[$(version;===;${javax.servlet.api.version}),$(version;+;${javax.servlet.api.version}))",
+                javax.servlet.jsp.resources;version="[2.3,4)",
+                javax.servlet.jsp;version="[2.3,2.4)",
+                javax.servlet.jsp.el;version="[2.3,2.4)",
+                javax.servlet.jsp.tagext;version="[2.3,2.4)",
+                javax.servlet.jsp.jstl.core;version="1.2";resolution:=optional,
+                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.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,
+                org.apache.taglibs.standard.lang.jstl;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.lang.jstl.parser;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.lang.jstl.test;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.lang.jstl.test.beans;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.lang.support;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.resources;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.common.core;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.common.fmt;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.common.sql;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.common.xml;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.el.core;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.el.fmt;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.el.sql;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.el.xml;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.rt.core;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.rt.fmt;version="1.2";resolution:=optional,
+                org.apache.taglibs.standard.tag.rt.sql;version="1.2";resolution:=optional,
+                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.eclipse.jetty.jsp;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))";resolution:=optional,
+                org.osgi.*,
+                org.xml.*;resolution:=optional,
+                org.xml.sax.*;resolution:=optional,
+                javax.xml.*;resolution:=optional,
+                org.w3c.dom;resolution:=optional,
+                org.w3c.dom.ls;resolution:=optional,
+                javax.xml.parser;resolution:=optional
             </Import-Package>
-            <DynamicImport-Package>org.eclipse.jetty.jsp.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))",org.apache.jasper.*;version="8.0.23",org.apache.el.*;version="8.0.23"</DynamicImport-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>
           </instructions>
         </configuration>
       </plugin>
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index cd7b014704e..c8876ddbffb 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -70,8 +70,30 @@
           <instructions>
             <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot;singleton:=true</Bundle-SymbolicName>
             <Bundle-Activator>org.eclipse.jetty.osgi.boot.JettyBootstrapActivator</Bundle-Activator>
-            <DynamicImport-Package>org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;==+;${parsedVersion.osgiVersion}))"</DynamicImport-Package>
-            <Import-Package>javax.mail;version="1.4.0";resolution:=optional, javax.mail.event;version="1.4.0";resolution:=optional, javax.mail.internet;version="1.4.0";resolution:=optional, javax.mail.search;version="1.4.0";resolution:=optional, javax.mail.util;version="1.4.0";resolution:=optional, javax.servlet;version="[3.1,3.2)", javax.servlet.http;version="[3.1,3.2)", javax.transaction;version="1.1.0";resolution:=optional, javax.transaction.xa;version="1.1.0";resolution:=optional, org.objectweb.asm;version="5";resolution:=optional, org.osgi.framework, org.osgi.service.cm;version="1.2.0", org.osgi.service.packageadmin, org.osgi.service.startlevel;version="1.0.0", org.osgi.service.url;version="1.0.0", org.osgi.util.tracker;version="1.3.0", org.slf4j;resolution:=optional, org.slf4j.spi;resolution:=optional, org.slf4j.helpers;resolution:=optional, org.xml.sax, org.xml.sax.helpers, org.eclipse.jetty.annotations;resolution:=optional, *
+            <DynamicImport-Package>org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))"</DynamicImport-Package>
+            <Import-Package>javax.mail;version="1.4.0";resolution:=optional,
+                javax.mail.event;version="1.4.0";resolution:=optional,
+                javax.mail.internet;version="1.4.0";resolution:=optional,
+                javax.mail.search;version="1.4.0";resolution:=optional,
+                javax.mail.util;version="1.4.0";resolution:=optional,
+                javax.servlet;version="[$(version;===;${javax.servlet.api.version}),$(version;+;${javax.servlet.api.version}))",
+                javax.servlet.http;version="[$(version;===;${javax.servlet.api.version}),$(version;+;${javax.servlet.api.version}))",
+                javax.transaction;version="1.1.0";resolution:=optional,
+                javax.transaction.xa;version="1.1.0";resolution:=optional,
+                org.objectweb.asm;version="$(version;=;${asm.version})";resolution:=optional,
+                org.osgi.framework,
+                org.osgi.service.cm;version="1.2.0",
+                org.osgi.service.packageadmin,
+                org.osgi.service.startlevel;version="1.0.0",
+                org.osgi.service.url;version="1.0.0",
+                org.osgi.util.tracker;version="1.3.0",
+                org.slf4j;resolution:=optional,
+                org.slf4j.spi;resolution:=optional,
+                org.slf4j.helpers;resolution:=optional,
+                org.xml.sax,
+                org.xml.sax.helpers,
+                org.eclipse.jetty.annotations;resolution:=optional,
+                *
             </Import-Package>
             <_nouses>true</_nouses>
           </instructions>
diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml
index 41be273d47e..84abbfffe74 100644
--- a/jetty-osgi/test-jetty-osgi-context/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-context/pom.xml
@@ -67,7 +67,7 @@
             of the packages it uses; no need to reflect some tight dependency determined at
             compilation time. -->
             <_nouses>true</_nouses>
-            <DynamicImport-Package>org.eclipse.jetty.*;version="[9.1,10.0)"</DynamicImport-Package>
+            <DynamicImport-Package>org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))"</DynamicImport-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml
index 030a553a148..3bf193d7d30 100644
--- a/jetty-osgi/test-jetty-osgi-server/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-server/pom.xml
@@ -58,7 +58,7 @@
             of the packages it uses; no need to reflect some tight dependency determined at
             compilation time. -->
             <_nouses>true</_nouses>
-            <DynamicImport-Package>org.eclipse.jetty.*;version="[9.1,10.0)"</DynamicImport-Package>
+            <DynamicImport-Package>org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))"</DynamicImport-Package>
           </instructions>
         </configuration>
       </plugin>