Skip to content

Commit 9309013

Browse files
switching to opensource jakarta from proprietary javax for reading xml
1 parent 955bf87 commit 9309013

6 files changed

Lines changed: 18 additions & 24 deletions

File tree

pom.xml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
<maven.compiler.source>11</maven.compiler.source>
2222
<maven.compiler.target>11</maven.compiler.target>
2323

24-
<jaxb.version>2.3.1</jaxb.version>
25-
<jaxb-core.version>3.0.1</jaxb-core.version>
24+
<jaxb.version>4.0.0</jaxb.version>
2625
<commons-csv.version>1.8</commons-csv.version>
2726
<commons-collections4.version>4.4</commons-collections4.version>
2827
</properties>
@@ -45,22 +44,17 @@
4544
<artifactId>jsap</artifactId>
4645
<version>${jsap.version}</version>
4746
</dependency>
48-
<!--JAXB-->
47+
<!--JAXB (Jakarta)-->
4948
<dependency>
50-
<groupId>javax.xml.bind</groupId>
51-
<artifactId>jaxb-api</artifactId>
49+
<groupId>jakarta.xml.bind</groupId>
50+
<artifactId>jakarta.xml.bind-api</artifactId>
5251
<version>${jaxb.version}</version>
5352
</dependency>
5453
<dependency>
55-
<groupId>com.sun.xml.bind</groupId>
56-
<artifactId>jaxb-impl</artifactId>
54+
<groupId>org.glassfish.jaxb</groupId>
55+
<artifactId>jaxb-runtime</artifactId>
5756
<version>${jaxb.version}</version>
5857
</dependency>
59-
<dependency>
60-
<groupId>com.sun.xml.bind</groupId>
61-
<artifactId>jaxb-core</artifactId>
62-
<version>${jaxb-core.version}</version>
63-
</dependency>
6458

6559
<dependency>
6660
<groupId>org.apache.commons</groupId>

src/main/java/org/reactome/server/tools/DuplicateChecker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import org.slf4j.Logger;
99
import org.slf4j.LoggerFactory;
1010

11-
import javax.xml.bind.JAXBContext;
12-
import javax.xml.bind.JAXBException;
13-
import javax.xml.bind.Unmarshaller;
11+
import jakarta.xml.bind.JAXBContext;
12+
import jakarta.xml.bind.JAXBException;
13+
import jakarta.xml.bind.Unmarshaller;
1414
import java.io.BufferedWriter;
1515
import java.io.File;
1616
import java.io.IOException;

src/main/java/org/reactome/server/tools/IconValidator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import org.slf4j.Logger;
1212
import org.slf4j.LoggerFactory;
1313

14-
import javax.xml.bind.JAXBContext;
15-
import javax.xml.bind.JAXBException;
16-
import javax.xml.bind.Unmarshaller;
14+
import jakarta.xml.bind.JAXBContext;
15+
import jakarta.xml.bind.JAXBException;
16+
import jakarta.xml.bind.Unmarshaller;
1717
import java.io.File;
1818
import java.io.IOException;
1919
import java.net.URI;

src/main/java/org/reactome/server/tools/model/Icon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import lombok.Data;
44
import lombok.NoArgsConstructor;
55

6-
import javax.xml.bind.annotation.*;
6+
import jakarta.xml.bind.annotation.*;
77
import java.util.List;
88

99
/**

src/main/java/org/reactome/server/tools/model/Person.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.reactome.server.tools.model;
22

3-
import javax.xml.bind.annotation.*;
3+
import jakarta.xml.bind.annotation.*;
44

55
/**
66
* Created by Chuqiao on 2019/11/12.

src/main/java/org/reactome/server/tools/model/Reference.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import lombok.Data;
55
import lombok.NoArgsConstructor;
66

7-
import javax.xml.bind.annotation.XmlAccessType;
8-
import javax.xml.bind.annotation.XmlAccessorType;
9-
import javax.xml.bind.annotation.XmlElement;
10-
import javax.xml.bind.annotation.XmlRootElement;
7+
import jakarta.xml.bind.annotation.XmlAccessType;
8+
import jakarta.xml.bind.annotation.XmlAccessorType;
9+
import jakarta.xml.bind.annotation.XmlElement;
10+
import jakarta.xml.bind.annotation.XmlRootElement;
1111

1212
/**
1313
* Created by Chuqiao on 2019/11/12.

0 commit comments

Comments
 (0)