From 92f6be094078d19717bc0bf73a4b2da3297f2f4e Mon Sep 17 00:00:00 2001
From: wangdanyu <wangdanyu@ywsk.cn>
Date: Tue, 31 Dec 2019 16:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7springboot=E5=88=B02.0.4.RELE?=
 =?UTF-8?q?ASE=E7=89=88=E6=9C=AC=EF=BC=8C=E5=8D=87=E7=BA=A7spring=E5=88=B0?=
 =?UTF-8?q?5.0.7.RELEASE=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                 | 5 +++--
 xxl-job-admin/pom.xml                                   | 6 ++++++
 xxl-job-admin/src/main/resources/application.properties | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 741c73dc..e84ca572 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,9 +26,10 @@
 
 		<xxl-rpc.version>1.5.0</xxl-rpc.version>
 
-		<spring.version>4.3.25.RELEASE</spring.version>
-		<spring-boot.version>1.5.22.RELEASE</spring-boot.version>
+		<spring.version>5.0.7.RELEASE</spring.version>
+		<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
 		<mybatis-spring-boot-starter.version>1.3.5</mybatis-spring-boot-starter.version>
+		<tomcat-jdbc.version>8.5.43</tomcat-jdbc.version>
 		<mysql-connector-java.version>5.1.48</mysql-connector-java.version>
 
 		<slf4j-api.version>1.7.29</slf4j-api.version>
diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml
index da1c725d..03cd0f08 100644
--- a/xxl-job-admin/pom.xml
+++ b/xxl-job-admin/pom.xml
@@ -59,6 +59,12 @@
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<version>${mybatis-spring-boot-starter.version}</version>
 		</dependency>
+		<!-- tomcat-jdbc -->
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jdbc</artifactId>
+			<version>${tomcat-jdbc.version}</version>
+		</dependency>
 		<!-- mysql -->
 		<dependency>
 			<groupId>mysql</groupId>
diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties
index a8c66b41..b5312c42 100644
--- a/xxl-job-admin/src/main/resources/application.properties
+++ b/xxl-job-admin/src/main/resources/application.properties
@@ -1,9 +1,9 @@
 ### web
 server.port=8080
-server.context-path=/xxl-job-admin
+server.servlet.context-path=/xxl-job-admin
 
 ### actuator
-management.context-path=/actuator
+management.server.servlet.context-path=/actuator
 management.health.mail.enabled=false
 
 ### resources