From 468fecb9292bd9a410afbaeb5fe81ce94ea06dba Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Sun, 30 Jul 2017 18:13:51 +0800
Subject: [PATCH] =?UTF-8?q?springboot=E7=89=88=E6=9C=AC=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=99=A8=EF=BC=8C=E5=8D=87=E7=BA=A7=E8=87=B31.5.6.RELEASE?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/XXL-JOB官方文档.md                      |  1 +
 xxl-job-admin/pom.xml                       |  4 +-
 xxl-job-core/pom.xml                        |  6 +--
 xxl-job-executor-example/pom.xml            | 20 ++-------
 xxl-job-executor-springboot-example/pom.xml | 49 ++++++++++++---------
 5 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index 55c5ed7e..fcce9d80 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -906,6 +906,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 7、新增调度中心API服务测试Demo，方便在调度中心API扩展和测试；
 - 8、任务列表页交互优化，更换执行器分组时自动刷新任务列表，新建任务时默认定位在当前执行器位置；
 - 9、访问令牌（accessToken）：为提升系统安全性，调度中心和执行器进行安全性校验，双方AccessToken匹配才允许通讯；
+- 10、springboot版本执行器，升级至1.5.6.RELEASE版本；
 
 #### TODO LIST
 - 1、任务权限管理：执行器为粒度分配权限，核心操作校验权限；
diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml
index 0202b80c..6a8cf8c3 100644
--- a/xxl-job-admin/pom.xml
+++ b/xxl-job-admin/pom.xml
@@ -10,7 +10,7 @@
 	<packaging>war</packaging>
 
 	<properties>
-		<spring.version>3.2.17.RELEASE</spring.version>
+		<spring.version>3.2.18.RELEASE</spring.version>
 	</properties>
 
 	<dependencies>
@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.21</version>
+			<version>1.7.25</version>
 		</dependency>
 
 		<!-- freemarker -->
diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml
index 723bc03a..caf5bf5b 100644
--- a/xxl-job-core/pom.xml
+++ b/xxl-job-core/pom.xml
@@ -14,7 +14,7 @@
 	<url>http://www.xuxueli.com/</url>
 
 	<properties>
-		<spring.version>3.2.17.RELEASE</spring.version>
+		<spring.version>3.2.18.RELEASE</spring.version>
 	</properties>
 
 	<dependencies>
@@ -34,14 +34,14 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
-			<version>9.2.21.v20170120</version>
+			<version>9.2.22.v20170606</version>
 		</dependency>
 
 		<!-- slf4j -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.21</version>
+			<version>1.7.25</version>
 		</dependency>
 
 		<!-- hessian -->
diff --git a/xxl-job-executor-example/pom.xml b/xxl-job-executor-example/pom.xml
index 44e6966b..8f47a121 100644
--- a/xxl-job-executor-example/pom.xml
+++ b/xxl-job-executor-example/pom.xml
@@ -14,11 +14,12 @@
 	<url>http://www.xuxueli.com/</url>
 
 	<properties>
-		<spring.version>3.2.17.RELEASE</spring.version>
+		<spring.version>3.2.18.RELEASE</spring.version>
 	</properties>
 
 	<dependencies>
-		<!-- springframe start -->
+
+		<!-- spring-webmvc -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
@@ -29,20 +30,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.21</version>
-		</dependency>
-		
-		<!-- c3p0 -->
-		<dependency>
-			<groupId>com.mchange</groupId>
-			<artifactId>c3p0</artifactId>
-			<version>0.9.5.2</version>
-		</dependency>
-		<!-- mysql-connector -->
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.29</version>
+			<version>1.7.25</version>
 		</dependency>
 		
 		<!-- xxl-job-core -->
diff --git a/xxl-job-executor-springboot-example/pom.xml b/xxl-job-executor-springboot-example/pom.xml
index adf3da8e..2ab192e0 100644
--- a/xxl-job-executor-springboot-example/pom.xml
+++ b/xxl-job-executor-springboot-example/pom.xml
@@ -16,11 +16,13 @@
     <url>http://www.xuxueli.com/</url>
 
     <properties>
-        <spring-boot.version>1.3.8.RELEASE</spring-boot.version>
+        <spring-boot.version>1.5.6.RELEASE</spring-boot.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.7</java.version>
+
+        <jetty.version>9.2.22.v20170606</jetty.version>
     </properties>
 
     <dependencyManagement>
@@ -33,41 +35,44 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <!-- jetty -->
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-util</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-http</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-io</artifactId>
+                <version>${jetty.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- spring-boot-starter-web (提供了对web的支持，包含了spring webmvc和tomcat等web开发的特性) -->
+        <!-- spring-boot-starter-web (spring-webmvc + tomcat) -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <!-- c3p0 -->
-        <dependency>
-            <groupId>com.mchange</groupId>
-            <artifactId>c3p0</artifactId>
-            <version>0.9.5.2</version>
-        </dependency>
-        <!-- mysql-connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.29</version>
-        </dependency>
-
         <!-- xxl-job-core -->
         <dependency>
             <groupId>com.xuxueli</groupId>