zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

JAXB JAXBUtil 适配 jakartaEE移除javaEE

Browse Source
This commit is contained in:
dazer007
2023-12-28 17:36:28 +08:00
parent 6aad33ca7f
commit 00eaaeae2d
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hutool-extra/pom.xml
View File

@@ -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>

14
hutool-extra/src/main/java/org/dromara/hutool/extra/xml/JAXBUtil.java
View File

@@ -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;

2
hutool-extra/src/test/java/org/dromara/hutool/extra/xml/JAXBUtilTest.java
View File

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