[#1802] Unify OSGi manifest headers declared in POMs

ops4j · Jul 26, 2023 · 7cc0d9f · 7cc0d9f
1 parent 100c567
commit 7cc0d9f
Show file tree

Hide file tree

Showing 88 changed files with 397 additions and 293 deletions.
diff --git a/pax-web-api/pom.xml b/pax-web-api/pom.xml
@@ -126,7 +126,7 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							<!-- Servlet API 6.0+ (JakartaEE 10+) -->
 							jakarta.servlet;version="[6,7)",
 							jakarta.servlet.annotation;version="[6,7)",
 							jakarta.servlet.http;version="[6,7)",

diff --git a/pax-web-deployer/pom.xml b/pax-web-deployer/pom.xml
@@ -47,11 +47,11 @@
 					<instructions>
 						<Bundle-Activator>org.ops4j.pax.web.deployer.internal.Activator</Bundle-Activator>
 						<Import-Package>
-							<!-- ranges indicate we can work with OSGi Core R6+ -->
-							org.osgi.framework;version="[1.8,2)",
+							<!-- OSGi Core R8+ -->
+							org.osgi.framework;version="[1.10,2)",
 
 							<!-- from pax-logging-api -->
-							org.slf4j;version="[1.7,2)",
+							org.slf4j;version="[2,3)",
 
 							org.apache.felix.fileinstall;version="[3,4)"
 						</Import-Package>

diff --git a/pax-web-extender-war/pom.xml b/pax-web-extender-war/pom.xml
@@ -43,15 +43,15 @@
 					<instructions>
 						<Bundle-Activator>org.ops4j.pax.web.extender.war.internal.Activator</Bundle-Activator>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							<!-- Servlet API 6.0+ (JakartaEE 10+) -->
 							jakarta.servlet;version="[6,7)",
 							jakarta.servlet.annotation;version="[6,7)",
 							jakarta.servlet.descriptor;version="[6,7)",
 							jakarta.servlet.http;version="[6,7)",
 
 							<!-- for annotation scanning on listeners, servlets and filters -->
-							jakarta.annotation;version="[2,3)",
-							jakarta.annotation.security;version="[2,3)",
+							jakarta.annotation;version="[2.1,3)",
+							jakarta.annotation.security;version="[2.1,3)",
 
 							<!-- OSGi Core R8+ -->
 							org.osgi.framework;version="[1.10,2)",

diff --git a/pax-web-extender-whiteboard/pom.xml b/pax-web-extender-whiteboard/pom.xml
@@ -43,7 +43,7 @@
 					<instructions>
 						<Bundle-Activator>org.ops4j.pax.web.extender.whiteboard.internal.Activator</Bundle-Activator>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							<!-- Servlet API 6.0+ (JakartaEE 10+) -->
 							jakarta.servlet;version="[6,7)",
 							jakarta.servlet.annotation;version="[6,7)",
 							jakarta.servlet.http;version="[6,7)",

diff --git a/pax-web-itest/pax-web-itest-common/pom.xml b/pax-web-itest/pax-web-itest-common/pom.xml
@@ -54,7 +54,7 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							<!-- Servlet API 6.0+ (JakartaEE 10+) -->
 							jakarta.servlet;version="[6,7)",
 							jakarta.servlet.annotation;version="[6,7)",
 							jakarta.servlet.http;version="[6,7)",

diff --git a/pax-web-itest/pax-web-itest-container/pax-web-itest-container-common/pom.xml b/pax-web-itest/pax-web-itest-container/pax-web-itest-container-common/pom.xml
@@ -54,15 +54,16 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 3.1+ (JakartaEE 7+) -->
-							jakarta.servlet;version="[3.1,5)",
-							jakarta.servlet.annotation;version="[3.1,5)",
-							jakarta.servlet.http;version="[3.1,5)",
-							jakarta.websocket;resolution:=optional,
-							jakarta.websocket.server;resolution:=optional,
-
-							<!-- ranges indicate we can work with OSGi Core R6+ -->
-							org.osgi.framework;version="[1.8,2)",
+							<!-- Servlet API 6.0+ (JakartaEE 10+) -->
+							jakarta.servlet;version="[6,7)",
+							jakarta.servlet.annotation;version="[6,7)",
+							jakarta.servlet.http;version="[6,7)",
+
+							jakarta.websocket;version="[2.1,3)";resolution:=optional,
+							jakarta.websocket.server;version="[2.1,3)";resolution:=optional,
+
+							<!-- OSGi Core R8+ -->
+							org.osgi.framework;version="[1.10,2)",
 							org.osgi.framework.wiring;version="[1.2,2)",
 							org.osgi.util.tracker;version="[1.5,2)",
 
@@ -90,7 +91,7 @@
 							org.ops4j.pax.web.itest.utils.web,
 
 							<!-- from pax-logging-api -->
-							org.slf4j;version="[1.7,2)",
+							org.slf4j;version="[2,3)",
 
 							<!-- test dependencies -->
 							javax.inject,
@@ -174,42 +175,42 @@
 			<artifactId>pax-web-itest-utils</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-compatibility-servlet31</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-compatibility-cdi12</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-compatibility-el2</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-compatibility-interceptor12</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-compatibility-annotation13</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-compatibility-jpa2</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-compatibility-jaxrs2</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-fragment-myfaces-inject</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-fragment-myfaces-spifly</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-compatibility-servlet31</artifactId>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-compatibility-cdi12</artifactId>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-compatibility-el2</artifactId>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-compatibility-interceptor12</artifactId>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-compatibility-annotation13</artifactId>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-compatibility-jpa2</artifactId>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-compatibility-jaxrs2</artifactId>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-fragment-myfaces-inject</artifactId>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-fragment-myfaces-spifly</artifactId>-->
+<!--		</dependency>-->
 
 		<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
@@ -409,16 +410,16 @@
 			<type>war</type>
 		</dependency>
 
-		<dependency>
-			<groupId>org.ops4j.pax.web.samples</groupId>
-			<artifactId>war-vaadin08</artifactId>
-			<type>war</type>
-		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web.samples</groupId>
-			<artifactId>war-vaadin08-spring</artifactId>
-			<type>war</type>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web.samples</groupId>-->
+<!--			<artifactId>war-vaadin08</artifactId>-->
+<!--			<type>war</type>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web.samples</groupId>-->
+<!--			<artifactId>war-vaadin08-spring</artifactId>-->
+<!--			<type>war</type>-->
+<!--		</dependency>-->
 
 		<dependency>
 			<groupId>org.ops4j.pax.web.samples</groupId>
@@ -484,10 +485,10 @@
 			<groupId>org.ops4j.pax.web.samples</groupId>
 			<artifactId>authentication</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web.samples</groupId>
-			<artifactId>hs-jersey</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web.samples</groupId>-->
+<!--			<artifactId>hs-jersey</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.ops4j.pax.web.samples</groupId>
 			<artifactId>http-custom-context</artifactId>

diff --git a/pax-web-itest/pax-web-itest-container/pax-web-itest-jetty/pom.xml b/pax-web-itest/pax-web-itest-container/pax-web-itest-jetty/pom.xml
@@ -57,11 +57,11 @@
 			<artifactId>pax-web-jetty</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-jetty-bundle</artifactId>
-			<scope>runtime</scope>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-jetty-bundle</artifactId>-->
+<!--			<scope>runtime</scope>-->
+<!--		</dependency>-->
 
 		<!-- OPS4J dependencies -->
 

diff --git a/pax-web-itest/pax-web-itest-container/pax-web-itest-tomcat/pom.xml b/pax-web-itest/pax-web-itest-container/pax-web-itest-tomcat/pom.xml
@@ -62,11 +62,11 @@
 			<artifactId>pax-web-tomcat</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-tomcat-bundle</artifactId>
-			<scope>runtime</scope>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-tomcat-bundle</artifactId>-->
+<!--			<scope>runtime</scope>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.ops4j.pax.web</groupId>
 			<artifactId>pax-web-tomcat-websocket</artifactId>

diff --git a/pax-web-itest/pax-web-itest-container/pax-web-itest-undertow/pom.xml b/pax-web-itest/pax-web-itest-container/pax-web-itest-undertow/pom.xml
@@ -77,11 +77,11 @@
 			<artifactId>pax-web-undertow-websocket</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-undertow-bundle</artifactId>
-			<scope>runtime</scope>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-undertow-bundle</artifactId>-->
+<!--			<scope>runtime</scope>-->
+<!--		</dependency>-->
 
 		<!-- OPS4J dependencies -->
 

diff --git a/pax-web-itest/pax-web-itest-osgi/pom.xml b/pax-web-itest/pax-web-itest-osgi/pom.xml
@@ -165,10 +165,10 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.ops4j.pax.web</groupId>
-			<artifactId>pax-web-compatibility-annotation13</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.ops4j.pax.web</groupId>-->
+<!--			<artifactId>pax-web-compatibility-annotation13</artifactId>-->
+<!--		</dependency>-->
 
 		<!-- pax-web internal samples -->
 

diff --git a/pax-web-itest/pax-web-itest-utils/pom.xml b/pax-web-itest/pax-web-itest-utils/pom.xml
@@ -61,7 +61,7 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							<!-- Servlet API 6.0+ (JakartaEE 10+) -->
 							jakarta.servlet;version="[6,7)",
 							jakarta.servlet.annotation;version="[6,7)",
 							jakarta.servlet.http;version="[6,7)",

diff --git a/pax-web-jetty-bundle/pom.xml b/pax-web-jetty-bundle/pom.xml
@@ -49,18 +49,18 @@
 					<instructions>
 						<Bundle-Activator>org.ops4j.pax.web.service.jetty.bundle.internal.CompositeActivator</Bundle-Activator>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 3.1+ (JavaEE 7+) -->
-							javax.servlet;version="[3.1,5)",
-							javax.servlet.annotation;version="[3.1,5)",
-							javax.servlet.descriptor;version="[3.1,5)",
-							javax.servlet.http;version="[3.1,5)",
-
-							javax.websocket;version="[1.1,2)";resolution:=optional,
-							javax.websocket.server;version="[1.1,2)";resolution:=optional,
-
-							<!-- ranges indicate we can work with OSGi Core R6+ -->
-							org.osgi.framework;version="[1.8,2)",
-							org.osgi.framework.dto;version="[1.0,2)",
+							<!-- Servlet API 6.0+ (JakartaEE 10+) -->
+							jakarta.servlet;version="[6,7)",
+							jakarta.servlet.annotation;version="[6,7)",
+							jakarta.servlet.descriptor;version="[6,7)",
+							jakarta.servlet.http;version="[6,7)",
+
+							jakarta.websocket;version="[2.1,3)";resolution:=optional,
+							jakarta.websocket.server;version="[2.1,3)";resolution:=optional,
+
+							<!-- OSGi Core R8+ -->
+							org.osgi.framework;version="[1.10,2)",
+							org.osgi.framework.dto;version="[1.8,2)",
 							org.osgi.framework.wiring;version="[1.2,2)",
 							org.osgi.util.tracker;version="[1.5,2)",
 
@@ -93,16 +93,17 @@
 							org.ops4j.pax.web.service.spi.whiteboard;version="${pax-web.osgi.version}",
 
 							<!-- from pax-logging-api -->
-							org.slf4j;version="[1.7,2)",
-							org.slf4j.helpers;version="[1.7,2)";resolution:=optional,
-							org.slf4j.spi;version="[1.7,2)";resolution:=optional,
-							org.osgi.service.log;version="[1.3,2)";resolution:=optional,
+							org.slf4j;version="[2,3)",
+							org.slf4j.helpers;version="[2,3)";resolution:=optional,
+							org.slf4j.spi;version="[2,3)";resolution:=optional,
+							org.osgi.service.log;version="[1.5,2)";resolution:=optional,
 
 							<!-- other -->
 							org.objectweb.asm;version="[9.2,10)";resolution:=optional,
 
-							javax.annotation;version="[1.2,2)";resolution:=optional,
-							javax.annotation.security;version="[1.2,2)";resolution:=optional,
+							jakarta.annotation;version="[2.1,3)";resolution:=optional,
+							jakarta.annotation.security;version="[2.1,3)";resolution:=optional,
+
 							javax.imageio;resolution:=optional,
 							javax.mail;resolution:=optional,
 							javax.management;resolution:=optional,

diff --git a/pax-web-jetty/pom.xml b/pax-web-jetty/pom.xml
@@ -43,11 +43,13 @@
 					<instructions>
 						<Bundle-Activator>org.ops4j.pax.web.service.jetty.internal.Activator</Bundle-Activator>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							<!-- Servlet API 6.0+ (JakartaEE 10+) -->
 							jakarta.servlet;version="[6,7)",
 							jakarta.servlet.annotation;version="[6,7)",
 							jakarta.servlet.http;version="[6,7)",
 
+							jakarta.annotation;version="[2.1,3)";resolution:=optional,
+
 							<!-- OSGi Core R8+ -->
 							org.osgi.framework;version="[1.10,2)",
 							org.osgi.framework.wiring;version="[1.2,2)",
@@ -76,7 +78,6 @@
 							org.eclipse.jetty.servlets;resolution:=optional,
 
 							<!-- other -->
-							jakarta.annotation;version="[2,3)";resolution:=optional,
 							javax.management,
 							javax.net.ssl,
 							javax.xml.parsers,

diff --git a/pax-web-jsp/pom.xml b/pax-web-jsp/pom.xml
@@ -44,7 +44,7 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							<!-- Servlet API 6.0+ (JakartaEE 10+) -->
 							jakarta.servlet;version="[6,7)",
 							jakarta.servlet.annotation;version="[6,7)",
 							jakarta.servlet.descriptor;version="[6,7)",