Fixing build for 11.0.x

jetty · Apr 5, 2024 · 2779761 · 2779761
1 parent 804a6e6
commit 2779761
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 25 deletions.
diff --git a/embedded/servlet-with-cdi/pom.xml b/embedded/servlet-with-cdi/pom.xml
@@ -4,25 +4,20 @@
   <parent>
     <groupId>org.eclipse.jetty.examples.embedded</groupId>
     <artifactId>jetty-embedded-examples</artifactId>
-    <version>10.0.x</version>
+    <version>11.0.x</version>
   </parent>
   <artifactId>servlet-with-cdi</artifactId>
-  <version>10.0.x</version>
+  <version>11.0.x</version>
   <packaging>jar</packaging>
-  <name>Jetty Examples :: Jetty 10.0.x :: Embedded :: Servlet with CDI</name>
+  <name>Jetty Examples :: Jetty 11.0.x :: Embedded :: Servlet with CDI</name>
 
   <properties>
     <servlet.jsp.version>3.0.0</servlet.jsp.version>
     <slf4j.version>2.0.11</slf4j.version>
-    <weld.version>3.1.9.Final</weld.version>
+    <weld.version>4.0.3.Final</weld.version>
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>jakarta.servlet.jsp</groupId>
-      <artifactId>jakarta.servlet.jsp-api</artifactId>
-      <version>${servlet.jsp.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-cdi</artifactId>
@@ -35,7 +30,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-javax-server</artifactId>
+      <artifactId>websocket-jakarta-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>

diff --git a/embedded/servlet-with-cdi/src/main/java/examples/ServerMain.java b/embedded/servlet-with-cdi/src/main/java/examples/ServerMain.java
@@ -23,7 +23,7 @@
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
 import org.slf4j.LoggerFactory;
 
 public class ServerMain
@@ -67,7 +67,7 @@ public void run(int port) throws Exception
         context.addServletContainerInitializer(new org.jboss.weld.environment.servlet.EnhancedListener());
 
         // Add WebSocket endpoints
-        JavaxWebSocketServletContainerInitializer.configure(context, (servletContext, wsContainer) ->
+        JakartaWebSocketServletContainerInitializer.configure(context, (servletContext, wsContainer) ->
             wsContainer.addEndpoint(TimeSocket.class));
 
         // Add Servlet endpoints

diff --git a/embedded/servlet-with-cdi/src/main/java/examples/TimeServlet.java b/embedded/servlet-with-cdi/src/main/java/examples/TimeServlet.java
@@ -19,10 +19,11 @@
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class TimeServlet extends HttpServlet
 {

diff --git a/embedded/servlet-with-cdi/src/main/java/examples/TimeSocket.java b/embedded/servlet-with-cdi/src/main/java/examples/TimeSocket.java
@@ -19,12 +19,13 @@
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
-import javax.inject.Inject;
-import javax.websocket.CloseReason;
-import javax.websocket.OnClose;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
+
+import jakarta.inject.Inject;
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.OnClose;
+import jakarta.websocket.OnOpen;
+import jakarta.websocket.Session;
+import jakarta.websocket.server.ServerEndpoint;
 
 @ServerEndpoint("/time/")
 public class TimeSocket implements Runnable

diff --git a/embedded/servlet-with-cdi/src/main/java/examples/logging/LogFactory.java b/embedded/servlet-with-cdi/src/main/java/examples/logging/LogFactory.java
@@ -14,9 +14,10 @@
 package examples.logging;
 
 import java.util.logging.Logger;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 
 public class LogFactory
 {