From c59a0fe7171fd6de35253bebf127ca1cb42bd459 Mon Sep 17 00:00:00 2001
From: Shawn Kleese <shawn.kleese@wtnet.de>
Date: Wed, 7 Aug 2024 20:03:13 +0200
Subject: [PATCH] Migrate javax.xml > jakarta.xml

---
 .../demo/KeyboardPaneWithArrowKeysApp.java    |  2 +-
 .../src/main/java/module-info.java            |  2 +-
 keyboardfx/pom.xml                            |  5 +++++
 .../java/com/dlsc/keyboardfx/Keyboard.java    | 22 +++++++++----------
 .../com/dlsc/keyboardfx/KeyboardView.java     |  6 ++---
 keyboardfx/src/main/java/module-info.java     |  2 +-
 pom.xml                                       | 14 +++++++++---
 7 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/keyboardfx-demo/src/main/java/com/dlsc/keyboardfx/demo/KeyboardPaneWithArrowKeysApp.java b/keyboardfx-demo/src/main/java/com/dlsc/keyboardfx/demo/KeyboardPaneWithArrowKeysApp.java
index 8522676..f65e47b 100644
--- a/keyboardfx-demo/src/main/java/com/dlsc/keyboardfx/demo/KeyboardPaneWithArrowKeysApp.java
+++ b/keyboardfx-demo/src/main/java/com/dlsc/keyboardfx/demo/KeyboardPaneWithArrowKeysApp.java
@@ -4,7 +4,7 @@
 import com.dlsc.keyboardfx.KeyboardPane;
 import com.dlsc.keyboardfx.KeyboardView;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 public class KeyboardPaneWithArrowKeysApp extends KeyboardPaneDemoApp {
 
diff --git a/keyboardfx-demo/src/main/java/module-info.java b/keyboardfx-demo/src/main/java/module-info.java
index 92eab0a..717de1f 100644
--- a/keyboardfx-demo/src/main/java/module-info.java
+++ b/keyboardfx-demo/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 module com.dlsc.keyboardfx.demo {
     requires javafx.controls;
-    requires java.xml.bind;
+    requires jakarta.xml.bind;
     requires fr.brouillard.oss.cssfx;
     requires com.dlsc.keyboardfx;
     requires org.kordamp.ikonli.javafx;
diff --git a/keyboardfx/pom.xml b/keyboardfx/pom.xml
index 52d1764..2c7152a 100644
--- a/keyboardfx/pom.xml
+++ b/keyboardfx/pom.xml
@@ -59,6 +59,11 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+        
+	    <dependency>
+	        <groupId>org.glassfish.jaxb</groupId>
+	        <artifactId>jaxb-runtime</artifactId>
+	    </dependency>
 
         <dependency>
             <groupId>org.kordamp.ikonli</groupId>
diff --git a/keyboardfx/src/main/java/com/dlsc/keyboardfx/Keyboard.java b/keyboardfx/src/main/java/com/dlsc/keyboardfx/Keyboard.java
index 57b42da..784d7b2 100644
--- a/keyboardfx/src/main/java/com/dlsc/keyboardfx/Keyboard.java
+++ b/keyboardfx/src/main/java/com/dlsc/keyboardfx/Keyboard.java
@@ -5,17 +5,17 @@
 import java.util.List;
 import java.util.Objects;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlList;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
diff --git a/keyboardfx/src/main/java/com/dlsc/keyboardfx/KeyboardView.java b/keyboardfx/src/main/java/com/dlsc/keyboardfx/KeyboardView.java
index a36cedb..bab45ed 100644
--- a/keyboardfx/src/main/java/com/dlsc/keyboardfx/KeyboardView.java
+++ b/keyboardfx/src/main/java/com/dlsc/keyboardfx/KeyboardView.java
@@ -26,9 +26,9 @@
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.kordamp.ikonli.materialdesign.MaterialDesign;
 
-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.InputStream;
 import java.util.Locale;
 import java.util.Objects;
diff --git a/keyboardfx/src/main/java/module-info.java b/keyboardfx/src/main/java/module-info.java
index 43cd22e..268661d 100644
--- a/keyboardfx/src/main/java/module-info.java
+++ b/keyboardfx/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 module com.dlsc.keyboardfx {
     requires transitive javafx.controls;
-    requires java.xml.bind;
+    requires jakarta.xml.bind;
 
     requires org.kordamp.ikonli.core;
     requires org.kordamp.ikonli.javafx;
diff --git a/pom.xml b/pom.xml
index addeb71..6fd3fdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,9 @@
         <javax.activation.version>1.2.0</javax.activation.version>
         <lombok.version>1.18.6</lombok.version>
         <ikonli.version>12.2.0</ikonli.version>
-        <jaxb.version>2.3.3</jaxb.version>
+        <com.sun.jaxb.impl.version>2.3.4</com.sun.jaxb.impl.version>
+        <jaxb.version>4.0.2</jaxb.version>
+        <glassfish.jaxb.runtime.version>4.0.5</glassfish.jaxb.runtime.version>
     </properties>
 
     <dependencyManagement>
@@ -86,9 +88,15 @@
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.version}</version>
+                <version>${com.sun.jaxb.impl.version}</version>
             </dependency>
-
+            
+            <dependency>
+		        <groupId>org.glassfish.jaxb</groupId>
+		        <artifactId>jaxb-runtime</artifactId>
+		        <version>${glassfish.jaxb.runtime.version}</version>
+		    </dependency>
+		    
             <dependency>
                 <groupId>org.kordamp.ikonli</groupId>
                 <artifactId>ikonli-core</artifactId>