dropwizard 4.0.7 further changes javax->jakarta

ratrun · Jul 28, 2024 · 856fddc · 856fddc
1 parent 90996bc
commit 856fddc
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -140,8 +140,8 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>javax.inject</groupId>
-                <artifactId>javax.inject</artifactId>
+                <groupId>jakarta.inject</groupId>
+                <artifactId>jakarta.inject</artifactId>
                 <version>1</version>
             </dependency>
             <dependency>

diff --git a/reader-gtfs/pom.xml b/reader-gtfs/pom.xml
@@ -44,8 +44,8 @@
             <artifactId>gtfs-realtime-bindings</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -74,12 +74,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-            <version>2.0.1.MR</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/web-bundle/pom.xml b/web-bundle/pom.xml
@@ -41,12 +41,6 @@
             <version>${project.parent.version}</version>
         </dependency>
 
-        <!-- required for JDK9 -->
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.3.1</version>
-        </dependency>
         <!-- required for dropwizard -->
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/web-bundle/src/main/java/com/graphhopper/http/RealtimeBundle.java b/web-bundle/src/main/java/com/graphhopper/http/RealtimeBundle.java
@@ -29,7 +29,7 @@
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
 import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 public class RealtimeBundle implements ConfiguredBundle<RealtimeBundleConfiguration> {
 

diff --git a/web-bundle/src/main/java/com/graphhopper/http/TypeGPXFilter.java b/web-bundle/src/main/java/com/graphhopper/http/TypeGPXFilter.java
@@ -18,7 +18,7 @@
 
 package com.graphhopper.http;
 
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
 import jakarta.ws.rs.Priorities;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerRequestFilter;

diff --git a/web-bundle/src/main/java/com/graphhopper/resources/InfoResource.java b/web-bundle/src/main/java/com/graphhopper/resources/InfoResource.java
@@ -28,7 +28,7 @@
 import org.locationtech.jts.geom.Envelope;
 
 import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;

diff --git a/web-bundle/src/main/java/com/graphhopper/resources/NearestResource.java b/web-bundle/src/main/java/com/graphhopper/resources/NearestResource.java
@@ -28,7 +28,7 @@
 import com.graphhopper.util.shapes.GHPoint3D;
 
 import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 

diff --git a/web-bundle/src/main/java/com/graphhopper/resources/PtMVTResource.java b/web-bundle/src/main/java/com/graphhopper/resources/PtMVTResource.java
@@ -15,7 +15,7 @@
 import org.slf4j.LoggerFactory;
 
 import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Context;

diff --git a/web-bundle/src/main/java/com/graphhopper/resources/RouteResource.java b/web-bundle/src/main/java/com/graphhopper/resources/RouteResource.java
@@ -35,7 +35,7 @@
 
 import javax.annotation.Nullable;
 import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.*;