upgrade to jakarta.xml.bind 4.0.0

svendiedrichsen · Dec 5, 2022 · 2723101 · 2723101
1 parent a86a9d7
commit 2723101
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>de.jollyday</groupId>
     <artifactId>jollyday</artifactId>
     <name>Jollyday</name>
-    <version>0.5.11-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <description>
         This API determines the holidays for a given year, country/name and eventually state/region. The holiday data is
         stored in XML files (one for each country) and will be read from the classpath. You can provide your own holiday
@@ -101,7 +101,7 @@
                 <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>
@@ -206,7 +206,7 @@
                                 <argument>-d</argument>
                                 <argument>${project.build.directory}/generated-sources/jaxb</argument>
                                 <argument>-target</argument>
-                                <argument>2.1</argument>
+                                <argument>3.0</argument>
                                 <argument>-p</argument>
                                 <argument>de.jollyday.config</argument>
                                 <argument>${project.basedir}/src/main/xsd/Holiday.xsd</argument>
@@ -384,12 +384,12 @@
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
                     <artifactId>jakarta.xml.bind-api</artifactId>
-                    <version>2.3.3</version>
+                    <version>4.0.0</version>
                 </dependency>
                 <dependency>
                     <groupId>org.glassfish.jaxb</groupId>
                     <artifactId>jaxb-runtime</artifactId>
-                    <version>2.3.4</version>
+                    <version>4.0.1</version>
                 </dependency>
             </dependencies>
         </profile>

diff --git 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
@@ -1,6 +1,7 @@
 module de.jollyday {
     requires java.logging;
-    requires java.xml.bind;
+    requires jakarta.xml.bind;
+    opens de.jollyday.config to jakarta.xml.bind;
     requires java.desktop;
 
     requires org.threeten.extra;

diff --git a/src/main/resources/holidays/holidays_xk.xml → src/main/resources/holidays/Holidays_xk.xml b/src/main/resources/holidays/holidays_xk.xml → src/main/resources/holidays/Holidays_xk.xml
diff --git 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;