Merge pull request #1431 from itxiaobaishu/v2.2.0

升级springboot到2.0.4.RELEASE版本，升级spring到5.0.7.RELEASE版本

pom.xml

@@ -26,9 +26,10 @@
 
 
 		<xxl-rpc.version>1.5.0</xxl-rpc.version>
 		<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>
 		<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>
 		<mysql-connector-java.version>5.1.48</mysql-connector-java.version>
 
 
 		<slf4j-api.version>1.7.29</slf4j-api.version>
 		<slf4j-api.version>1.7.29</slf4j-api.version>

xxl-job-admin/pom.xml

@@ -59,6 +59,12 @@
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<version>${mybatis-spring-boot-starter.version}</version>
 			<version>${mybatis-spring-boot-starter.version}</version>
 		</dependency>
 		</dependency>
+		<!-- tomcat-jdbc -->
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jdbc</artifactId>
+			<version>${tomcat-jdbc.version}</version>
+		</dependency>
 		<!-- mysql -->
 		<!-- mysql -->
 		<dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<groupId>mysql</groupId>

xxl-job-admin/src/main/resources/application.properties

 ### web
 ### web
 server.port=8080
 server.port=8080
-server.context-path=/xxl-job-admin
+server.servlet.context-path=/xxl-job-admin
 
 
 ### actuator
 ### actuator
-management.context-path=/actuator
+management.server.servlet.context-path=/actuator
 management.health.mail.enabled=false
 management.health.mail.enabled=false
 
 
 ### resources
 ### resources