(jclouds) branch master updated: JCLOUDS-1637: Replace java.xml.bind uses

[gaul]

This is an automated email from the ASF dual-hosted git repository.

gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git


The following commit(s) were added to refs/heads/master by this push:
     new 7a438ceebd JCLOUDS-1637: Replace java.xml.bind uses
7a438ceebd is described below

commit 7a438ceebdc298a707d4ce8e1ec22bea2834bf3d
Author: Andrew Gaul <g...@apache.org>
AuthorDate: Wed Apr 24 20:17:19 2024 +0900

    JCLOUDS-1637: Replace java.xml.bind uses
---
 core/pom.xml                                                      | 4 ++++
 core/src/main/java/org/jclouds/xml/internal/JAXBParser.java       | 8 ++++----
 .../annotationparsing/JAXBResponseParserAnnotationExpectTest.java | 2 +-
 .../test/java/org/jclouds/rest/binders/BindToXMLPayloadTest.java  | 2 +-
 project/pom.xml                                                   | 6 ++++++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index be3189c3de..858c35a26a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -65,6 +65,10 @@
       <groupId>jakarta.inject</groupId>
       <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>
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 f8cbde20ff..bec027c7c7 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 java.io.StringWriter;
 
 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;
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 086680ced4..353d45d40c 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.Consumes;
 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;
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 b7d45e2b50..e81937b944 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 @@ package org.jclouds.rest.binders;
 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;
diff --git a/project/pom.xml b/project/pom.xml
index 22cbde1631..437048608c 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -325,6 +325,12 @@
         <version>2.0.1</version>
       </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>