From 54d6703925e3c7e69715d50bff511a2273165704 Mon Sep 17 00:00:00 2001
From: SUHHOMI1 <Mihhail.Suhhoruki@itella.com>
Date: Thu, 6 Feb 2025 14:09:32 +0200
Subject: [PATCH] javax.xml -> jakarta.xml

---
 pom.xml                                         | 16 ++++++++--------
 src/main/java/de/jollyday/util/XMLUtil.java     |  8 ++++----
 src/main/java/module-info.java                  |  2 +-
 src/test/java/de/jollyday/util/XMLUtilTest.java |  8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index f849a423..496f5ff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,12 +96,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>jaxb2-maven-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.davidmoten</groupId>
                     <artifactId>jax-maven-plugin</artifactId>
-                    <version>0.1.5</version>
+                    <version>0.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -205,8 +205,8 @@
                                 <argument>-verbose</argument>
                                 <argument>-d</argument>
                                 <argument>${project.build.directory}/generated-sources/jaxb</argument>
-                                <argument>-target</argument>
-                                <argument>2.1</argument>
+                                <!--<argument>-target</argument>
+                                <argument>4.1</argument>-->
                                 <argument>-p</argument>
                                 <argument>de.jollyday.config</argument>
                                 <argument>${project.basedir}/src/main/xsd/Holiday.xsd</argument>
@@ -275,7 +275,7 @@
                     <dependency>
                         <groupId>jakarta.xml.bind</groupId>
                         <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>2.3.3</version>
+                        <version>4.0.2</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -349,7 +349,7 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <argLine>@{argLine}
-							         --add-opens de.jollyday/de.jollyday.config=java.xml.bind
+							         --add-opens de.jollyday/de.jollyday.config=jakarta.xml.bind
                                      --add-opens de.jollyday/de.jollyday.configuration=ALL-UNNAMED
                                      --add-opens de.jollyday/de.jollyday.datasource.impl=ALL-UNNAMED
                                      --add-opens de.jollyday/de.jollyday.util=ALL-UNNAMED
@@ -384,12 +384,12 @@
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
                     <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>2.3.3</version>
+                    <version>4.0.2</version>
                 </dependency>
                 <dependency>
                     <groupId>org.glassfish.jaxb</groupId>
                     <artifactId>jaxb-runtime</artifactId>
-                    <version>2.3.4</version>
+                    <version>4.0.5</version>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/src/main/java/de/jollyday/util/XMLUtil.java b/src/main/java/de/jollyday/util/XMLUtil.java
index 8e15340b..91477a2b 100644
--- a/src/main/java/de/jollyday/util/XMLUtil.java
+++ b/src/main/java/de/jollyday/util/XMLUtil.java
@@ -24,10 +24,10 @@
 import de.jollyday.config.ObjectFactory;
 import de.jollyday.config.Weekday;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.InputStream;
 import java.time.DayOfWeek;
 import java.util.logging.Logger;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 641259b3..ddbab746 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 module de.jollyday {
     requires java.logging;
-    requires java.xml.bind;
+    requires jakarta.xml.bind;
     requires java.desktop;
 
     requires org.threeten.extra;
diff --git a/src/test/java/de/jollyday/util/XMLUtilTest.java b/src/test/java/de/jollyday/util/XMLUtilTest.java
index 87d94ada..fb7f38ae 100644
--- a/src/test/java/de/jollyday/util/XMLUtilTest.java
+++ b/src/test/java/de/jollyday/util/XMLUtilTest.java
@@ -22,10 +22,10 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;