From 00eaaeae2dec06e6ec198c2f77f2485bbaa78755 Mon Sep 17 00:00:00 2001 From: dazer007 Date: Thu, 28 Dec 2023 17:36:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?JAXB=20JAXBUtil=20=E9=80=82=E9=85=8D=20jaka?= =?UTF-8?q?rtaEE=E7=A7=BB=E9=99=A4javaEE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-extra/pom.xml | 14 +++++++++++--- .../org/dromara/hutool/extra/xml/JAXBUtil.java | 14 +++++++------- .../org/dromara/hutool/extra/xml/JAXBUtilTest.java | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index b47531240..11c8c16c9 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -505,10 +505,12 @@ + + - com.sun.xml.bind - jaxb-impl - 2.3.7 + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 provided @@ -517,6 +519,12 @@ + + + org.glassfish.jaxb + jaxb-runtime + 3.0.2 + javax.activation activation diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java index 8ffe97844..4bebd69c0 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java @@ -19,13 +19,13 @@ import org.dromara.hutool.core.text.StrUtil; import org.dromara.hutool.core.util.CharsetUtil; import org.dromara.hutool.core.xml.XmlUtil; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.io.File; import java.io.Reader; import java.io.StringWriter; diff --git a/hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java b/hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java index 45ae42ded..3290d37e5 100644 --- a/hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java +++ b/hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java @@ -12,10 +12,10 @@ package org.dromara.hutool.extra.xml; +import jakarta.xml.bind.annotation.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import javax.xml.bind.annotation.*; /** * {@link JAXBUtil} 工具类 From c87421056847400d05269598af911738f9d2f050 Mon Sep 17 00:00:00 2001 From: dazer007 Date: Thu, 28 Dec 2023 19:00:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20webservice=20SOAP=20=E5=BC=83=E7=94=A8ja?= =?UTF-8?q?vaEE=20xml=20saop=20=E4=BD=BF=E7=94=A8jakarta=20xml=20soap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-extra/pom.xml | 9 +-------- hutool-http/pom.xml | 13 ++++++++++--- .../dromara/hutool/http/webservice/SoapClient.java | 2 +- .../hutool/http/webservice/SoapProtocol.java | 2 +- .../dromara/hutool/http/webservice/SoapUtil.java | 4 ++-- .../hutool/http/webservice/SoapClientTest.java | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 11c8c16c9..570ca0cdf 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -505,8 +505,7 @@ - - + jakarta.xml.bind jakarta.xml.bind-api @@ -525,11 +524,5 @@ jaxb-runtime 3.0.2 - - javax.activation - activation - 1.1.1 - provided - diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 69d179d74..12b1e3260 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -43,10 +43,17 @@ hutool-log ${project.parent.version} + - javax.xml.soap - javax.xml.soap-api - 1.4.0 + jakarta.xml.soap + jakarta.xml.soap-api + 2.0.1 + provided + + + com.sun.xml.messaging.saaj + saaj-impl + 2.0.1 provided diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java index 88821b2ac..cc5b156f4 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapClient.java @@ -26,7 +26,7 @@ import org.dromara.hutool.http.client.Response; import javax.xml.XMLConstants; import javax.xml.namespace.QName; -import javax.xml.soap.*; +import jakarta.xml.soap.*; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.Charset; diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java index 000e6606b..4c6901c31 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapProtocol.java @@ -12,7 +12,7 @@ package org.dromara.hutool.http.webservice; -import javax.xml.soap.SOAPConstants; +import jakarta.xml.soap.SOAPConstants; /** * SOAP协议版本枚举 diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java index 60c3f7c20..5c678a62a 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/webservice/SoapUtil.java @@ -17,8 +17,8 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPMessage; import org.dromara.hutool.core.exception.HutoolException; import org.dromara.hutool.core.util.CharsetUtil; diff --git a/hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java b/hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java index ccb508966..13efabbd8 100644 --- a/hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java +++ b/hutool-http/src/test/java/org/dromara/hutool/http/webservice/SoapClientTest.java @@ -17,8 +17,8 @@ import org.dromara.hutool.core.util.CharsetUtil; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPMessage; /** * SOAP相关单元测试 @@ -32,7 +32,7 @@ public class SoapClientTest { @Disabled public void requestTest() { final SoapClient client = SoapClient.of("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx") - .setMethod("web:getCountryCityByIp", "http://WebXml.com.cn/") + .setMethod("getCountryCityByIp", "http://WebXml.com.cn/") .charset(CharsetUtil.GBK) .setParam("theIpAddress", "218.21.240.106");