Skip to content

Commit

Permalink
Use Jakarta XML Binding
Browse files Browse the repository at this point in the history
  • Loading branch information
@endrejeges
endrejeges committed Jun 6, 2020
1 parent e2fda17 commit 99210b7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 33 deletions.
30 changes: 11 additions & 19 deletions pom.xml
View file
Expand Up @@ -43,6 +43,9 @@
<!-- 2.20.1 works for Java6 but not for Java 10 - for 2.21.0
things are reversed -->
<maven.surefire.plugin.version>2.20.1</maven.surefire.plugin.version>

<!-- Jakarta XML Binding version -->
<jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
</properties>

<inceptionYear>2001</inceptionYear>
Expand Down Expand Up @@ -100,9 +103,14 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta.xml.bind.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jakarta.xml.bind.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -146,22 +154,6 @@
<version>2.1.0</version>
<scope>test</scope>
</dependency>
<!-- needed during tests when running on Java9+ -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
19 changes: 5 additions & 14 deletions xmlunit-core/pom.xml
View file
Expand Up @@ -63,22 +63,13 @@
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down

0 comments on commit 99210b7

Please sign in to comment.