Merge pull request #262 from smahieu87/feature/jakarta

jakarta upgrade
OxalisCommunity · Nov 16, 2024 · 8d473a6 · 8d473a6
2 parents dc89a6a + 80b5acb
commit 8d473a6
Show file tree

Hide file tree

Showing 28 changed files with 230 additions and 254 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>network.oxalis</groupId>
         <artifactId>oxalis</artifactId>
-        <version>6.7.0</version>
+        <version>6.7.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>oxalis-as4</artifactId>
@@ -96,15 +96,15 @@
         <java.version>11</java.version>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
-        <peppol.sbdh.version>2.2.0</peppol.sbdh.version>
-        <cxf.version>3.6.4</cxf.version>
-        <wss4j.version>2.4.1</wss4j.version>
-        <jakarta.xml.soap-api.version>1.4.2</jakarta.xml.soap-api.version>
-        <saaj-impl.version>1.5.3</saaj-impl.version>
-        <jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
-        <jaxb-impl-version>2.3.3</jaxb-impl-version>
-        <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
-        <jakarta.xml.ws-api.version>2.3.3</jakarta.xml.ws-api.version>
+        <peppol.sbdh.version>2.2.1-SNAPSHOT</peppol.sbdh.version>
+        <cxf.version>4.0.5</cxf.version>
+        <wss4j.version>3.0.3</wss4j.version>
+        <jakarta.xml.soap-api.version>3.0.2</jakarta.xml.soap-api.version>
+        <saaj-impl.version>3.0.4</saaj-impl.version>
+        <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
+        <jaxb-impl-version>4.0.0</jaxb-impl-version>
+        <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
+        <jakarta.xml.ws-api.version>4.0.2</jakarta.xml.ws-api.version>
         <bouncycastle.version>1.78.1</bouncycastle.version>
         <commons-io.version>2.14.0</commons-io.version>
         <neethi.version>3.2.0</neethi.version>
@@ -401,12 +401,6 @@
             <artifactId>jaxb-impl</artifactId>
             <version>${jaxb-impl-version}</version>
             <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.activation</groupId>
-                    <artifactId>jakarta.activation</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
@@ -438,8 +432,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -467,8 +461,8 @@
         </dependency>
 
         <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-noop</artifactId>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -477,8 +471,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -565,9 +559,9 @@
 
         <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-generate</id>
@@ -589,47 +583,18 @@
                             <verbose>true</verbose>
                             <removeOldOutput>true</removeOldOutput>
                             <args>
-                                <arg>-Xfluent-builder</arg>
                                 <arg>-Xannotate</arg>
-                                <arg>-Xsimplify</arg>
                             </args>
                             <plugins>
                                 <plugin>
-                                    <groupId>net.codesup.util</groupId>
-                                    <artifactId>jaxb2-rich-contract-plugin</artifactId>
-                                    <version>2.1.0</version>
-                                </plugin>
-                                <plugin>
-                                    <groupId>org.jvnet.jaxb2_commons</groupId>
-                                    <artifactId>jaxb2-basics-annotate</artifactId>
-                                    <version>1.1.0</version>
-                                </plugin>
-                                <plugin>
-                                    <groupId>org.jvnet.jaxb2_commons</groupId>
-                                    <artifactId>jaxb2-basics</artifactId>
-                                    <version>1.11.1</version>
-                                </plugin>
-                                <plugin>
-                                    <groupId>org.jvnet.jaxb2_commons</groupId>
-                                    <artifactId>jaxb2-basics-tools</artifactId>
-                                    <version>1.11.1</version>
+                                    <groupId>org.jvnet.jaxb</groupId>
+                                    <artifactId>jaxb-plugin-annotate</artifactId>
+                                    <version>4.0.8</version>
                                 </plugin>
                             </plugins>
                         </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>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/network/oxalis/as4/inbound/AS4StatusServlet.java b/src/main/java/network/oxalis/as4/inbound/AS4StatusServlet.java
@@ -26,9 +26,9 @@
 import com.google.inject.Singleton;
 import network.oxalis.vefa.peppol.mode.Mode;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 

diff --git a/src/main/java/network/oxalis/as4/inbound/AbstractSetPolicyInterceptor.java b/src/main/java/network/oxalis/as4/inbound/AbstractSetPolicyInterceptor.java
@@ -15,9 +15,9 @@
 import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage;
 import org.w3c.dom.Node;
 
-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.util.Collection;
 import java.util.Optional;
 import java.util.stream.Stream;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4EndpointsPublisherImpl.java b/src/main/java/network/oxalis/as4/inbound/As4EndpointsPublisherImpl.java
@@ -18,7 +18,7 @@
 import org.apache.cxf.ws.policy.WSPolicyFeature;
 import org.apache.cxf.wsdl.interceptors.AbstractEndpointSelectionInterceptor;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 import java.util.Arrays;
 
 import static org.apache.cxf.ws.security.SecurityConstants.ENABLE_STREAMING_SECURITY;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4FaultInHandler.java b/src/main/java/network/oxalis/as4/inbound/As4FaultInHandler.java
@@ -17,11 +17,11 @@
 import org.apache.wss4j.common.ext.WSSecurityException;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Optional;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4InboundHandler.java b/src/main/java/network/oxalis/as4/inbound/As4InboundHandler.java
@@ -37,8 +37,8 @@
 import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.*;
 import org.w3.xmldsig.ReferenceType;
 
-import javax.xml.soap.*;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.soap.*;
+import jakarta.xml.ws.handler.MessageContext;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4InboundModule.java b/src/main/java/network/oxalis/as4/inbound/As4InboundModule.java
@@ -6,7 +6,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.cxf.wsdl.interceptors.AbstractEndpointSelectionInterceptor;
 
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServlet;
 
 @Slf4j
 public class As4InboundModule extends ServletModule {

diff --git a/src/main/java/network/oxalis/as4/inbound/As4Interceptor.java b/src/main/java/network/oxalis/as4/inbound/As4Interceptor.java
@@ -23,9 +23,9 @@
 import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage;
 import org.w3c.dom.Node;
 
-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.util.Collection;
 import java.util.Optional;
 import java.util.stream.Stream;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4PayloadHeader.java b/src/main/java/network/oxalis/as4/inbound/As4PayloadHeader.java
@@ -4,7 +4,7 @@
 import lombok.ToString;
 import network.oxalis.vefa.peppol.common.model.*;
 
-import javax.xml.soap.MimeHeader;
+import jakarta.xml.soap.MimeHeader;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;

diff --git a/src/main/java/network/oxalis/as4/inbound/As4Provider.java b/src/main/java/network/oxalis/as4/inbound/As4Provider.java
@@ -5,12 +5,12 @@
 import network.oxalis.as4.lang.OxalisAs4Exception;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.*;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.*;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.soap.SOAPBinding;
 
 @WebServiceProvider
 @ServiceMode(value = Service.Mode.MESSAGE)

diff --git a/src/main/java/network/oxalis/as4/inbound/As4Servlet.java b/src/main/java/network/oxalis/as4/inbound/As4Servlet.java
@@ -14,10 +14,10 @@
 import org.apache.cxf.ws.security.wss4j.PolicyBasedWSS4JOutInterceptor;
 import org.apache.wss4j.common.crypto.Merlin;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 import static org.apache.cxf.rt.security.SecurityConstants.*;

diff --git a/src/main/java/network/oxalis/as4/inbound/AttachmentCleanupInterceptor.java b/src/main/java/network/oxalis/as4/inbound/AttachmentCleanupInterceptor.java
@@ -10,7 +10,7 @@
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 
-import javax.activation.DataSource;
+import jakarta.activation.DataSource;
 
 public class AttachmentCleanupInterceptor extends AbstractPhaseInterceptor<Message> {
 

diff --git a/src/main/java/network/oxalis/as4/inbound/MessagingHandler.java b/src/main/java/network/oxalis/as4/inbound/MessagingHandler.java
@@ -1,9 +1,9 @@
 package network.oxalis.as4.inbound;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
 import java.util.Collections;
 import java.util.Set;
 

diff --git a/src/main/java/network/oxalis/as4/outbound/As4MessageSender.java b/src/main/java/network/oxalis/as4/outbound/As4MessageSender.java
@@ -31,13 +31,13 @@
 import org.apache.wss4j.common.crypto.Merlin;
 import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Dispatch;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.soap.SOAPBinding;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;