From ac3f9e5f33f0cc307c4de5f7220ecdfc2d98abeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E6=9D=B0?= <693337446@qq.com>
Date: Fri, 11 Jun 2021 12:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91JDK11=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml              | 11 ++++++++++-
 ruoyi-common/pom.xml |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 236c9289..2a7b3f51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
         <spring-boot.version>2.3.11.RELEASE</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.6</druid.version>
         <knife4j.version>3.0.2</knife4j.version>
@@ -30,6 +30,7 @@
         <feign-okhttp.version>11.0</feign-okhttp.version>
         <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
         <redisson.version>3.15.2</redisson.version>
+        <jaxb.version>3.0.1</jaxb.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -125,6 +126,14 @@
                 <version>${redisson.version}</version>
             </dependency>
 
+            <!--jaxb-->
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
+
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index c55be1c0..ff210d53 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -146,6 +146,12 @@
             <artifactId>redisson-spring-boot-starter</artifactId>
         </dependency>
 
+        <!--jaxb-->
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>