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

ops4j · Jun 12, 2023 · 392c018 · 392c018
1 parent 0acf95f
commit 392c018
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 21 deletions.
diff --git a/pax-web-websocket/pom.xml b/pax-web-websocket/pom.xml
@@ -42,17 +42,20 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							<!-- ranges indicate we can work with OSGi Core R6+ -->
-							org.osgi.framework;version="[1.8,2)",
+							<!-- OSGi Core R8+ -->
+							org.osgi.dto;version="[1.1,2)",
+							org.osgi.framework;version="[1.10,2)",
 
-							javax.servlet;version="[3.1,5)",
-							javax.servlet.annotation;version="[3.1,5)",
-							javax.servlet.http;version="[3.1,5)",
-							javax.websocket;version="[1.1,2)",
-							javax.websocket.server;version="[1.1,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)",
+
+							jakarta.websocket;version="[2.1,3)";resolution:=optional,
+							jakarta.websocket.server;version="[2.1,3)";resolution:=optional,
 
 							<!-- from pax-logging-api -->
-							org.slf4j;version="[1.7,2)",
+							org.slf4j;version="[2,3)",
 
 							org.ops4j.pax.web.service.spi.model.elements
 						</Import-Package>
@@ -86,7 +89,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
@@ -98,6 +101,11 @@
 			<artifactId>jakarta.websocket-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.websocket</groupId>
+			<artifactId>jakarta.websocket-client-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 		<!-- Logging -->
 

diff --git a/...ava/org/ops4j/pax/web/websocket/internal/PaxWebWebSocketsServletContainerInitializer.java b/...ava/org/ops4j/pax/web/websocket/internal/PaxWebWebSocketsServletContainerInitializer.java
@@ -23,15 +23,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.websocket.Decoder;
-import javax.websocket.DeploymentException;
-import javax.websocket.Encoder;
-import javax.websocket.Extension;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.Extension;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
 
 import org.ops4j.pax.web.service.spi.model.elements.ContainerInitializerModel;
 import org.ops4j.pax.web.service.spi.model.elements.ContainerInitializerModelAware;
@@ -43,7 +43,7 @@
  * A {@link ServletContainerInitializer} that can use existing
  * {@link org.ops4j.pax.web.service.spi.model.elements.ContainerInitializerModel} and
  * {@link org.ops4j.pax.web.service.spi.model.elements.WebSocketModel} to register WebSocket endpoints in previously
- * configured {@link javax.websocket.server.ServerContainer}.
+ * configured {@link jakarta.websocket.server.ServerContainer}.
  */
 public class PaxWebWebSocketsServletContainerInitializer implements ServletContainerInitializer,
 		ContainerInitializerModelAware {
@@ -57,7 +57,7 @@ public void onStartup(Set<Class<?>> c, ServletContext ctx) throws ServletExcepti
 		ServerContainer wsContainer = (ServerContainer) ctx.getAttribute(ServerContainer.class.getName());
 
 		if (wsContainer == null) {
-			LOG.warn("No javax.websocket.server.ServerContainer available in servlet context." +
+			LOG.warn("No jakarta.websocket.server.ServerContainer available in servlet context." +
 					" Skipping WebSocket registration.");
 			return;
 		}
@@ -105,7 +105,7 @@ public void onStartup(Set<Class<?>> c, ServletContext ctx) throws ServletExcepti
 		}
 
 		if (!annotatedEndpointInstances.isEmpty()) {
-			// we have to prepare ONE javax.websocket.server.ServerEndpointConfig object for each
+			// we have to prepare ONE jakarta.websocket.server.ServerEndpointConfig object for each
 			// WebSocket endpoint instance
 			for (Map.Entry<WebSocketModel, Object> e : annotatedEndpointInstances.entrySet()) {
 				WebSocketModel wsm = e.getKey();