From 00eaaeae2dec06e6ec198c2f77f2485bbaa78755 Mon Sep 17 00:00:00 2001
From: dazer007 <ab601026460@163.com>
Date: Thu, 28 Dec 2023 17:36:28 +0800
Subject: [PATCH] =?UTF-8?q?JAXB=20JAXBUtil=20=E9=80=82=E9=85=8D=20jakartaE?=
 =?UTF-8?q?E=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 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- 适配jdk升级到9及以上，移除了 javax.xml.bind (JAXB) 的问题; javax需要从外部引入 -->
+		<!--JAXB (JSR 222) JAXBUtil xml相关依赖-->
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>2.3.7</version>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>3.0.1</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -517,6 +519,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- JAXB (JSR 222) Reference Implementation -->
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>3.0.2</version>
+		</dependency>
 		<dependency>
 			<groupId>javax.activation</groupId>
 			<artifactId>activation</artifactId>
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} 工具类