Merge pull request #1 from smahieu87/feature/jakarta

jakarta upgrade
OxalisCommunity · Oct 21, 2024 · e569ff5 · e569ff5
2 parents 256c7b9 + 675eabd
commit e569ff5
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 110 deletions.
diff --git a/peppol-bdx/pom.xml b/peppol-bdx/pom.xml
@@ -78,9 +78,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.14.0</version>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
+                <version>4.0.8</version>
                 <executions>
                     <execution>
                         <goals>
@@ -99,18 +99,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

diff --git a/peppol-bdx/src/main/xjb/bdx.xjb b/peppol-bdx/src/main/xjb/bdx.xjb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               jaxb:version="2.0">
+               jaxb:version="3.0">
     <jaxb:bindings schemaLocation="../xsd/bdx-smp-201407.xsd">
         <jaxb:schemaBindings>
             <jaxb:package name="network.oxalis.peppol.bdx.jaxb.smp._2014._07"/>

diff --git a/peppol-busdox/pom.xml b/peppol-busdox/pom.xml
@@ -88,9 +88,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.14.0</version>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
+                <version>4.0.8</version>
                 <executions>
                     <execution>
                         <goals>
@@ -110,23 +110,11 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>com.sun.xml.ws</groupId>
                 <artifactId>jaxws-maven-plugin</artifactId>
-                <version>2.3.5</version>
+                <version>4.0.3</version>
                 <executions>
                     <!-- Use one execution per WSDL file, as the wsdlLocation can specify only one file at a time. The wsdlLocation
                       is the location how the WSDL file will be referenced in the code (using class.getResource). Also important: use a different
@@ -180,13 +168,6 @@
                         <xjcArg>-no-header</xjcArg>
                     </xjcArgs>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.sun.xml.ws</groupId>
-                        <artifactId>jaxws-tools</artifactId>
-                        <version>2.3.5</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

diff --git a/peppol-busdox/src/main/xjb/bindings-identifier.xml b/peppol-busdox/src/main/xjb/bindings-identifier.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
-                xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-                xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+                xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+                xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
                 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 wsdlLocation="../xsd/ManageBusinessIdentifierService-1.0.wsdl"

diff --git a/peppol-busdox/src/main/xjb/bindings-metadata.xml b/peppol-busdox/src/main/xjb/bindings-metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
-                xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-                xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+                xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+                xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
                 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 wsdlLocation="../xsd/ManageServiceMetadataService-1.0.wsdl"

diff --git a/peppol-busdox/src/main/xjb/busdox.xjb b/peppol-busdox/src/main/xjb/busdox.xjb
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               jaxb:version="2.0">
+               jaxb:version="3.0">
     <jaxb:bindings schemaLocation="../xsd/Identifiers-1.0.xsd">
         <jaxb:schemaBindings>
             <jaxb:package name="network.oxalis.peppol.busdox.jaxb.identifiers"/>

diff --git a/peppol-sbdh/pom.xml b/peppol-sbdh/pom.xml
@@ -83,9 +83,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.14.0</version>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
+                <version>4.0.8</version>
                 <executions>
                     <execution>
                         <goals>
@@ -105,18 +105,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

diff --git a/peppol-schematron/pom.xml b/peppol-schematron/pom.xml
@@ -90,9 +90,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.14.0</version>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
+                <version>4.0.8</version>
                 <executions>
                     <execution>
                         <goals>
@@ -111,18 +111,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

diff --git a/peppol-schematron/src/main/java/network/oxalis/peppol/schematron/SchematronValidator.java b/peppol-schematron/src/main/java/network/oxalis/peppol/schematron/SchematronValidator.java
@@ -3,9 +3,9 @@
 import net.sf.saxon.s9api.*;
 import network.oxalis.peppol.schematron.jaxb.svrl.SchematronOutput;
 
-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 javax.xml.transform.stream.StreamSource;
 import java.io.InputStream;
 

diff --git a/peppol-schematron/src/main/xjb/schematron.xjb b/peppol-schematron/src/main/xjb/schematron.xjb
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0">
+<jaxb:bindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" jaxb:version="3.0">
     <jaxb:bindings schemaLocation="../xsd/svrl.xsd">
         <jaxb:schemaBindings>
             <jaxb:package name="network.oxalis.peppol.schematron.jaxb.svrl"/>

diff --git a/peppol-ubl21/pom.xml b/peppol-ubl21/pom.xml
@@ -85,9 +85,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.14.0</version>
+                <groupId>org.jvnet.jaxb</groupId>
+                <artifactId>jaxb-maven-plugin</artifactId>
+                <version>4.0.8</version>
                 <executions>
                     <execution>
                         <id>xsd</id>
@@ -103,9 +103,9 @@
                             </args>
                             <plugins>
                                 <plugin>
-                                    <groupId>org.jvnet.jaxb2_commons</groupId>
-                                    <artifactId>jaxb2-basics-annotate</artifactId>
-                                    <version>1.0.2</version>
+                                    <groupId>org.jvnet.jaxb</groupId>
+                                    <artifactId>jaxb-plugin-annotate</artifactId>
+                                    <version>4.0.8</version>
                                 </plugin>
                                 <plugin>
                                     <groupId>org.projectlombok</groupId>
@@ -115,18 +115,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>jakarta.xml.bind</groupId>
-                        <artifactId>jakarta.xml.bind-api</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>2.3.3</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

diff --git a/peppol-ubl21/src/main/xjb/ubl-common.xjb b/peppol-ubl21/src/main/xjb/ubl-common.xjb
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+               xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-               xmlns:annox="http://annox.dev.java.net"
+               xmlns:annox="urn:jaxb.jvnet.org:annox"
                jaxb:extensionBindingPrefixes="annox xjc"
-               jaxb:version="2.1">
+               jaxb:version="3.0">
     <jaxb:bindings schemaLocation="../xsd/common/CCTS_CCT_SchemaModule-2.1.xsd">
         <jaxb:schemaBindings>
             <jaxb:package name="network.oxalis.peppol.ubl2.jaxb.ccts"/>

diff --git a/peppol-ubl21/src/main/xjb/ubl-maindoc.xjb b/peppol-ubl21/src/main/xjb/ubl-maindoc.xjb
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<jaxb:bindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+               xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-               xmlns:annox="http://annox.dev.java.net"
+               xmlns:annox="urn:jaxb.jvnet.org:annox"
                jaxb:extensionBindingPrefixes="annox xjc"
-               jaxb:version="2.1">
+               jaxb:version="3.0">
     <jaxb:bindings schemaLocation="../xsd/maindoc/UBL-ApplicationResponse-2.1.xsd">
         <jaxb:schemaBindings>
             <jaxb:package name="network.oxalis.peppol.ubl2.jaxb"/>

diff --git a/pom.xml b/pom.xml
@@ -66,10 +66,10 @@
         <java.version>11</java.version>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <jakarta.xml.bind-api-version>2.3.3</jakarta.xml.bind-api-version>
-        <jaxb-impl-version>2.3.3</jaxb-impl-version>
-        <jakarta.xml.ws-api-version>2.3.3</jakarta.xml.ws-api-version>
-        <jakarta.jws-api-version>2.1.0</jakarta.jws-api-version>
+        <jakarta.xml.bind-api-version>4.0.2</jakarta.xml.bind-api-version>
+        <jaxb-impl-version>4.0.0</jaxb-impl-version>
+        <jakarta.xml.ws-api-version>4.0.2</jakarta.xml.ws-api-version>
+        <jakarta.jws-api-version>3.0.0</jakarta.jws-api-version>
         <testng.version>7.7.1</testng.version>
         <Saxon-HE-version>9.7.0-20</Saxon-HE-version>
         <lombok-version>1.18.24</lombok-version>