Skip to content

use jakarta packages #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mitovman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

use jakarta packages #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9369cd9
use jakarta packages
Aug 29, 2023
3aa9d6b
Update pom.xml
mitovman Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 34 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<name>Jollyday</name>
<version>0.5.11-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
calendar XML file or use any of the provided ones.
Expand Down Expand Up @@ -73,6 +74,14 @@
<role>Developer</role>
</roles>
</developer>
<developer>
<id>mitovman</id>
<email>mitovman@yahoo.com</email>
<name>Ivo Mitov</name>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>
<issueManagement>
<system>Sourceforge</system>
Expand All @@ -93,15 +102,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
<version>2.4</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>
Expand Down Expand Up @@ -205,8 +209,6 @@
<argument>-verbose</argument>
<argument>-d</argument>
<argument>${project.build.directory}/generated-sources/jaxb</argument>
<argument>-target</argument>
<argument>2.1</argument>
<argument>-p</argument>
<argument>de.jollyday.config</argument>
<argument>${project.basedir}/src/main/xsd/Holiday.xsd</argument>
Expand All @@ -215,6 +217,24 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/jaxb/</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
Expand Down Expand Up @@ -349,7 +369,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
Expand Down Expand Up @@ -384,12 +404,13 @@
<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>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>4.0.3</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</profile>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/de/jollyday/util/XMLUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/de/jollyday/util/XMLUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down