Merge pull request #60 from smahieu87/feature/jakarta

jakarta upgrade
OxalisCommunity · Oct 26, 2024 · dc86203 · dc86203
2 parents d290014 + 1b79d6f
commit dc86203
Show file tree

Hide file tree

Showing 25 changed files with 62 additions and 74 deletions.
diff --git a/peppol-evidence/pom.xml b/peppol-evidence/pom.xml
@@ -89,8 +89,8 @@
     </licenses>
 
     <properties>
-        <jakarta.xml.bind-api-version>2.3.3</jakarta.xml.bind-api-version>
-        <jaxb-impl-version>2.3.3</jaxb-impl-version>
+        <jakarta.xml.bind-api-version>4.0.2</jakarta.xml.bind-api-version>
+        <jaxb-impl-version>4.0.0</jaxb-impl-version>
     </properties>
 
     <dependencies>
@@ -134,9 +134,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>
@@ -155,18 +155,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-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/EvidenceReader.java b/peppol-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/EvidenceReader.java
@@ -30,9 +30,9 @@
 import network.oxalis.vefa.peppol.evidence.jaxb.rem.REMEvidenceType;
 import org.w3c.dom.Node;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;

diff --git a/...-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/EvidenceTypeInstance.java b/...-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/EvidenceTypeInstance.java
@@ -21,7 +21,7 @@
 
 import network.oxalis.vefa.peppol.evidence.jaxb.rem.REMEvidenceType;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 /**
  * REMEvidenceType is an xml complex type, which must be instantiated, see

diff --git a/peppol-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/EvidenceWriter.java b/peppol-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/EvidenceWriter.java
@@ -28,7 +28,7 @@
 import network.oxalis.vefa.peppol.evidence.jaxb.xmldsig.DigestMethodType;
 import org.w3c.dom.Node;
 
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.transform.Result;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamResult;

diff --git a/...ol-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/RemEvidenceBuilder.java b/...ol-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/RemEvidenceBuilder.java
@@ -27,7 +27,7 @@
 import network.oxalis.vefa.peppol.security.lang.PeppolSecurityException;
 import org.w3c.dom.Document;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.security.KeyStore;
 import java.util.Date;
 

diff --git a/...vidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/RemEvidenceTransformer.java b/...vidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/RemEvidenceTransformer.java
@@ -24,9 +24,9 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;

diff --git a/peppol-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/RemHelper.java b/peppol-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/RemHelper.java
@@ -31,10 +31,10 @@
 import network.oxalis.vefa.peppol.evidence.jaxb.rem.REMEvidenceType;
 import network.oxalis.vefa.peppol.security.xmldsig.DomUtils;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;

diff --git a/peppol-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/SignedRemEvidence.java b/peppol-evidence/src/main/java/network/oxalis/vefa/peppol/evidence/rem/SignedRemEvidence.java
@@ -32,7 +32,7 @@
 import network.oxalis.vefa.peppol.evidence.jaxb.rem.REMEvidenceType;
 import org.w3c.dom.Document;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.util.Date;
 import java.util.List;
 

diff --git a/peppol-evidence/src/main/xjb/evidence.xjb b/peppol-evidence/src/main/xjb/evidence.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/peppol-transport-receipt-1.0.xsd">
         <jaxb:schemaBindings>
             <jaxb:package name="network.oxalis.vefa.peppol.evidence.jaxb.receipt"/>

diff --git a/peppol-evidence/src/test/java/network/oxalis/vefa/peppol/evidence/rem/ParseRemTest.java b/peppol-evidence/src/test/java/network/oxalis/vefa/peppol/evidence/rem/ParseRemTest.java
@@ -22,9 +22,9 @@
 import network.oxalis.vefa.peppol.evidence.jaxb.rem.REMEvidenceType;
 import org.testng.annotations.Test;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.InputStream;
 
 import static org.testng.Assert.assertEquals;

diff --git a/peppol-lookup/src/main/java/network/oxalis/vefa/peppol/lookup/reader/Bdxr201407Reader.java b/peppol-lookup/src/main/java/network/oxalis/vefa/peppol/lookup/reader/Bdxr201407Reader.java
@@ -39,10 +39,10 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-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 javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.dom.DOMSource;

diff --git a/peppol-lookup/src/main/java/network/oxalis/vefa/peppol/lookup/reader/Bdxr201605Reader.java b/peppol-lookup/src/main/java/network/oxalis/vefa/peppol/lookup/reader/Bdxr201605Reader.java
@@ -39,10 +39,10 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-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 javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.dom.DOMSource;

diff --git a/peppol-lookup/src/main/java/network/oxalis/vefa/peppol/lookup/reader/BusdoxReader.java b/peppol-lookup/src/main/java/network/oxalis/vefa/peppol/lookup/reader/BusdoxReader.java
@@ -41,10 +41,10 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-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 javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.dom.DOMSource;

diff --git a/peppol-publisher/src/main/java/network/oxalis/vefa/peppol/publisher/PublisherService.java b/peppol-publisher/src/main/java/network/oxalis/vefa/peppol/publisher/PublisherService.java
@@ -31,8 +31,8 @@
 import org.w3c.dom.Document;
 
 import javax.servlet.http.HttpServlet;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import java.io.OutputStream;
 import java.net.URI;
 

diff --git a/peppol-publisher/src/main/java/network/oxalis/vefa/peppol/publisher/api/PublisherSyntax.java b/peppol-publisher/src/main/java/network/oxalis/vefa/peppol/publisher/api/PublisherSyntax.java
@@ -22,9 +22,9 @@
 import network.oxalis.vefa.peppol.publisher.model.PublisherServiceMetadata;
 import network.oxalis.vefa.peppol.publisher.model.ServiceGroup;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import java.net.URI;
 
 /**

diff --git a/...ublisher/src/main/java/network/oxalis/vefa/peppol/publisher/servlet/PublisherServlet.java b/...ublisher/src/main/java/network/oxalis/vefa/peppol/publisher/servlet/PublisherServlet.java
@@ -31,7 +31,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.IOException;
 import java.net.URI;
 import java.util.regex.Matcher;

diff --git a/.../src/main/java/network/oxalis/vefa/peppol/publisher/syntax/Bdxr201605PublisherSyntax.java b/.../src/main/java/network/oxalis/vefa/peppol/publisher/syntax/Bdxr201605PublisherSyntax.java
@@ -27,10 +27,10 @@
 import network.oxalis.vefa.peppol.publisher.model.ServiceGroup;
 import network.oxalis.peppol.bdx.jaxb.smp._2016._05.*;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...sher/src/main/java/network/oxalis/vefa/peppol/publisher/syntax/BusdoxPublisherSyntax.java b/...sher/src/main/java/network/oxalis/vefa/peppol/publisher/syntax/BusdoxPublisherSyntax.java
@@ -35,10 +35,10 @@
 import network.oxalis.peppol.busdox.jaxb.identifiers.ProcessIdentifierType;
 import network.oxalis.peppol.busdox.jaxb.smp.*;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...sher/src/test/java/network/oxalis/vefa/peppol/publisher/servlet/PublisherServletTest.java b/...sher/src/test/java/network/oxalis/vefa/peppol/publisher/servlet/PublisherServletTest.java
@@ -10,7 +10,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.OutputStream;
 import java.net.URI;
 

diff --git a/peppol-sbdh/src/main/java/network/oxalis/vefa/peppol/sbdh/SbdhHelper.java b/peppol-sbdh/src/main/java/network/oxalis/vefa/peppol/sbdh/SbdhHelper.java
@@ -24,7 +24,7 @@
 import network.oxalis.vefa.peppol.common.model.*;
 import network.oxalis.vefa.peppol.common.util.ExceptionUtil;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.stream.XMLInputFactory;

diff --git a/peppol-sbdh/src/main/java/network/oxalis/vefa/peppol/sbdh/SbdhReader.java b/peppol-sbdh/src/main/java/network/oxalis/vefa/peppol/sbdh/SbdhReader.java
@@ -26,7 +26,7 @@
 import network.oxalis.vefa.peppol.common.model.*;
 import network.oxalis.vefa.peppol.sbdh.lang.SbdhException;
 
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.stream.XMLStreamReader;
 import java.io.InputStream;
 

diff --git a/peppol-sbdh/src/main/java/network/oxalis/vefa/peppol/sbdh/SbdhWriter.java b/peppol-sbdh/src/main/java/network/oxalis/vefa/peppol/sbdh/SbdhWriter.java
@@ -25,7 +25,7 @@
 import network.oxalis.vefa.peppol.common.model.Header;
 import network.oxalis.vefa.peppol.sbdh.lang.SbdhException;
 
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.stream.XMLStreamWriter;
 import java.io.OutputStream;
 import java.util.ArrayList;

diff --git a/peppol-security/src/test/java/network/oxalis/vefa/peppol/security/xmldsig/Sample.java b/peppol-security/src/test/java/network/oxalis/vefa/peppol/security/xmldsig/Sample.java
@@ -19,10 +19,10 @@
 
 package network.oxalis.vefa.peppol.security.xmldsig;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 /**
  * @author steinar

diff --git a/peppol-security/src/test/java/network/oxalis/vefa/peppol/security/xmldsig/XmldsigTest.java b/peppol-security/src/test/java/network/oxalis/vefa/peppol/security/xmldsig/XmldsigTest.java
@@ -26,8 +26,8 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamResult;
 import java.io.ByteArrayInputStream;

diff --git a/pom.xml b/pom.xml
@@ -101,8 +101,8 @@
         <lombok.version>1.18.24</lombok.version>
         <metainf-services.version>1.9</metainf-services.version>
         <vefa-peppol.version>3.7.1-SNAPSHOT</vefa-peppol.version>
-        <commons-certvalidator.version>4.2.0</commons-certvalidator.version>
-        <peppol-lib.version>2.2.0</peppol-lib.version>
+        <commons-certvalidator.version>4.2.1-SNAPSHOT</commons-certvalidator.version>
+        <peppol-lib.version>2.2.1-SNAPSHOT</peppol-lib.version>
         <httpclient.version>4.5.13</httpclient.version>
         <dnsjava.version>3.6.0</dnsjava.version>
         <guava.version>33.3.1-jre</guava.version>