From 160beb8e1ce2d4ea65e251a4715280f2be968faf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 28 十月 2021 09:44:57 +0800
Subject: [PATCH] update jdk11 适配依赖 调整到 common 包

---
 pom.xml              |   17 +++++++----------
 ruoyi-common/pom.xml |    6 +++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index fcfec23..5b6144d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,13 @@
                 <version>${jwt.version}</version>
             </dependency>
 
+            <!-- jdk11 缂哄け渚濊禆 jaxb-->
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
+
             <!-- dynamic-datasource 澶氭暟鎹簮-->
             <dependency>
                 <groupId>com.baomidou</groupId>
@@ -322,16 +329,6 @@
         <module>ruoyi-oss</module>
     </modules>
     <packaging>pom</packaging>
-
-
-    <dependencies>
-        <!-- jdk11 缂哄け渚濊禆 jaxb-->
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${jaxb.version}</version>
-        </dependency>
-    </dependencies>
 
     <build>
         <plugins>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index b6e9f9a..d276072 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -76,10 +76,10 @@
             <artifactId>jjwt</artifactId>
         </dependency>
 
-        <!-- Jaxb -->
+        <!-- jdk11 缂哄け渚濊禆 jaxb-->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
         </dependency>
 
         <!-- redis 缂撳瓨鎿嶄綔 -->

--
Gitblit v1.9.3