diff --git a/cxf-spring-boot-starter/pom.xml b/cxf-spring-boot-starter/pom.xml index c99af8e..2ad1e3b 100644 --- a/cxf-spring-boot-starter/pom.xml +++ b/cxf-spring-boot-starter/pom.xml @@ -22,6 +22,9 @@ 2.3.0.RELEASE 3.4.2 2.0.0 + 3.0.0 + 2.1.0 + 3.0.0 4.5.13 7.14.0 @@ -37,6 +40,7 @@ **/target/generated-sources/wsdlimport/** + @@ -57,6 +61,7 @@ + org.springframework.boot @@ -66,6 +71,7 @@ org.springframework.boot spring-boot-starter-actuator + org.springframework.cloud @@ -83,6 +89,7 @@ cxf-rt-transports-http ${cxf.version} + com.sun.activation @@ -90,6 +97,25 @@ ${jakarta.activation.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.version} + + + jakarta.xml.ws + jakarta.xml.ws-api + ${jakarta.xml.version} + + + jakarta.jws + jakarta.jws-api + ${jakarta.jws-api.version} + + + org.camunda.bpm.dmn @@ -103,18 +129,21 @@ camunda-engine-dmn ${camunda.version} + net.logstash.logback logstash-logback-encoder ${logstash-logback-encoder.version} + commons-io commons-io ${commons-io.version} + org.apache.httpcomponents diff --git a/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/autodetection/WebServiceAutoDetector.java b/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/autodetection/WebServiceAutoDetector.java index f30f75d..57c1466 100644 --- a/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/autodetection/WebServiceAutoDetector.java +++ b/cxf-spring-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 index 5148c48..b2c65cc 100644 --- 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/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/configuration/CxfAutoConfiguration.java b/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/configuration/CxfAutoConfiguration.java index bfc94dd..1266602 100644 --- a/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/configuration/CxfAutoConfiguration.java +++ b/cxf-spring-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/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/configuration/TimeLoggingConfiguration.java b/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/configuration/TimeLoggingConfiguration.java index b2e658e..aae33eb 100644 --- a/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/configuration/TimeLoggingConfiguration.java +++ b/cxf-spring-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/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/configuration/XmlValidationConfiguration.java b/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/configuration/XmlValidationConfiguration.java index c6debad..8e7ba45 100644 --- a/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/configuration/XmlValidationConfiguration.java +++ b/cxf-spring-boot-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/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/xmlvalidation/XmlValidationInterceptor.java b/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/xmlvalidation/XmlValidationInterceptor.java index 0cfe5e7..e884097 100644 --- a/cxf-spring-boot-starter/src/main/java/de/codecentric/cxf/xmlvalidation/XmlValidationInterceptor.java +++ b/cxf-spring-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/cxf-spring-boot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceAutoDetectorTest.java b/cxf-spring-boot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceAutoDetectorTest.java index 663d6fa..480adc9 100644 --- a/cxf-spring-boot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceAutoDetectorTest.java +++ b/cxf-spring-boot-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/cxf-spring-boot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceScannerTest.java b/cxf-spring-boot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceScannerTest.java index 07b50b3..cf4744d 100644 --- a/cxf-spring-boot-starter/src/test/java/de/codecentric/cxf/autodetection/WebServiceScannerTest.java +++ b/cxf-spring-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;