commit 7a438ceebdc298a707d4ce8e1ec22bea2834bf3d
author Andrew Gaul <gaul@apache.org> Wed Apr 24 20:17:19 2024 +0900
committer Andrew Gaul <gaul@apache.org> Wed Apr 24 20:21:13 2024 +0900
tree f91c200c0ffa287ec50aaaa031bf5dfc0507dca3
parent da1bc06f9efb626c03eb3119e9c77adf5b12f179

JCLOUDS-1637: Replace java.xml.bind uses

core/pom.xml

diff --git a/core/pom.xml b/core/pom.xml
index be3189c..858c35a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -66,6 +66,10 @@
       <artifactId>jakarta.inject-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
     </dependency>

core/src/main/java/org/jclouds/xml/internal/JAXBParser.java

diff --git a/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java b/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java
index f8cbde2..bec027c 100644
--- a/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java
+++ b/core/src/main/java/org/jclouds/xml/internal/JAXBParser.java
@@ -22,10 +22,10 @@
 
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 
 import org.jclouds.Constants;
 import org.jclouds.xml.XMLParser;

core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java

diff --git a/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java b/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java
index 086680c..353d45d 100644
--- a/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java
+++ b/core/src/test/java/org/jclouds/rest/annotationparsing/JAXBResponseParserAnnotationExpectTest.java
@@ -26,7 +26,7 @@
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.MediaType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpResponse;

core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java

diff --git a/core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java b/core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java
index b7d45e2..e81937b 100644
--- a/core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java
+++ b/core/src/test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java
@@ -19,7 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.testng.Assert.assertEquals;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.jclouds.http.HttpRequest;
 import org.jclouds.xml.XMLParser;

project/pom.xml

diff --git a/project/pom.xml b/project/pom.xml
index 22cbde1..4370486 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -326,6 +326,12 @@
       </dependency>
 
       <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.2</version>
+      </dependency>
+
+      <dependency>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-impl</artifactId>
         <version>2.3.3</version>