Sfoglia il codice sorgente

springboot版本执行器,升级至1.5.6.RELEASE版本;

xuxueli 8 anni fa
parent
commit
468fecb929

+ 1 - 0
doc/XXL-JOB官方文档.md Vedi File

@@ -906,6 +906,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
906 906
 - 7、新增调度中心API服务测试Demo,方便在调度中心API扩展和测试;
907 907
 - 8、任务列表页交互优化,更换执行器分组时自动刷新任务列表,新建任务时默认定位在当前执行器位置;
908 908
 - 9、访问令牌(accessToken):为提升系统安全性,调度中心和执行器进行安全性校验,双方AccessToken匹配才允许通讯;
909
+- 10、springboot版本执行器,升级至1.5.6.RELEASE版本;
909 910
 
910 911
 #### TODO LIST
911 912
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;

+ 2 - 2
xxl-job-admin/pom.xml Vedi File

@@ -10,7 +10,7 @@
10 10
 	<packaging>war</packaging>
11 11
 
12 12
 	<properties>
13
-		<spring.version>3.2.17.RELEASE</spring.version>
13
+		<spring.version>3.2.18.RELEASE</spring.version>
14 14
 	</properties>
15 15
 
16 16
 	<dependencies>
@@ -53,7 +53,7 @@
53 53
 		<dependency>
54 54
 			<groupId>org.slf4j</groupId>
55 55
 			<artifactId>slf4j-log4j12</artifactId>
56
-			<version>1.7.21</version>
56
+			<version>1.7.25</version>
57 57
 		</dependency>
58 58
 
59 59
 		<!-- freemarker -->

+ 3 - 3
xxl-job-core/pom.xml Vedi File

@@ -14,7 +14,7 @@
14 14
 	<url>http://www.xuxueli.com/</url>
15 15
 
16 16
 	<properties>
17
-		<spring.version>3.2.17.RELEASE</spring.version>
17
+		<spring.version>3.2.18.RELEASE</spring.version>
18 18
 	</properties>
19 19
 
20 20
 	<dependencies>
@@ -34,14 +34,14 @@
34 34
 		<dependency>
35 35
 			<groupId>org.eclipse.jetty</groupId>
36 36
 			<artifactId>jetty-server</artifactId>
37
-			<version>9.2.21.v20170120</version>
37
+			<version>9.2.22.v20170606</version>
38 38
 		</dependency>
39 39
 
40 40
 		<!-- slf4j -->
41 41
 		<dependency>
42 42
 			<groupId>org.slf4j</groupId>
43 43
 			<artifactId>slf4j-api</artifactId>
44
-			<version>1.7.21</version>
44
+			<version>1.7.25</version>
45 45
 		</dependency>
46 46
 
47 47
 		<!-- hessian -->

+ 4 - 16
xxl-job-executor-example/pom.xml Vedi File

@@ -14,11 +14,12 @@
14 14
 	<url>http://www.xuxueli.com/</url>
15 15
 
16 16
 	<properties>
17
-		<spring.version>3.2.17.RELEASE</spring.version>
17
+		<spring.version>3.2.18.RELEASE</spring.version>
18 18
 	</properties>
19 19
 
20 20
 	<dependencies>
21
-		<!-- springframe start -->
21
+
22
+		<!-- spring-webmvc -->
22 23
 		<dependency>
23 24
 			<groupId>org.springframework</groupId>
24 25
 			<artifactId>spring-webmvc</artifactId>
@@ -29,20 +30,7 @@
29 30
 		<dependency>
30 31
 			<groupId>org.slf4j</groupId>
31 32
 			<artifactId>slf4j-log4j12</artifactId>
32
-			<version>1.7.21</version>
33
-		</dependency>
34
-		
35
-		<!-- c3p0 -->
36
-		<dependency>
37
-			<groupId>com.mchange</groupId>
38
-			<artifactId>c3p0</artifactId>
39
-			<version>0.9.5.2</version>
40
-		</dependency>
41
-		<!-- mysql-connector -->
42
-		<dependency>
43
-			<groupId>mysql</groupId>
44
-			<artifactId>mysql-connector-java</artifactId>
45
-			<version>5.1.29</version>
33
+			<version>1.7.25</version>
46 34
 		</dependency>
47 35
 		
48 36
 		<!-- xxl-job-core -->

+ 27 - 22
xxl-job-executor-springboot-example/pom.xml Vedi File

@@ -16,11 +16,13 @@
16 16
     <url>http://www.xuxueli.com/</url>
17 17
 
18 18
     <properties>
19
-        <spring-boot.version>1.3.8.RELEASE</spring-boot.version>
19
+        <spring-boot.version>1.5.6.RELEASE</spring-boot.version>
20 20
 
21 21
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22 22
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
23 23
         <java.version>1.7</java.version>
24
+
25
+        <jetty.version>9.2.22.v20170606</jetty.version>
24 26
     </properties>
25 27
 
26 28
     <dependencyManagement>
@@ -33,41 +35,44 @@
33 35
                 <type>pom</type>
34 36
                 <scope>import</scope>
35 37
             </dependency>
38
+
39
+            <!-- jetty -->
40
+            <dependency>
41
+                <groupId>org.eclipse.jetty</groupId>
42
+                <artifactId>jetty-server</artifactId>
43
+                <version>${jetty.version}</version>
44
+            </dependency>
45
+            <dependency>
46
+                <groupId>org.eclipse.jetty</groupId>
47
+                <artifactId>jetty-util</artifactId>
48
+                <version>${jetty.version}</version>
49
+            </dependency>
50
+            <dependency>
51
+                <groupId>org.eclipse.jetty</groupId>
52
+                <artifactId>jetty-http</artifactId>
53
+                <version>${jetty.version}</version>
54
+            </dependency>
55
+            <dependency>
56
+                <groupId>org.eclipse.jetty</groupId>
57
+                <artifactId>jetty-io</artifactId>
58
+                <version>${jetty.version}</version>
59
+            </dependency>
60
+
36 61
         </dependencies>
37 62
     </dependencyManagement>
38 63
 
39 64
     <dependencies>
40
-
41
-        <dependency>
42
-            <groupId>org.springframework.boot</groupId>
43
-            <artifactId>spring-boot-starter</artifactId>
44
-        </dependency>
45
-
46
-        <!-- spring-boot-starter-web (提供了对web的支持,包含了spring webmvc和tomcat等web开发的特性) -->
65
+        <!-- spring-boot-starter-web (spring-webmvc + tomcat) -->
47 66
         <dependency>
48 67
             <groupId>org.springframework.boot</groupId>
49 68
             <artifactId>spring-boot-starter-web</artifactId>
50 69
         </dependency>
51
-
52 70
         <dependency>
53 71
             <groupId>org.springframework.boot</groupId>
54 72
             <artifactId>spring-boot-starter-test</artifactId>
55 73
             <scope>test</scope>
56 74
         </dependency>
57 75
 
58
-        <!-- c3p0 -->
59
-        <dependency>
60
-            <groupId>com.mchange</groupId>
61
-            <artifactId>c3p0</artifactId>
62
-            <version>0.9.5.2</version>
63
-        </dependency>
64
-        <!-- mysql-connector -->
65
-        <dependency>
66
-            <groupId>mysql</groupId>
67
-            <artifactId>mysql-connector-java</artifactId>
68
-            <version>5.1.29</version>
69
-        </dependency>
70
-
71 76
         <!-- xxl-job-core -->
72 77
         <dependency>
73 78
             <groupId>com.xuxueli</groupId>