Realign JAXB with Karaf

The upgrade to karaf-4.2.6 allows us to also upgrade the JAXB
dependencies. Unfortunately this is not a compatible upgrade,
as we also transition to Jakarta-provided APIs.

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

diff --git a/docs/pom.xml b/docs/pom.xml
index 0f3787bbec8d28b640a8680495f81ae6f525a6cb..f2d77d1e8ba9d4ba937ba25679c5e05c3086ea33 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -102,8 +102,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index cf3a3133364b494239a97859390d2edc9fcd3db6..4359155daa8017999ff45f0d3517dfcd1f658985 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -214,6 +214,10 @@
             <artifactId>netty-transport-native-epoll</artifactId>
             <classifier>linux-x86_64</classifier>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>activation</artifactId>
@@ -242,10 +246,6 @@
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index bfc63b6c1d28912285201b965a15e8d41991c199..3da53abf377ebbff399c2d0a3294ab4dc8355fad 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -1060,14 +1060,14 @@
 
       <!-- JAXB for Java 11+, match this with Karaf -->
       <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.3.0</version>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>2.3.2</version>
       </dependency>
       <dependency>
         <groupId>org.glassfish.jaxb</groupId>
         <artifactId>jaxb-runtime</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>