From 0140965a30ea1b53dfaf722b1c165b2dbe8c6338 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 17 六月 2021 09:42:00 +0800
Subject: [PATCH] update 优化 jdk11 相关 pr

---
 ruoyi-framework/pom.xml |    6 ------
 pom.xml                 |    7 +++++++
 ruoyi-common/pom.xml    |   13 -------------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 547a46e..28a6d8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,6 +291,13 @@
             <properties>
                 <java.version>11</java.version>
             </properties>
+            <dependencies>
+                <!--jaxb-->
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </dependency>
+            </dependencies>
         </profile>
     </profiles>
 
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 5bf7daf..c55be1c 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -148,17 +148,4 @@
 
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>jdk11</id>
-            <dependencies>
-                <!--jaxb-->
-                <dependency>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 236eb05..4313ce5 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -67,12 +67,6 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
-        <!-- jdk11 缂哄け渚濊禆 jaxb-->
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>${jaxb.version}</version>
-        </dependency>
     </dependencies>
 
 </project>

--
Gitblit v1.9.3