diff --git a/.github/workflows/github-build-maven.yml b/.github/workflows/github-build-maven.yml index 71ffceb..800448b 100644 --- a/.github/workflows/github-build-maven.yml +++ b/.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 diff --git a/pom.xml b/pom.xml index 6c014dd..0a2a783 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ be.tomcools dropwizard-websocket-jsr356-bundle - 4.0.1-SNAPSHOT + 5.0.0-alpha.1 jar dropwizard-websocket-jsr356-bundle @@ -34,8 +34,8 @@ UTF-8 UTF-8 - 4.0.0 - 11 + 5.0.0-alpha.1 + 17 @@ -79,7 +79,6 @@ org.mockito mockito-junit-jupiter - 4.8.1 test @@ -105,13 +104,13 @@ - org.eclipse.jetty.websocket - websocket-jakarta-server + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-server - org.eclipse.jetty.websocket - websocket-jakarta-client + org.eclipse.jetty.ee10.websocket + jetty-ee10-websocket-jakarta-client diff --git a/src/main/java/be/tomcools/dropwizard/websocket/WebsocketHandler.java b/src/main/java/be/tomcools/dropwizard/websocket/WebsocketHandler.java index c97d1cc..92cab2d 100644 --- a/src/main/java/be/tomcools/dropwizard/websocket/WebsocketHandler.java +++ b/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; diff --git a/src/main/java/be/tomcools/dropwizard/websocket/handling/WebsocketContainerInitializer.java b/src/main/java/be/tomcools/dropwizard/websocket/handling/WebsocketContainerInitializer.java index d13eba2..cbf17e8 100644 --- a/src/main/java/be/tomcools/dropwizard/websocket/handling/WebsocketContainerInitializer.java +++ b/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); diff --git a/src/test/java/be/tomcools/dropwizard/websocket/WebsocketHandlerTest.java b/src/test/java/be/tomcools/dropwizard/websocket/WebsocketHandlerTest.java index 9c75fb7..38859eb 100644 --- a/src/test/java/be/tomcools/dropwizard/websocket/WebsocketHandlerTest.java +++ b/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; diff --git a/src/test/java/be/tomcools/dropwizard/websocket/handling/ServerFactoryWrapperTest.java b/src/test/java/be/tomcools/dropwizard/websocket/handling/ServerFactoryWrapperTest.java index adc2ace..c7669a3 100644 --- a/src/test/java/be/tomcools/dropwizard/websocket/handling/ServerFactoryWrapperTest.java +++ b/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; diff --git a/src/test/java/be/tomcools/dropwizard/websocket/registration/EndpointRegistrationTest.java b/src/test/java/be/tomcools/dropwizard/websocket/registration/EndpointRegistrationTest.java index 2587766..6365eea 100644 --- a/src/test/java/be/tomcools/dropwizard/websocket/registration/EndpointRegistrationTest.java +++ b/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; diff --git a/src/test/java/be/tomcools/dropwizard/websocket/registration/EndpointTest.java b/src/test/java/be/tomcools/dropwizard/websocket/registration/EndpointTest.java index c175a76..edae6f1 100644 --- a/src/test/java/be/tomcools/dropwizard/websocket/registration/EndpointTest.java +++ b/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 {