[#1802] Switch pax-web-extender-whiteboard from javax to jakarta

ops4j · Jun 13, 2023 · 7f2320d · 7f2320d
1 parent 567ebc7
commit 7f2320d
Show file tree

Hide file tree

Showing 28 changed files with 161 additions and 257 deletions.
diff --git a/pax-web-extender-whiteboard/pom.xml b/pax-web-extender-whiteboard/pom.xml
@@ -43,28 +43,28 @@
 					<instructions>
 						<Bundle-Activator>org.ops4j.pax.web.extender.whiteboard.internal.Activator</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.http;version="[3.1,5)",
-
-							<!-- ranges indicate we can work with OSGi Core R6+ -->
-							org.osgi.dto;version="[1.0,2)",
-							org.osgi.framework;version="[1.8,2)",
+							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							jakarta.servlet;version="[6,7)",
+							jakarta.servlet.annotation;version="[6,7)",
+							jakarta.servlet.http;version="[6,7)",
+
+							<!-- OSGi Core R8+ -->
+							org.osgi.dto;version="[1.1,2)",
+							org.osgi.framework;version="[1.10,2)",
 							org.osgi.framework.wiring;version="[1.2,2)",
 							org.osgi.util.tracker;version="[1.5,2)",
 
 							<!-- OSGi cmpn -->
-							org.osgi.service.cm;version="[1.0,2.0)";resolution:=optional,
-							org.osgi.service.event;resolution:=optional,
-							org.osgi.service.http;version="[1.2,2)",
-							org.osgi.service.http.context;version="[1.1,2)",
-							org.osgi.service.http.runtime;version="[1.1,2)",
-							org.osgi.service.http.runtime.dto;version="[1.1,2)",
-							org.osgi.service.http.whiteboard;version="[1.1,2)",
+							org.osgi.service.cm;version="[1.6,2.0)";resolution:=optional,
+							org.osgi.service.event;version="[1.4,2.0)";resolution:=optional,
+							org.osgi.service.servlet.context;version="[2,3)",
+							org.osgi.service.servlet.runtime;version="[2,3)",
+							org.osgi.service.servlet.runtime.dto;version="[2,3)",
+							org.osgi.service.servlet.whiteboard;version="[2,3)",
 
 							<!-- from pax-web-api -->
 							org.ops4j.pax.web.service;version="${pax-web.osgi.version}",
+							org.ops4j.pax.web.service.http;version="${pax-web.osgi.version}",
 							org.ops4j.pax.web.service.whiteboard;version="${pax-web.osgi.version}",
 							org.ops4j.pax.web.utils;version="${pax-web.osgi.version}",
 							<!-- from pax-web-spi -->
@@ -79,19 +79,7 @@
 							org.ops4j.pax.web.service.spi.whiteboard;version="${pax-web.osgi.version}",
 
 							<!-- from pax-logging-api -->
-							org.slf4j;version="[1.7,2)",
-
-							<!-- to check -->
-
-<!--							org.ops4j.pax.web.extender.whiteboard; version="${pax-web.osgi.version}",-->
-<!--							org.ops4j.pax.web.extender.whiteboard.runtime; version="${pax-web.osgi.version}",-->
-<!--							javax.xml.parsers,-->
-<!--							javax.security.auth,-->
-<!--							javax.security.auth.callback,-->
-<!--							javax.security.auth.login,-->
-<!--							javax.websocket.*; resolution:=optional,,-->
-<!--							!javax.microedition.io,-->
-<!--							!javax.security.auth.x500-->
+							org.slf4j;version="[2,3)"
 						</Import-Package>
 						<Private-Package>
 							org.ops4j.pax.web.extender.whiteboard.internal.*
@@ -101,19 +89,12 @@
 							org.ops4j.pax.web.extender.whiteboard;version="${pax-web.osgi.version}",
 							org.ops4j.pax.web.extender.whiteboard.runtime;version="${pax-web.osgi.version}"
 						</Export-Package>
+						<!-- TODO: JakartaEE 10 -->
 <!--						<Provide-Capability>-->
 <!--							osgi.contract;osgi.contract=JavaEL;version:Version="3";uses:="javax.el",-->
-<!--							osgi.contract;osgi.contract=JavaJSP;version:Version="2.3";uses!="javax.servlet.jsp,javax.servlet.jsp.el,javax.servlet.jsp.tagext",-->
-<!--							osgi.contract;osgi.contract=JavaJSTL;version:Version="1.2";uses:="javax.servlet.jsp.jstl.core,javax.servlet.jsp.jstl.fmt,javax.servlet.jsp.jstl.sql,javax.servlet.jsp.jstl.tlv"-->
+<!--							osgi.contract;osgi.contract=JavaJSP;version:Version="2.3";uses!="jakarta.servlet.jsp,jakarta.servlet.jsp.el,jakarta.servlet.jsp.tagext",-->
+<!--							osgi.contract;osgi.contract=JavaJSTL;version:Version="1.2";uses:="jakarta.servlet.jsp.jstl.core,jakarta.servlet.jsp.jstl.fmt,jakarta.servlet.jsp.jstl.sql,jakarta.servlet.jsp.jstl.tlv"-->
 <!--						</Provide-Capability>-->
-						<Embed-Dependency>
-							ops4j-base-lang;inline=true
-						</Embed-Dependency>
-						<!--						<Embed-Dependency>-->
-<!--							*; scope=compile; type=!pom; inline=true-->
-<!--						</Embed-Dependency>-->
-<!--						<Embed-Transitive>true</Embed-Transitive>-->
-<!--						<_dsannotations>*</_dsannotations>-->
 					</instructions>
 				</configuration>
 			</plugin>
@@ -133,24 +114,6 @@
 			<artifactId>pax-web-spi</artifactId>
 		</dependency>
 
-		<!-- OPS4J dependencies -->
-
-		<dependency>
-			<groupId>org.ops4j.base</groupId>
-			<artifactId>ops4j-base-lang</artifactId>
-			<optional>true</optional>
-		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>org.ops4j.pax.swissbox</groupId>-->
-<!--			<artifactId>pax-swissbox-core</artifactId>-->
-<!--			<optional>true</optional>-->
-<!--		</dependency>-->
-<!--		<dependency>-->
-<!--			<groupId>org.ops4j.pax.swissbox</groupId>-->
-<!--			<artifactId>pax-swissbox-optional-jcl</artifactId>-->
-<!--			<optional>true</optional>-->
-<!--		</dependency>-->
-
 		<!-- OSGi -->
 
 		<dependency>
@@ -163,19 +126,19 @@
 			<artifactId>osgi.core</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.servlet</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>jakarta.websocket</groupId>-->
-<!--			<artifactId>jakarta.websocket-api</artifactId>-->
-<!--			<scope>provided</scope>-->
-<!--		</dependency>-->
 
 		<!-- Logging -->
 
@@ -186,15 +149,25 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 		<!-- Testing -->
 
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>