update rm

5 years ago · 4f7f4dcf8e
parent 4944348911
commit 4f7f4dcf8e
14 changed files with 16 additions and 13 deletions
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@ -1615,6 +1615,9 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 24、任务列表交互优化，支持查看任务所属执行器的注册节点；
 - 25、项目依赖升级至较新稳定版本，如spring、spring-boot、mybatis、slf4j、groovy等等；

+### 6.27 版本 v2.1.2 Release Notes[迭代中]
+- 1、[迭代中]移除commons-exec，采用原生方式实现；
+

 ### TODO LIST
 - 1、任务分片路由：分片采用一致性Hash算法计算出尽量稳定的分片顺序，即使注册机器存在波动也不会引起分批分片顺序大的波动；目前采用IP自然排序，可以满足需求，待定；
--- a/doc/db/tables_xxl_job.sql
+++ b/doc/db/tables_xxl_job.sql
@ -1,5 +1,5 @@
 #
-# XXL-JOB v2.1.1
+# XXL-JOB v2.1.2-SNAPSHOT
 # Copyright (c) 2015-present, xuxueli.

 CREATE database if NOT EXISTS `xxl_job` default character set utf8mb4 collate utf8mb4_unicode_ci;
--- a/pom.xml
+++ b/pom.xml
@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.xuxueli</groupId>
 	<artifactId>xxl-job</artifactId>
-	<version>2.1.1</version>
+	<version>2.1.2-SNAPSHOT</version>
 	<packaging>pom</packaging>

 	<name>${project.artifactId}</name>
--- a/xxl-job-admin/pom.xml
+++ b/xxl-job-admin/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-job</artifactId>
-		<version>2.1.1</version>
+		<version>2.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>xxl-job-admin</artifactId>
 	<packaging>jar</packaging>
--- a/xxl-job-admin/src/main/resources/i18n/message.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message.properties
@ -1,6 +1,6 @@
 admin_name=任务调度中心
 admin_name_full=分布式任务调度平台XXL-JOB
-admin_version=2.1.1
+admin_version=2.1.2-SNAPSHOT
 admin_i18n=

 ## system
--- a/xxl-job-admin/src/main/resources/i18n/message_en.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties
@ -1,6 +1,6 @@
 admin_name=Scheduling Center
 admin_name_full=Distributed Task Scheduling Platform XXL-JOB
-admin_version=2.1.1
+admin_version=2.1.2-SNAPSHOT
 admin_i18n=en

 ## system
--- a/xxl-job-core/pom.xml
+++ b/xxl-job-core/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-job</artifactId>
-		<version>2.1.1</version>
+		<version>2.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>xxl-job-core</artifactId>
 	<packaging>jar</packaging>
--- a/xxl-job-executor-samples/pom.xml
+++ b/xxl-job-executor-samples/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xuxueli</groupId>
        <artifactId>xxl-job</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-SNAPSHOT</version>
    </parent>
    <artifactId>xxl-job-executor-samples</artifactId>
    <packaging>pom</packaging>
--- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>com.xuxueli</groupId>
        <artifactId>xxl-job-executor-samples</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-SNAPSHOT</version>
    </parent>
    <artifactId>xxl-job-executor-sample-frameless</artifactId>
    <packaging>jar</packaging>
--- a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xuxueli</groupId>
        <artifactId>xxl-job-executor-samples</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>xxl-job-executor-sample-jboot</artifactId>
--- a/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xuxueli</groupId>
        <artifactId>xxl-job-executor-samples</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>xxl-job-executor-sample-jfinal</artifactId>
--- a/xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.xuxueli</groupId>
        <artifactId>xxl-job-executor-samples</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>xxl-job-executor-sample-nutz</artifactId>
--- a/xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-job-executor-samples</artifactId>
-		<version>2.1.1</version>
+		<version>2.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>xxl-job-executor-sample-spring</artifactId>
 	<packaging>war</packaging>
--- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>com.xuxueli</groupId>
        <artifactId>xxl-job-executor-samples</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-SNAPSHOT</version>
    </parent>
    <artifactId>xxl-job-executor-sample-springboot</artifactId>
    <packaging>jar</packaging>