From d10099d9e95c8e195bc71355b0eacd2ff446ae09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Wed, 16 Jun 2021 23:46:26 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=80=82=E9=85=8D=20jdk11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml              | 23 ++++++++++++++++++++++-
 ruoyi-common/pom.xml | 19 +++++++++++++------
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2a7b3f51..547a46e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
                 <version>${redisson.version}</version>
             </dependency>
 
-            <!--jaxb-->
+            <!-- jdk11 缺失依赖 jaxb-->
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
@@ -271,6 +271,27 @@
                 <logging.level>warn</logging.level>
             </properties>
         </profile>
+
+        <!-- jdk多版本配置 -->
+        <profile>
+            <id>jdk8</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <jdk>1.8</jdk>
+            </activation>
+            <properties>
+                <java.version>1.8</java.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>jdk11</id>
+            <activation>
+                <jdk>11</jdk>
+            </activation>
+            <properties>
+                <java.version>11</java.version>
+            </properties>
+        </profile>
     </profiles>
 
 </project>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index ff210d53..5bf7dafb 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -146,12 +146,19 @@
             <artifactId>redisson-spring-boot-starter</artifactId>
         </dependency>
 
-        <!--jaxb-->
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>jdk11</id>
+            <dependencies>
+                <!--jaxb-->
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>