From 47266f712aace5d442a7dde59b6f60c453fa275a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 17 六月 2021 10:33:48 +0800
Subject: [PATCH] update 更新 JDK logo
---
pom.xml | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4beed40..28a6d8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<spring-boot.version>2.3.11.RELEASE</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
+ <java.version>11</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<druid.version>1.2.6</druid.version>
<knife4j.version>3.0.2</knife4j.version>
@@ -25,11 +25,12 @@
<velocity.version>1.7</velocity.version>
<jwt.version>0.9.1</jwt.version>
<mybatis-plus.version>3.4.3</mybatis-plus.version>
- <hutool.version>5.6.5</hutool.version>
+ <hutool.version>5.7.1</hutool.version>
<feign.version>2.2.6.RELEASE</feign.version>
<feign-okhttp.version>11.0</feign-okhttp.version>
<spring-boot-admin.version>2.3.1</spring-boot-admin.version>
<redisson.version>3.15.2</redisson.version>
+ <jaxb.version>3.0.1</jaxb.version>
</properties>
<!-- 渚濊禆澹版槑 -->
@@ -124,6 +125,14 @@
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>
+
+ <!-- jdk11 缂哄け渚濊禆 jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+
<!-- 瀹氭椂浠诲姟-->
<dependency>
@@ -262,6 +271,34 @@
<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>
+ <dependencies>
+ <!--jaxb-->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
--
Gitblit v1.9.3