Browse Source

1、升级版本1.5.1-SNAPSHOT版本;

xueli.xue 9 years ago
parent
commit
a5938fb23e

+ 6 - 2
README.md View File

685
 - 7、表结构调整,底层重构优化;
685
 - 7、表结构调整,底层重构优化;
686
 - 8、"调度中心"自动注册和发现,failover: 调度中心周期性自动注册, 任务回调时可以感知在线的所有调度中心地址, 通过failover的方式进行任务回调,避免回调单点风险。
686
 - 8、"调度中心"自动注册和发现,failover: 调度中心周期性自动注册, 任务回调时可以感知在线的所有调度中心地址, 通过failover的方式进行任务回调,避免回调单点风险。
687
 
687
 
688
+#### 6.10 版本 V1.5.1 特性
689
+- 1、代码优化,POM清理;
690
+- 2、Spring升级至3.2.17.RELEASE版本;
691
+- 3、Jetty升级新版本;
692
+- 4、集群执行器选择规则自定义:单点=选择第一个,随机=随机选择一个;
693
+
688
 #### 规划中
694
 #### 规划中
689
-- 1、集群执行器选择规则自定义:选择第一个,或者随机等;
690
-- 2、升级jetty,spring等版本;
691
 - 3、任务执行规则自定义:假如前一个任务正在执行,后续调度执行规则支持自定义;
695
 - 3、任务执行规则自定义:假如前一个任务正在执行,后续调度执行规则支持自定义;
692
     串行(默认,当前逻辑):后续调度入调度队列;
696
     串行(默认,当前逻辑):后续调度入调度队列;
693
     并行:后续调度并行执行;
697
     并行:后续调度并行执行;

+ 1 - 1
pom.xml View File

3
 	<modelVersion>4.0.0</modelVersion>
3
 	<modelVersion>4.0.0</modelVersion>
4
 	<groupId>com.xuxueli</groupId>
4
 	<groupId>com.xuxueli</groupId>
5
 	<artifactId>xxl-job</artifactId>
5
 	<artifactId>xxl-job</artifactId>
6
-	<version>1.5.0</version>
6
+	<version>1.5.1-SNAPSHOT</version>
7
 	<packaging>pom</packaging>
7
 	<packaging>pom</packaging>
8
 
8
 
9
 	<name>xxl-job</name>
9
 	<name>xxl-job</name>

+ 4 - 5
xxl-job-admin/pom.xml View File

4
 	<parent>
4
 	<parent>
5
 		<groupId>com.xuxueli</groupId>
5
 		<groupId>com.xuxueli</groupId>
6
 		<artifactId>xxl-job</artifactId>
6
 		<artifactId>xxl-job</artifactId>
7
-		<version>1.5.0</version>
7
+		<version>1.5.1-SNAPSHOT</version>
8
 	</parent>
8
 	</parent>
9
 	<artifactId>xxl-job-admin</artifactId>
9
 	<artifactId>xxl-job-admin</artifactId>
10
 	<packaging>war</packaging>
10
 	<packaging>war</packaging>
11
 
11
 
12
 	<properties>
12
 	<properties>
13
-		<xxl-job.version>1.5.0</xxl-job.version>
14
-		<spring.version>3.2.14.RELEASE</spring.version>
13
+		<xxl-job.version>1.5.1-SNAPSHOT</xxl-job.version>
14
+		<spring.version>3.2.17.RELEASE</spring.version>
15
 	</properties>
15
 	</properties>
16
 
16
 
17
 	<dependencies>
17
 	<dependencies>
82
 			<groupId>javax.servlet</groupId>
82
 			<groupId>javax.servlet</groupId>
83
 			<artifactId>servlet-api</artifactId>
83
 			<artifactId>servlet-api</artifactId>
84
 			<version>2.5</version>
84
 			<version>2.5</version>
85
-			<scope>provided</scope>
85
+			<!--<scope>provided</scope>-->
86
 		</dependency>
86
 		</dependency>
87
 		<dependency>
87
 		<dependency>
88
 			<groupId>javax.servlet.jsp</groupId>
88
 			<groupId>javax.servlet.jsp</groupId>
89
 			<artifactId>jsp-api</artifactId>
89
 			<artifactId>jsp-api</artifactId>
90
 			<version>2.1</version>
90
 			<version>2.1</version>
91
-			<scope>provided</scope>
92
 		</dependency>
91
 		</dependency>
93
 
92
 
94
 		<!-- junit -->
93
 		<!-- junit -->

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java View File

31
 
31
 
32
     @Override
32
     @Override
33
     public int registryUpdate(String registryGroup, String registryKey, String registryValue) {
33
     public int registryUpdate(String registryGroup, String registryKey, String registryValue) {
34
-        Map<String, Object> params = new HashMap();
34
+        Map<String, Object> params = new HashMap<String, Object>();
35
         params.put("registryGroup", registryGroup);
35
         params.put("registryGroup", registryGroup);
36
         params.put("registryKey", registryKey);
36
         params.put("registryKey", registryKey);
37
         params.put("registryValue", registryValue);
37
         params.put("registryValue", registryValue);
41
 
41
 
42
     @Override
42
     @Override
43
     public int registrySave(String registryGroup, String registryKey, String registryValue) {
43
     public int registrySave(String registryGroup, String registryKey, String registryValue) {
44
-        Map<String, Object> params = new HashMap();
44
+        Map<String, Object> params = new HashMap<String, Object>();
45
         params.put("registryGroup", registryGroup);
45
         params.put("registryGroup", registryGroup);
46
         params.put("registryKey", registryKey);
46
         params.put("registryKey", registryKey);
47
         params.put("registryValue", registryValue);
47
         params.put("registryValue", registryValue);

+ 2 - 5
xxl-job-core/pom.xml View File

4
 	<parent>
4
 	<parent>
5
 		<groupId>com.xuxueli</groupId>
5
 		<groupId>com.xuxueli</groupId>
6
 		<artifactId>xxl-job</artifactId>
6
 		<artifactId>xxl-job</artifactId>
7
-		<version>1.5.0</version>
7
+		<version>1.5.1-SNAPSHOT</version>
8
 	</parent>
8
 	</parent>
9
 	<artifactId>xxl-job-core</artifactId>
9
 	<artifactId>xxl-job-core</artifactId>
10
 	<packaging>jar</packaging>
10
 	<packaging>jar</packaging>
11
 
11
 
12
 	<properties>
12
 	<properties>
13
-		<spring.version>3.2.14.RELEASE</spring.version>
13
+		<spring.version>3.2.17.RELEASE</spring.version>
14
 	</properties>
14
 	</properties>
15
 
15
 
16
 	<dependencies>
16
 	<dependencies>
19
 			<groupId>javax.servlet</groupId>
19
 			<groupId>javax.servlet</groupId>
20
 			<artifactId>servlet-api</artifactId>
20
 			<artifactId>servlet-api</artifactId>
21
 			<version>2.5</version>
21
 			<version>2.5</version>
22
-			<scope>provided</scope>
23
 		</dependency>
22
 		</dependency>
24
 		<dependency>
23
 		<dependency>
25
 			<groupId>javax.servlet.jsp</groupId>
24
 			<groupId>javax.servlet.jsp</groupId>
26
 			<artifactId>jsp-api</artifactId>
25
 			<artifactId>jsp-api</artifactId>
27
 			<version>2.1</version>
26
 			<version>2.1</version>
28
-			<scope>provided</scope>
29
 		</dependency>
27
 		</dependency>
30
 
28
 
31
 		<!-- jetty -->
29
 		<!-- jetty -->
61
 			<groupId>org.springframework</groupId>
59
 			<groupId>org.springframework</groupId>
62
 			<artifactId>spring-context</artifactId>
60
 			<artifactId>spring-context</artifactId>
63
 			<version>${spring.version}</version>
61
 			<version>${spring.version}</version>
64
-			<scope>compile</scope>
65
 		</dependency>
62
 		</dependency>
66
 		
63
 		
67
 		<!-- groovy-all -->
64
 		<!-- groovy-all -->

+ 1 - 1
xxl-job-core/src/main/java/com/xxl/job/core/util/DBUtil.java View File

78
 
78
 
79
     private static List<Map<String, Object>> resultSetToList(ResultSet resultSet) throws SQLException {
79
     private static List<Map<String, Object>> resultSetToList(ResultSet resultSet) throws SQLException {
80
         if (resultSet == null) {
80
         if (resultSet == null) {
81
-            return Collections.EMPTY_LIST;
81
+            return new ArrayList<Map<String, Object>>();
82
         }
82
         }
83
 
83
 
84
         ResultSetMetaData resultSetMetaData = resultSet.getMetaData(); // 得到结果集(rs)的结构信息,比如字段数、字段名等
84
         ResultSetMetaData resultSetMetaData = resultSet.getMetaData(); // 得到结果集(rs)的结构信息,比如字段数、字段名等

+ 3 - 3
xxl-job-executor-example/pom.xml View File

4
 	<parent>
4
 	<parent>
5
 		<groupId>com.xuxueli</groupId>
5
 		<groupId>com.xuxueli</groupId>
6
 		<artifactId>xxl-job</artifactId>
6
 		<artifactId>xxl-job</artifactId>
7
-		<version>1.5.0</version>
7
+		<version>1.5.1-SNAPSHOT</version>
8
 	</parent>
8
 	</parent>
9
 	<artifactId>xxl-job-executor-example</artifactId>
9
 	<artifactId>xxl-job-executor-example</artifactId>
10
 	<packaging>war</packaging>
10
 	<packaging>war</packaging>
11
 
11
 
12
 	<properties>
12
 	<properties>
13
-		<xxl-job.version>1.5.0</xxl-job.version>
14
-		<spring.version>3.2.14.RELEASE</spring.version>
13
+		<xxl-job.version>1.5.1-SNAPSHOT</xxl-job.version>
14
+		<spring.version>3.2.17.RELEASE</spring.version>
15
 	</properties>
15
 	</properties>
16
 
16
 
17
 	<dependencies>
17
 	<dependencies>