diff --git a/pom.xml b/pom.xml index 6bd2263668..181d86552b 100644 --- a/pom.xml +++ b/pom.xml @@ -140,8 +140,8 @@ - javax.inject - javax.inject + jakarta.inject + jakarta.inject 1 diff --git a/reader-gtfs/pom.xml b/reader-gtfs/pom.xml index 66587a2420..5d8162af01 100644 --- a/reader-gtfs/pom.xml +++ b/reader-gtfs/pom.xml @@ -44,8 +44,8 @@ gtfs-realtime-bindings - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api ch.qos.logback @@ -74,12 +74,6 @@ mockito-core test - - jakarta.inject - jakarta.inject-api - 2.0.1.MR - compile - diff --git a/web-bundle/pom.xml b/web-bundle/pom.xml index ecea11a157..877f609299 100644 --- a/web-bundle/pom.xml +++ b/web-bundle/pom.xml @@ -41,12 +41,6 @@ ${project.parent.version} - - - javax.xml.ws - jaxws-api - 2.3.1 - com.google.guava diff --git a/web-bundle/src/main/java/com/graphhopper/http/RealtimeBundle.java b/web-bundle/src/main/java/com/graphhopper/http/RealtimeBundle.java index 0bf38031ae..9806455d06 100644 --- 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 { diff --git a/web-bundle/src/main/java/com/graphhopper/http/TypeGPXFilter.java b/web-bundle/src/main/java/com/graphhopper/http/TypeGPXFilter.java index c07ef52449..6adb8957cd 100644 --- 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 index 0d63d7d6ea..6ed621cc14 100644 --- 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 index c9e32ecf49..d8ac062590 100644 --- 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 index ebe6ab2cf0..e9d16696a6 100644 --- 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 index 2caf27b14e..d08dba548f 100644 --- 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.*;