diff --git a/.travis.yml b/.travis.yml
index 3c736fb5..76e33313 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
language: java
jdk:
- - openjdk8
- oraclejdk11
- openjdk11
diff --git a/README.md b/README.md
index 6dbe18cf..8c33fb54 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,8 @@ To use latest release based on **Java Time API** and **Threeten-Extra library**
```
## 0.6 Branch planned
-Planning to replace usage of JAXB with JiBX/XStream
+
+moved to jakarta.xml.* instead of javax.xml
## License
diff --git a/pom.xml b/pom.xml
index f849a423..10c72364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
de.jollyday
jollyday
Jollyday
- 0.5.11-SNAPSHOT
+ 0.6.0-SNAPSHOT
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 @@
com.github.davidmoten
jax-maven-plugin
- 0.1.5
+ 0.2
org.apache.maven.plugins
@@ -206,7 +206,7 @@
-d
${project.build.directory}/generated-sources/jaxb
-target
- 2.1
+ 3.0
-p
de.jollyday.config
${project.basedir}/src/main/xsd/Holiday.xsd
@@ -337,31 +337,6 @@
-
- jdk9
-
- [9,)
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- @{argLine}
- --add-opens de.jollyday/de.jollyday.config=java.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
- --add-opens de.jollyday/holidays=ALL-UNNAMED
-
- ${project.basedir}/src/main/resources
-
-
-
-
-
-
jdk11
@@ -384,37 +359,15 @@
jakarta.xml.bind
jakarta.xml.bind-api
- 2.3.3
+ 4.0.0
org.glassfish.jaxb
jaxb-runtime
- 2.3.4
+ 4.0.1
-
- jdk1
-
- (,1.8]
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.8.0
-
-
- module-info.java
-
- 1.8
- 1.8
-
-
-
-
-
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..b77d072b 100644
--- 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 b/src/main/resources/holidays/Holidays_xk.xml
similarity index 100%
rename from src/main/resources/holidays/holidays_xk.xml
rename to 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
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;