Skip to content
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

Jump to bottom

Migrate javax.xml > jakarta.xml #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrate javax.xml > jakarta.xml #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion keyboardfx-demo/src/main/java/com/dlsc/keyboardfx/demo/KeyboardPaneWithArrowKeysApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion keyboardfx-demo/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 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;
Expand Down
5 changes: 5 additions & 0 deletions keyboardfx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 11 additions & 11 deletions keyboardfx/src/main/java/com/dlsc/keyboardfx/Keyboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions keyboardfx/src/main/java/com/dlsc/keyboardfx/KeyboardView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion keyboardfx/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 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;
Expand Down
14 changes: 11 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down