Browse Source

update 适配 jdk11

疯狂的狮子li 4 năm trước cách đây
mục cha
commit
d10099d9e9
2 tập tin đã thay đổi với 35 bổ sung7 xóa
  1. 22 1
      pom.xml
  2. 13 6
      ruoyi-common/pom.xml

+ 22 - 1
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>

+ 13 - 6
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>