From d10099d9e95c8e195bc71355b0eacd2ff446ae09 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 六月 2021 23:46:26 +0800
Subject: [PATCH] update 适配 jdk11
---
pom.xml | 23 ++++++++++++++++++++++-
ruoyi-common/pom.xml | 19 +++++++++++++------
2 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2a7b3f5..547a46e 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 ff210d5..5bf7daf 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>
--
Gitblit v1.9.3