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 @@
- org.eclipse.jetty.alpn;resolution:=optional,*
+ ${osgi.common.import.packages},org.eclipse.jetty.alpn;resolution:=optional,*
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
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 @@
Conscrypt Client ALPN
- org.conscrypt;version="${conscrypt.version}",*
+ ${osgi.common.import.packages},org.conscrypt;version="${conscrypt.version}",*
*
osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Client
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 @@
Conscrypt ALPN
- org.conscrypt;version="${conscrypt.version}",*
+ ${osgi.common.import.packages},org.conscrypt;version="${conscrypt.version}",*
osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
osgi.serviceloader;osgi.serviceloader=org.eclipse.jetty.io.ssl.ALPNProcessor$Server
<_nouses>true
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 @@
true
- org.objectweb.asm;version="5",*
+ ${osgi.common.import.packages},org.objectweb.asm;version="5",*
osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional
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 @@
true
- javax.mail.*;resolution:=optional,*
+ ${osgi.common.import.packages},javax.mail.*;resolution:=optional,*
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 @@
org.eclipse.jetty.osgi.boot;singleton:=true
org.eclipse.jetty.osgi.boot.JettyBootstrapActivator
org.eclipse.jetty.*;version="[$(version;===;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))"
- 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,
- *
+
+ ${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,
+ *
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
- 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,
+ *
org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))"
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
- 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,
+ *
org.eclipse.jetty.*;version="[$(version;==;${parsedVersion.osgiVersion}),$(version;+;${parsedVersion.osgiVersion}))"
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 @@
true
- javax.transaction.*;version="1.1",*
+ ${osgi.common.import.packages},javax.transaction.*;version="1.1",*
osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
diff --git a/pom.xml b/pom.xml
index 5486a2c07ac5..d274658df91e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,9 @@
1.0.6
1.10.9
+
+ 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)"
+
false
-Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx4g -Xms2g -Xlog:gc:stderr:time,level,tags
@@ -742,7 +745,7 @@
.
Copyright (c) 2008-2021 Mort Bay Consulting Pty Ltd and others.
- org.slf4j.*;version="[1.7,3.0)",
+ ${osgi.common.import.packages}
*
<_provider-policy>]]>