Upgrade to DropWizard 5.0.0-alpha. Also, minor imports cleanup

.github/workflows/github-build-maven.yml

@@ -1,4 +1,4 @@
-name: Java 11 CI - Maven Package
+name: Java 17 CI - Maven Package
 
 on:
   push:
@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>be.tomcools</groupId>
     <artifactId>dropwizard-websocket-jsr356-bundle</artifactId>
-    <version>4.0.1-SNAPSHOT</version>
+    <version>5.0.0-alpha.1</version>
     <packaging>jar</packaging>
 
     <name>dropwizard-websocket-jsr356-bundle</name>
@@ -34,8 +34,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <dropwizard.version>4.0.0</dropwizard.version>
-        <java.version>11</java.version>
+        <dropwizard.version>5.0.0-alpha.1</dropwizard.version>
+        <java.version>17</java.version>
     </properties>
 
     <dependencyManagement>
@@ -79,7 +79,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -105,13 +104,13 @@
 
         <!-- Jetty -->
         <dependency>
-            <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-jakarta-server</artifactId>
+            <groupId>org.eclipse.jetty.ee10.websocket</groupId>
+            <artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
         </dependency>
         <!-- To run javax.websocket client -->
         <dependency>
-            <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-jakarta-client</artifactId>
+            <groupId>org.eclipse.jetty.ee10.websocket</groupId>
+            <artifactId>jetty-ee10-websocket-jakarta-client</artifactId>
         </dependency>
     </dependencies>
 

src/main/java/be/tomcools/dropwizard/websocket/WebsocketHandler.java

@@ -5,10 +5,9 @@
 import be.tomcools.dropwizard.websocket.registration.EndpointRegistration;
 import io.dropwizard.core.setup.Environment;
 import jakarta.servlet.ServletContext;
-import jakarta.websocket.DeploymentException;
 import jakarta.websocket.server.ServerContainer;
 import jakarta.websocket.server.ServerEndpointConfig;
-import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
+import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
 
 public class WebsocketHandler implements JakartaWebSocketServletContainerInitializer.Configurator {
     private final EndpointRegistration endpointRegistration;

src/main/java/be/tomcools/dropwizard/websocket/handling/WebsocketContainerInitializer.java

@@ -1,11 +1,11 @@
 package be.tomcools.dropwizard.websocket.handling;
 
 
-import io.dropwizard.jetty.MutableServletContextHandler;
-import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
 
 public class WebsocketContainerInitializer {
-    public void initialize(MutableServletContextHandler contextHandler,
+    public void initialize(ServletContextHandler contextHandler,
                            JakartaWebSocketServletContainerInitializer.Configurator configurator) {
         try {
             JakartaWebSocketServletContainerInitializer.configure(contextHandler, configurator);

src/test/java/be/tomcools/dropwizard/websocket/WebsocketHandlerTest.java

@@ -9,7 +9,7 @@
 import jakarta.websocket.server.ServerEndpoint;
 import jakarta.websocket.server.ServerEndpointConfig;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;

src/test/java/be/tomcools/dropwizard/websocket/handling/ServerFactoryWrapperTest.java

@@ -5,7 +5,7 @@
 import io.dropwizard.core.setup.Environment;
 import org.eclipse.jetty.server.Server;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;

src/test/java/be/tomcools/dropwizard/websocket/registration/EndpointRegistrationTest.java

@@ -7,7 +7,7 @@
 import jakarta.websocket.server.ServerEndpoint;
 import jakarta.websocket.server.ServerEndpointConfig;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;

src/test/java/be/tomcools/dropwizard/websocket/registration/EndpointTest.java

@@ -3,7 +3,7 @@
 import be.tomcools.dropwizard.websocket.registration.endpointtypes.EndpointAnnotatedJava;
 import be.tomcools.dropwizard.websocket.registration.endpointtypes.EndpointProgrammaticJava;
 import nl.jqno.equalsverifier.EqualsVerifier;
-import org.junit.jupiter.api.Test;;
+import org.junit.jupiter.api.Test;
 
 public class EndpointTest {