浏览代码

升级开发分支:2.0.0-SNAPSHOT

xuxueli 7 年前
父节点
当前提交
00f796118b

+ 3 - 0
doc/XXL-JOB官方文档.md 查看文件

1308
 - 40、项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;
1308
 - 40、项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;
1309
 - 41、docker支持:调度中心提供 Dockerfile 方便快速构建docker镜像; 
1309
 - 41、docker支持:调度中心提供 Dockerfile 方便快速构建docker镜像; 
1310
 
1310
 
1311
+### 6.23 版本 V2.0.0 特性[迭代中]
1312
+- 1、[迭代中]调度中心迁移到springboot;
1313
+
1311
 ### TODO LIST
1314
 ### TODO LIST
1312
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
1315
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
1313
 - 2、任务分片路由:分片采用一致性Hash算法计算出尽量稳定的分片顺序,即使注册机器存在波动也不会引起分批分片顺序大的波动;目前采用IP自然排序,可以满足需求,待定;
1316
 - 2、任务分片路由:分片采用一致性Hash算法计算出尽量稳定的分片顺序,即使注册机器存在波动也不会引起分批分片顺序大的波动;目前采用IP自然排序,可以满足需求,待定;

+ 1 - 1
pom.xml 查看文件

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.9.2</version>
6
+	<version>2.0.0-SNAPSHOT</version>
7
 	<packaging>pom</packaging>
7
 	<packaging>pom</packaging>
8
 
8
 
9
 	<name>${project.artifactId}</name>
9
 	<name>${project.artifactId}</name>

+ 1 - 1
xxl-job-admin/pom.xml 查看文件

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.9.2</version>
7
+		<version>2.0.0-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>

+ 1 - 1
xxl-job-admin/src/main/resources/i18n/message.properties 查看文件

1
 admin_name=任务调度中心
1
 admin_name=任务调度中心
2
 admin_name_full=分布式任务调度平台XXL-JOB
2
 admin_name_full=分布式任务调度平台XXL-JOB
3
-admin_version=1.9.2
3
+admin_version=2.0.0-SNAPSHOT
4
 
4
 
5
 ## system
5
 ## system
6
 system_tips=系统提示
6
 system_tips=系统提示

+ 1 - 1
xxl-job-admin/src/main/resources/i18n/message_en.properties 查看文件

1
 admin_name=Scheduling Center
1
 admin_name=Scheduling Center
2
 admin_name_full=Distributed Task Scheduling Platform XXL-JOB
2
 admin_name_full=Distributed Task Scheduling Platform XXL-JOB
3
-admin_version=1.9.2
3
+admin_version=2.0.0-SNAPSHOT
4
 
4
 
5
 ## system
5
 ## system
6
 system_tips=System message
6
 system_tips=System message

+ 1 - 1
xxl-job-core/pom.xml 查看文件

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.9.2</version>
7
+		<version>2.0.0-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>

+ 1 - 1
xxl-job-executor-samples/pom.xml 查看文件

5
     <parent>
5
     <parent>
6
         <groupId>com.xuxueli</groupId>
6
         <groupId>com.xuxueli</groupId>
7
         <artifactId>xxl-job</artifactId>
7
         <artifactId>xxl-job</artifactId>
8
-        <version>1.9.2</version>
8
+        <version>2.0.0-SNAPSHOT</version>
9
     </parent>
9
     </parent>
10
     <artifactId>xxl-job-executor-samples</artifactId>
10
     <artifactId>xxl-job-executor-samples</artifactId>
11
     <packaging>pom</packaging>
11
     <packaging>pom</packaging>

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml 查看文件

5
     <parent>
5
     <parent>
6
         <artifactId>xxl-job-executor-samples</artifactId>
6
         <artifactId>xxl-job-executor-samples</artifactId>
7
         <groupId>com.xuxueli</groupId>
7
         <groupId>com.xuxueli</groupId>
8
-        <version>1.9.2</version>
8
+        <version>2.0.0-SNAPSHOT</version>
9
     </parent>
9
     </parent>
10
     <modelVersion>4.0.0</modelVersion>
10
     <modelVersion>4.0.0</modelVersion>
11
     <artifactId>xxl-job-executor-sample-jfinal</artifactId>
11
     <artifactId>xxl-job-executor-sample-jfinal</artifactId>

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml 查看文件

5
     <parent>
5
     <parent>
6
         <groupId>com.xuxueli</groupId>
6
         <groupId>com.xuxueli</groupId>
7
         <artifactId>xxl-job-executor-samples</artifactId>
7
         <artifactId>xxl-job-executor-samples</artifactId>
8
-        <version>1.9.2</version>
8
+        <version>2.0.0-SNAPSHOT</version>
9
     </parent>
9
     </parent>
10
     <modelVersion>4.0.0</modelVersion>
10
     <modelVersion>4.0.0</modelVersion>
11
     <artifactId>xxl-job-executor-sample-nutz</artifactId>
11
     <artifactId>xxl-job-executor-sample-nutz</artifactId>

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml 查看文件

4
 	<parent>
4
 	<parent>
5
 		<groupId>com.xuxueli</groupId>
5
 		<groupId>com.xuxueli</groupId>
6
 		<artifactId>xxl-job-executor-samples</artifactId>
6
 		<artifactId>xxl-job-executor-samples</artifactId>
7
-		<version>1.9.2</version>
7
+		<version>2.0.0-SNAPSHOT</version>
8
 	</parent>
8
 	</parent>
9
 	<artifactId>xxl-job-executor-sample-spring</artifactId>
9
 	<artifactId>xxl-job-executor-sample-spring</artifactId>
10
 	<packaging>war</packaging>
10
 	<packaging>war</packaging>

+ 1 - 1
xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml 查看文件

6
     <parent>
6
     <parent>
7
         <groupId>com.xuxueli</groupId>
7
         <groupId>com.xuxueli</groupId>
8
         <artifactId>xxl-job-executor-samples</artifactId>
8
         <artifactId>xxl-job-executor-samples</artifactId>
9
-        <version>1.9.2</version>
9
+        <version>2.0.0-SNAPSHOT</version>
10
     </parent>
10
     </parent>
11
     <artifactId>xxl-job-executor-sample-springboot</artifactId>
11
     <artifactId>xxl-job-executor-sample-springboot</artifactId>
12
     <packaging>jar</packaging>
12
     <packaging>jar</packaging>