[#1802] Switch samples-jsp from javax to jakarta

ops4j · Jun 21, 2023 · b03892b · b03892b
1 parent dbde49a
commit b03892b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/samples/samples-jsp/helloworld-jsp-noclasses/pom.xml b/samples/samples-jsp/helloworld-jsp-noclasses/pom.xml
@@ -60,11 +60,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
-			<artifactId>osgi.cmpn</artifactId>
+			<artifactId>org.osgi.service.servlet</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/samples/samples-jsp/helloworld-jsp/pom.xml b/samples/samples-jsp/helloworld-jsp/pom.xml
@@ -43,28 +43,26 @@
 					<instructions>
 						<Bundle-Activator>org.ops4j.pax.web.samples.helloworld.jsp.internal.Activator</Bundle-Activator>
 						<Import-Package>
-							<!-- ranges indicate Servlet API 3.1+ (JavaEE 7+) -->
-							javax.servlet;version="[3.1,5)",
-							javax.servlet.http;version="[3.1,5)",
+							<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
+							jakarta.servlet;version="[6,7)",
+							jakarta.servlet.http;version="[6,7)",
 
-							<!-- 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)",
 							org.osgi.util.tracker;version="[1.5,2)",
 
-							<!-- OSGi cmpn -->
-							org.osgi.service.http;version="[1.2,2)",
-
 							<!-- pax-web-api -->
 							org.ops4j.pax.web.service;version="${pax-web.osgi.version}",
+							org.ops4j.pax.web.service.http;version="${pax-web.osgi.version}",
 
 							<!-- packages needed to load precompiled JSP classes -->
-							javax.el,
+							jakarta.el,
 							org.apache.el,
 							org.apache.jasper.el,
 							org.apache.jasper.runtime,
 							org.apache.taglibs.standard.tag.rt.core,
-							javax.servlet.jsp,
-							javax.servlet.jsp.tagext,
+							jakarta.servlet.jsp,
+							jakarta.servlet.jsp.tagext,
 						</Import-Package>
 						<Export-Package />
 						<Private-Package>
@@ -111,11 +109,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
-			<artifactId>osgi.cmpn</artifactId>
+			<artifactId>org.osgi.service.servlet</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/...oworld-jsp/src/main/java/org/ops4j/pax/web/samples/helloworld/jsp/internal/Activator.java b/...oworld-jsp/src/main/java/org/ops4j/pax/web/samples/helloworld/jsp/internal/Activator.java
@@ -15,14 +15,14 @@
  */
 package org.ops4j.pax.web.samples.helloworld.jsp.internal;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
 
 import org.ops4j.pax.web.service.WebContainer;
+import org.ops4j.pax.web.service.http.NamespaceException;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.http.NamespaceException;
 import org.osgi.util.tracker.ServiceTracker;
 import org.osgi.util.tracker.ServiceTrackerCustomizer;