Migrate from javax package to jakarta (#36)

Author: kdombeck

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>io.logz</groupId>
     <artifactId>guice-jersey</artifactId>
-    <version>1.1.0</version>
+    <version>2.0.0</version>
 
     <packaging>jar</packaging>
     <name>guice-jersey</name>
@@ -129,12 +129,12 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <hk2-bridge.version>2.6.1</hk2-bridge.version>
-        <jersey.version>2.36</jersey.version>
-        <jetty.version>10.0.11</jetty.version>
-        <guice.version>5.1.0</guice.version>
+        <hk2-bridge.version>3.0.4</hk2-bridge.version>
+        <jersey.version>3.0.10</jersey.version>
+        <jetty.version>11.0.15</jetty.version>
+        <guice.version>7.0.0</guice.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <jackson.version>2.13.3</jackson.version>
+        <jackson.version>2.15.0</jackson.version>
     </properties>
 
     <dependencies>
@@ -215,8 +215,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+            <artifactId>jackson-jakarta-rs-json-provider</artifactId>
             <version>${jackson.version}</version>
             <scope>test</scope>
         </dependency>

src/main/java/io/logz/guice/jersey/GuiceJerseyResourceConfig.java

@@ -7,8 +7,8 @@
 import org.jvnet.hk2.guice.bridge.api.GuiceBridge;
 import org.jvnet.hk2.guice.bridge.api.GuiceIntoHK2Bridge;
 
-import javax.inject.Inject;
-import javax.servlet.ServletContext;
+import jakarta.inject.Inject;
+import jakarta.servlet.ServletContext;
 
 public class GuiceJerseyResourceConfig extends ResourceConfig {
 

src/main/java/io/logz/guice/jersey/JerseyServer.java

@@ -19,7 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.servlet.DispatcherType;
+import jakarta.servlet.DispatcherType;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
@@ -75,7 +75,7 @@ private void configureServer() {
         webAppContext.addFilter(GuiceFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
 
         ServletHolder holder = new ServletHolder(ServletContainer.class);
-        holder.setInitParameter("javax.ws.rs.Application", GuiceJerseyResourceConfig.class.getName());
+        holder.setInitParameter("jakarta.ws.rs.Application", GuiceJerseyResourceConfig.class.getName());
 
         webAppContext.addServlet(holder, "/*");
         webAppContext.setResourceBase("/");

src/main/java/io/logz/guice/jersey/configuration/JerseyConfigurationBuilder.java

@@ -1,6 +1,5 @@
 package io.logz.guice.jersey.configuration;
 
-import org.eclipse.jetty.server.HttpConfiguration;
 import org.glassfish.jersey.server.ResourceConfig;
 
 import java.util.ArrayList;

src/main/java/io/logz/guice/jersey/configuration/JerseyWebApplicationConfigurator.java

@@ -4,7 +4,7 @@
 
 /**
  * Implement to provide additional configuration for the underlying {@link org.eclipse.jetty.webapp.WebAppContext},
- * like adding a {@link javax.servlet.Filter} or {@link java.util.EventListener}, etc.
+ * like adding a {@link jakarta.servlet.Filter} or {@link java.util.EventListener}, etc.
  */
 @FunctionalInterface
 public interface JerseyWebApplicationConfigurator {

src/test/java/io/logz/guice/jersey/FiltersWithGuiceIntegrationTest.java

@@ -8,7 +8,7 @@
 import io.logz.guice.jersey.supplier.JerseyServerSupplier;
 import org.junit.Test;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import static org.junit.Assert.assertEquals;
 

src/test/java/io/logz/guice/jersey/JacksonFeatureTest.java

@@ -6,8 +6,8 @@
 import org.glassfish.jersey.server.ResourceConfig;
 import org.junit.Test;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MediaType;
 import java.util.Date;
 
 import static org.junit.Assert.assertEquals;

src/test/java/io/logz/guice/jersey/JerseyServerTest.java

@@ -15,10 +15,10 @@
 import org.glassfish.jersey.server.ResourceConfig;
 import org.junit.Test;
 
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Response;
 import java.net.Socket;
 import java.util.concurrent.TimeUnit;
 

src/test/java/io/logz/guice/jersey/JettyFilterRegistrationTest.java

@@ -9,8 +9,8 @@
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.junit.Test;
 
-import javax.servlet.DispatcherType;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.DispatcherType;
+import jakarta.ws.rs.core.Response;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;

src/test/java/io/logz/guice/jersey/ServerSentEventsTest.java

@@ -5,8 +5,8 @@
 import org.glassfish.jersey.server.ResourceConfig;
 import org.junit.Test;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.sse.SseEventSource;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.sse.SseEventSource;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;

src/test/java/io/logz/guice/jersey/filters/AddHeaderJettyFilter.java

@@ -1,12 +1,12 @@
 package io.logz.guice.jersey.filters;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class AddHeaderJettyFilter implements Filter {

src/test/java/io/logz/guice/jersey/filters/FilterHeaderService.java

@@ -1,6 +1,6 @@
 package io.logz.guice.jersey.filters;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class FilterHeaderService {

src/test/java/io/logz/guice/jersey/filters/TestFilter.java

@@ -1,9 +1,9 @@
 package io.logz.guice.jersey.filters;
 
-import javax.inject.Inject;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
 import java.io.IOException;
 
 import static java.util.Objects.requireNonNull;

src/test/java/io/logz/guice/jersey/resources/AsyncResource.java

@@ -2,10 +2,10 @@
 
 import org.glassfish.jersey.server.ManagedAsync;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.container.Suspended;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.container.AsyncResponse;
+import jakarta.ws.rs.container.Suspended;
 
 @Path(AsyncResource.PATH)
 public class AsyncResource {

src/test/java/io/logz/guice/jersey/resources/PingResource.java

@@ -1,7 +1,7 @@
 package io.logz.guice.jersey.resources;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
 
 @Path(PingResource.PATH)
 public class PingResource {

src/test/java/io/logz/guice/jersey/resources/PojoResource.java

@@ -2,13 +2,13 @@
 
 import io.logz.guice.jersey.beans.TestBean;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.util.Date;
 import java.util.Random;
 

src/test/java/io/logz/guice/jersey/resources/SseResource.java

@@ -1,14 +1,14 @@
 package io.logz.guice.jersey.resources;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.sse.Sse;
-import javax.ws.rs.sse.SseEventSink;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.Sse;
+import jakarta.ws.rs.sse.SseEventSink;
 import java.io.IOException;
 
 import static java.util.Objects.requireNonNull;

src/test/java/io/logz/guice/jersey/resources/TestResource.java

@@ -1,7 +1,7 @@
 package io.logz.guice.jersey.resources;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
 
 @Path(TestResource.PATH)
 public class TestResource {

src/test/java/io/logz/guice/jersey/resources/recursive/FooResource.java

@@ -1,7 +1,7 @@
 package io.logz.guice.jersey.resources.recursive;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
 
 @Path(FooResource.PATH)
 public class FooResource {

src/test/java/io/logz/guice/jersey/supplier/JerseyServerSupplier.java

@@ -14,9 +14,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
 import java.util.ArrayList;
 import java.util.List;