From 2153486d07d442129c217d835c44d1f75b15d045 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 9 Jun 2021 11:36:31 -0500
Subject: [PATCH] Issue #6354 - OSGI manifest for slf4j-api packages lower
 limit should be 1.7

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 jetty-alpn/jetty-alpn-client/pom.xml          |  2 +-
 .../jetty-alpn-conscrypt-client/pom.xml       |  2 +-
 .../jetty-alpn-conscrypt-server/pom.xml       |  2 +-
 jetty-annotations/pom.xml                     |  2 +-
 jetty-jndi/pom.xml                            |  2 +-
 jetty-osgi/jetty-osgi-boot/pom.xml            | 47 +++++++++----------
 jetty-osgi/test-jetty-osgi-context/pom.xml    | 13 ++++-
 jetty-osgi/test-jetty-osgi-server/pom.xml     | 13 ++++-
 jetty-plus/pom.xml                            |  2 +-
 pom.xml                                       |  5 +-
 10 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml
index a577cfd699ee..37ee52e64145 100644
--- a/jetty-alpn/jetty-alpn-client/pom.xml
+++ b/jetty-alpn/jetty-alpn-client/pom.xml
@@ -24,7 +24,7 @@
             </goals>
             <configuration>
               <instructions>
-                <Import-Package>org.eclipse.jetty.alpn;resolution:=optional,*</Import-Package>
+                <Import-Package>${osgi.common.import.packages},org.eclipse.jetty.alpn;resolution:=optional,*</Import-Package>
                 <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client)";resolution:=optional;cardinality:=multiple</Require-Capability>
               </instructions>
             </configuration>
diff --git a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
index 5f1b5180a482..426a97ccb6b1 100644
--- a/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
+++ b/jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
@@ -52,7 +52,7 @@
         <configuration>
           <instructions>
             <Bundle-Description>Conscrypt Client ALPN</Bundle-Description>
-            <Import-Package>org.conscrypt;version="${conscrypt.version}",*</Import-Package>
+            <Import-Package>${osgi.common.import.packages},org.conscrypt;version="${conscrypt.version}",*</Import-Package>
             <Export-Package>*</Export-Package>
             <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
             <Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client</Provide-Capability>
diff --git a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
index 554fd99abc25..7384551d77a6 100644
--- a/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
+++ b/jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
@@ -80,7 +80,7 @@
         <configuration>
           <instructions>
             <Bundle-Description>Conscrypt ALPN</Bundle-Description>
-            <Import-Package>org.conscrypt;version="${conscrypt.version}",*</Import-Package>
+            <Import-Package>${osgi.common.import.packages},org.conscrypt;version="${conscrypt.version}",*</Import-Package>
             <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
             <Provide-Capability>osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server</Provide-Capability>
             <_nouses>true</_nouses>
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index 004c3e4775c8..b815d8a8216b 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -30,7 +30,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>org.objectweb.asm;version="5",*</Import-Package>
+            <Import-Package>${osgi.common.import.packages},org.objectweb.asm;version="5",*</Import-Package>
             <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional
             </Require-Capability>
           </instructions>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index ef93ea29417d..05706f9d96cc 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -31,7 +31,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>javax.mail.*;resolution:=optional,*</Import-Package>
+            <Import-Package>${osgi.common.import.packages},javax.mail.*;resolution:=optional,*</Import-Package>
           </instructions>
         </configuration>
       </plugin>
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index c75a930bdf9b..6a7856ff47e1 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -71,30 +71,29 @@
             <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="[$(version;==;${servlet.api.version}),$(version;+;${servlet.api.version}))",
-                javax.servlet.http;version="[$(version;==;${servlet.api.version}),$(version;+;${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.4.0",
-                org.osgi.service.event;version="1.4.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>
+              ${osgi.common.import.packages},
+              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;==;${servlet.api.version}),$(version;+;${servlet.api.version}))",
+              javax.servlet.http;version="[$(version;==;${servlet.api.version}),$(version;+;${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.4.0",
+              org.osgi.service.event;version="1.4.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.xml.sax,
+              org.xml.sax.helpers,
+              org.eclipse.jetty.annotations;resolution:=optional,
+              *
             </Import-Package>
             <Require-Capability>
               osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml
index ee75b3a3d9c0..84219fd1ae67 100644
--- a/jetty-osgi/test-jetty-osgi-context/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-context/pom.xml
@@ -74,7 +74,18 @@
             compilation time. -->
             <_nouses>true</_nouses>
             <Import-Package>
-              javax.servlet;version="[3.1,4.1)", javax.servlet.resources;version="[3.1,4.1)", 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, *
+              ${osgi.common.import.packages},
+              javax.servlet;version="[3.1,4.1)",
+              javax.servlet.resources;version="[3.1,4.1)",
+              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.xml.sax,
+              org.xml.sax.helpers,
+              *
             </Import-Package>
             <DynamicImport-Package>org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))"</DynamicImport-Package>
           </instructions>
diff --git a/jetty-osgi/test-jetty-osgi-server/pom.xml b/jetty-osgi/test-jetty-osgi-server/pom.xml
index b841cae9d5ed..2c41b1fed88f 100644
--- a/jetty-osgi/test-jetty-osgi-server/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-server/pom.xml
@@ -66,7 +66,18 @@
             compilation time. -->
             <_nouses>true</_nouses>
             <Import-Package>
-              javax.servlet;version="[3.1,4.1)", javax.servlet.resources;version="[3.1,4.1)", org.osgi.framework, org.osgi.service.cm;version="1.2.0", org.osgi.service.packageadmin, org.osgi.service.startlevel;version="1.0.o", 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, *
+              ${osgi.common.import.packages},
+              javax.servlet;version="[3.1,4.1)",
+              javax.servlet.resources;version="[3.1,4.1)",
+              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.xml.sax,
+              org.xml.sax.helpers,
+              *
             </Import-Package>
             <DynamicImport-Package>org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))"</DynamicImport-Package>
           </instructions>
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 63d03a59bef9..18acdf6eebf1 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -23,7 +23,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>javax.transaction.*;version="1.1",*</Import-Package>
+            <Import-Package>${osgi.common.import.packages},javax.transaction.*;version="1.1",*</Import-Package>
             <Require-Capability>
               osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
             </Require-Capability>
diff --git a/pom.xml b/pom.xml
index 5486a2c07ac5..d274658df91e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,9 @@
     <jetty.perf-helper.version>1.0.6</jetty.perf-helper.version>
     <ant.version>1.10.9</ant.version>
     <unix.socket.tmp></unix.socket.tmp>
+    <!-- OSGI import-package -->
+    <osgi.common.import.packages>org.slf4j;version="[1.7,3.0)", org.slf4j.event;version="[1.7,3.0)", org.slf4j.helpers;version="[1.7,3.0)", org.slf4j.spi;version="[1.7,3.0)"</osgi.common.import.packages>
+
     <!-- enable or not TestTracker junit5 extension i.e log message when test method is starting -->
     <jetty.testtracker.log>false</jetty.testtracker.log>
     <jetty.surefire.argLine>-Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx4g -Xms2g -Xlog:gc:stderr:time,level,tags</jetty.surefire.argLine>
@@ -742,7 +745,7 @@
               <Bundle-Classpath>.</Bundle-Classpath>
               <Bundle-Copyright>Copyright (c) 2008-2021 Mort Bay Consulting Pty Ltd and others.</Bundle-Copyright>
               <Import-Package>
-                org.slf4j.*;version="[1.7,3.0)",
+                ${osgi.common.import.packages}
                 *
               </Import-Package>
               <_provider-policy><![CDATA[$<range;[===,=+)>]]></_provider-policy>