Switch to jakarta.ws.rs

Upstreams (both Jersey and Karaf) have switched to Jakarta-provided
artifacts. Adjust our declarations to match that, fixing up duplicates
in jersey-2.35 upgrade.

Change-Id: I46b50c6188381058ab9177a071cd0cae10d3ec7a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-jersey-2/src/main/history/dependencies.xml b/features/odl-jersey-2/src/main/history/dependencies.xml
index 87c2e74c1711d84d12941f69b09cc24d08d1b0e4..916e12324a136865f0c8b43a696e5b830366e1d0 100644 (file)
--- a/features/odl-jersey-2/src/main/history/dependencies.xml
+++ b/features/odl-jersey-2/src/main/history/dependencies.xml
@@ -7,7 +7,6 @@
         <feature>odl-ws-rs-api</feature>
         <bundle>mvn:jakarta.annotation/jakarta.annotation-api/1.3.5</bundle>
         <bundle>mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
-        <bundle>mvn:jakarta.ws.rs/jakarta.ws.rs-api/2.1.6</bundle>
         <bundle>mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.6.1</bundle>
         <bundle>mvn:org.glassfish.hk2.external/jakarta.inject/2.6.1</bundle>
         <bundle>mvn:org.glassfish.hk2/hk2-api/2.6.1</bundle>

diff --git a/features/odl-ws-rs-api/pom.xml b/features/odl-ws-rs-api/pom.xml
index ff4515ab9cb331efeb8bc6cf66aca415556a79b2..33e9a902826891f16a88cda55ae71e418602f696 100644 (file)
--- a/features/odl-ws-rs-api/pom.xml
+++ b/features/odl-ws-rs-api/pom.xml
@@ -33,8 +33,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/features/odl-ws-rs-api/src/main/history/dependencies.xml b/features/odl-ws-rs-api/src/main/history/dependencies.xml
index f423e29aed4cb2698e2a0c7136596f109e6877b0..27d53855e9b4be7998c73a6fe2d12b881dc62d21 100644 (file)
--- a/features/odl-ws-rs-api/src/main/history/dependencies.xml
+++ b/features/odl-ws-rs-api/src/main/history/dependencies.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-ws-rs-api">
     <feature version="0.0.0">
-        <bundle>mvn:javax.ws.rs/javax.ws.rs-api/2.1.1</bundle>
+        <bundle>mvn:jakarta.ws.rs/jakarta.ws.rs-api/2.1.6</bundle>
     </feature>
 </features>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 82f1ab3c5a528bc8ef182ca1ad6d2312cdb9b690..1a61e0954cba77b37997c7c73d994f660bd14f13 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -112,20 +112,8 @@
             <version>4.1.76.Final</version>
         </dependency>
         <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 8f92c704042e4401d614d6e048eda8262ec9c27e..a478eb258a45e63d2d4b63092bb06415fd801bb0 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -292,11 +292,12 @@
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite and docs -->
         <version>2.6</version>
       </dependency>
+
       <!-- Jersey for JAXRS -->
       <dependency>
-        <groupId>javax.ws.rs</groupId>
-        <artifactId>javax.ws.rs-api</artifactId>
-        <version>2.1.1</version>
+        <groupId>jakarta.ws.rs</groupId>
+        <artifactId>jakarta.ws.rs-api</artifactId>
+        <version>2.1.6</version>
       </dependency>
       <dependency>
         <groupId>org.glassfish.jersey</groupId>
@@ -306,18 +307,6 @@
         <scope>import</scope>
       </dependency>
 
-      <dependency>
-        <groupId>jakarta.activation</groupId>
-        <artifactId>jakarta.activation-api</artifactId>
-        <version>1.2.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>1.3.2</version>
-        <optional>true</optional>
-      </dependency>
       <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
@@ -412,11 +401,6 @@
         <scope>import</scope>
       </dependency>
 
-      <dependency>
-        <groupId>javax.ws.rs</groupId>
-        <artifactId>jsr311-api</artifactId>
-        <version>1.1.1</version>
-      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcpkix-jdk18on</artifactId>