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} 工具类