#95: First migration try going from javax to jakarta packages. Bu…

…t CXF isn't ready right now :(
codecentric · Jan 7, 2021 · 7ff3bb0 · 7ff3bb0
1 parent e99b619
commit 7ff3bb0
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 20 deletions.
diff --git a/cxf-spring-boot-starter/pom.xml b/cxf-spring-boot-starter/pom.xml
@@ -22,6 +22,9 @@
 		<cxf-spring-boot-starter-maven-plugin.version>2.3.0.RELEASE</cxf-spring-boot-starter-maven-plugin.version>
 		<cxf.version>3.4.2</cxf.version>
 		<jakarta.activation.version>2.0.0</jakarta.activation.version>
+		<jakarta.xml.version>3.0.0</jakarta.xml.version>
+		<jakarta.jws.version>2.1.0</jakarta.jws.version>
+		<jakarta.jws-api.version>3.0.0</jakarta.jws-api.version>
 
 		<fluent-hc.version>4.5.13</fluent-hc.version>
 		<camunda.version>7.14.0</camunda.version>
@@ -37,6 +40,7 @@
 		<!-- Exclude generated JAXB-Java-Classes from Sonar-Analysis -->
 		<sonar.exclusions>**/target/generated-sources/wsdlimport/**</sonar.exclusions>
 	</properties>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -57,6 +61,7 @@
 
         </dependencies>
 	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -66,6 +71,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+
 		<!-- Distributed tracing - http://cloud.spring.io/spring-cloud-sleuth/ -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -83,13 +89,33 @@
 			<artifactId>cxf-rt-transports-http</artifactId>
 			<version>${cxf.version}</version>
 		</dependency>
+
 		<!-- Apache CXF from Java 11 on - see https://stackoverflow.com/questions/55476331/tomcat8-5-and-openjdk11-noclassdeffounderror-could-not-initialize-class-org-apa -->
 		<dependency>
 			<groupId>com.sun.activation</groupId>
 			<artifactId>jakarta.activation</artifactId>
 			<version>${jakarta.activation.version}</version>
 		</dependency>
 
+		<!-- Needed from JAXB 3.0.0 on, otherwise the generated classes can't find their basic types
+			like e.g. jakarta.xml.bind.annotation.XmlType -->
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>${jakarta.xml.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.ws</groupId>
+			<artifactId>jakarta.xml.ws-api</artifactId>
+			<version>${jakarta.xml.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.jws</groupId>
+			<artifactId>jakarta.jws-api</artifactId>
+			<version>${jakarta.jws-api.version}</version>
+		</dependency>
+
+
 		<!-- camunda DMN Engine -->
 		<dependency>
 			<groupId>org.camunda.bpm.dmn</groupId>
@@ -103,18 +129,21 @@
 			<artifactId>camunda-engine-dmn</artifactId>
 			<version>${camunda.version}</version>
 		</dependency>
+
 		<!-- Logging with ELK -->
 		<dependency>
 			<groupId>net.logstash.logback</groupId>
 			<artifactId>logstash-logback-encoder</artifactId>
 			<version>${logstash-logback-encoder.version}</version>
 		</dependency>
+
 		<!-- Fileconverting for PDF-reading -->
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>${commons-io.version}</version>
 		</dependency>
+
 		<!-- SoapRawClient -->
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>

diff --git a/...g-boot-starter/src/main/java/de/codecentric/cxf/autodetection/WebServiceAutoDetector.java b/...g-boot-starter/src/main/java/de/codecentric/cxf/autodetection/WebServiceAutoDetector.java
@@ -4,15 +4,16 @@
 import de.codecentric.cxf.autodetection.diagnostics.SeiNotFoundException;
 import de.codecentric.cxf.autodetection.diagnostics.WebServiceClientNotFoundException;
 import de.codecentric.cxf.common.BootStarterCxfException;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.WebServiceClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import javax.jws.WebService;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceClient;
+
 
 
 @Component

diff --git a/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/common/XmlUtils.java b/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/common/XmlUtils.java
@@ -6,20 +6,16 @@
 import java.lang.reflect.Method;
 import java.util.Objects;
 
-import javax.jws.WebMethod;
-import javax.xml.bind.JAXB;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchema;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.dom.DOMSource;
 
+import jakarta.jws.WebMethod;
+import jakarta.xml.bind.*;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchema;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

diff --git a/...ing-boot-starter/src/main/java/de/codecentric/cxf/configuration/CxfAutoConfiguration.java b/...ing-boot-starter/src/main/java/de/codecentric/cxf/configuration/CxfAutoConfiguration.java
@@ -3,6 +3,8 @@
 import de.codecentric.cxf.autodetection.WebServiceAutoDetector;
 import de.codecentric.cxf.autodetection.WebServiceScanner;
 import de.codecentric.cxf.common.BootStarterCxfException;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Service;
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBus;
 import org.apache.cxf.jaxws.EndpointImpl;
@@ -20,8 +22,6 @@
 import org.springframework.context.annotation.PropertySource;
 
 import javax.annotation.PostConstruct;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Service;
 import java.util.Map;
 
 /**

diff --git a/...boot-starter/src/main/java/de/codecentric/cxf/configuration/TimeLoggingConfiguration.java b/...boot-starter/src/main/java/de/codecentric/cxf/configuration/TimeLoggingConfiguration.java
@@ -1,8 +1,6 @@
 package de.codecentric.cxf.configuration;
 
 import de.codecentric.cxf.logging.TimeLoggingFilter;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;

diff --git a/...ot-starter/src/main/java/de/codecentric/cxf/configuration/XmlValidationConfiguration.java b/...ot-starter/src/main/java/de/codecentric/cxf/configuration/XmlValidationConfiguration.java
@@ -3,6 +3,7 @@
 import de.codecentric.cxf.xmlvalidation.CustomFaultBuilder;
 import de.codecentric.cxf.xmlvalidation.SoapFaultBuilder;
 import de.codecentric.cxf.xmlvalidation.XmlValidationInterceptor;
+import jakarta.xml.ws.Endpoint;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +13,6 @@
 import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.PostConstruct;
-import javax.xml.ws.Endpoint;
 
 /**
  * Configure extended XML-Schema validation incl. customizing of the responding SoapFaults.

diff --git a/...boot-starter/src/main/java/de/codecentric/cxf/xmlvalidation/XmlValidationInterceptor.java b/...boot-starter/src/main/java/de/codecentric/cxf/xmlvalidation/XmlValidationInterceptor.java
@@ -1,8 +1,8 @@
 package de.codecentric.cxf.xmlvalidation;
 
 
-import javax.xml.bind.UnmarshalException;
 
+import jakarta.xml.bind.UnmarshalException;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
 import org.apache.cxf.interceptor.Fault;

diff --git a/...ot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceAutoDetectorTest.java b/...ot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceAutoDetectorTest.java
@@ -7,13 +7,14 @@
 import de.codecentric.cxf.common.BootStarterCxfException;
 import de.codecentric.namespace.weatherservice.Weather;
 import de.codecentric.namespace.weatherservice.WeatherService;
+import jakarta.xml.ws.Service;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.ApplicationContext;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
+
 import java.util.Arrays;
 import java.util.List;
 

diff --git a/...ng-boot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceScannerTest.java b/...ng-boot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceScannerTest.java
@@ -3,9 +3,10 @@
 
 import de.codecentric.cxf.common.BootStarterCxfException;
 import de.codecentric.namespace.weatherservice.WeatherService;
+import jakarta.jws.WebService;
 import org.junit.jupiter.api.Test;
 
-import javax.jws.WebService;
+
 import java.util.List;
 
 import static de.codecentric.cxf.autodetection.WebServiceAutoDetector.SEI_ANNOTATION;