Merge pull request #17 from ihmcrobotics/feature/update-jaxb

Switch from org.glassfish.jaxb:jaxb-runtime:2.3.3 to com.sun.xml.bind…
ihmcrobotics · Aug 14, 2024 · 15935e6 · 15935e6
2 parents 5b4c913 + abab815
commit 15935e6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/ros2-msg-to-idl-generator/build.gradle.kts b/ros2-msg-to-idl-generator/build.gradle.kts
@@ -17,6 +17,5 @@ ihmc {
 mainDependencies {
    api("org.glassfish:javax.json:1.0.4")
    api("org.python:jython-standalone:2.7.1")
-   api("jakarta.xml.bind:jakarta.xml.bind-api:2.3.2")
-   api("org.glassfish.jaxb:jaxb-runtime:2.3.2")
+   api("com.sun.xml.bind:jaxb-impl:4.0.5")
 }
diff --git a/ros2-msg-to-idl-generator/src/main/java/us/ihmc/rosidl/ROS2MsgToIdlGenerator.java b/ros2-msg-to-idl-generator/src/main/java/us/ihmc/rosidl/ROS2MsgToIdlGenerator.java
@@ -9,9 +9,9 @@
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObjectBuilder;
 import javax.json.JsonWriter;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

diff --git a/ros2-msg-to-idl-generator/src/main/java/us/ihmc/rosidl/RosPackage.java b/ros2-msg-to-idl-generator/src/main/java/us/ihmc/rosidl/RosPackage.java
@@ -15,8 +15,8 @@
  */
 package us.ihmc.rosidl;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 
 /**