From 4f7f4dcf8e73a41f43b1588684f15e7392dabb55 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sun, 24 Nov 2019 14:03:16 +0800 Subject: [PATCH] update rm --- doc/XXL-JOB官方文档.md | 3 +++ doc/db/tables_xxl_job.sql | 2 +- pom.xml | 2 +- xxl-job-admin/pom.xml | 2 +- xxl-job-admin/src/main/resources/i18n/message.properties | 2 +- xxl-job-admin/src/main/resources/i18n/message_en.properties | 2 +- xxl-job-core/pom.xml | 2 +- xxl-job-executor-samples/pom.xml | 2 +- .../xxl-job-executor-sample-frameless/pom.xml | 2 +- xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml | 2 +- .../xxl-job-executor-sample-jfinal/pom.xml | 2 +- xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml | 2 +- .../xxl-job-executor-sample-spring/pom.xml | 2 +- .../xxl-job-executor-sample-springboot/pom.xml | 2 +- 14 files changed, 16 insertions(+), 13 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index b20e7ba4..97c31cf9 100644 --- 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自然排序,可以满足需求,待定; diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 849c7657..c04b7256 100644 --- 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; diff --git a/pom.xml b/pom.xml index 6acaf7a9..d67b4a81 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.xuxueli xxl-job - 2.1.1 + 2.1.2-SNAPSHOT pom ${project.artifactId} diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 0712e79f..40b78e1e 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.xuxueli xxl-job - 2.1.1 + 2.1.2-SNAPSHOT xxl-job-admin jar diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties index ecaac0a9..96977b1e 100644 --- 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 diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties index 2c610010..04f0f3ae 100644 --- 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 diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml index 2ed4bdab..489b34ce 100644 --- a/xxl-job-core/pom.xml +++ b/xxl-job-core/pom.xml @@ -4,7 +4,7 @@ com.xuxueli xxl-job - 2.1.1 + 2.1.2-SNAPSHOT xxl-job-core jar diff --git a/xxl-job-executor-samples/pom.xml b/xxl-job-executor-samples/pom.xml index e1d0beb0..7a8eb95c 100644 --- a/xxl-job-executor-samples/pom.xml +++ b/xxl-job-executor-samples/pom.xml @@ -5,7 +5,7 @@ com.xuxueli xxl-job - 2.1.1 + 2.1.2-SNAPSHOT xxl-job-executor-samples pom diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml index 44036243..c97226c5 100644 --- 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 @@ com.xuxueli xxl-job-executor-samples - 2.1.1 + 2.1.2-SNAPSHOT xxl-job-executor-sample-frameless jar diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jboot/pom.xml index f2e1ce29..9a5b20c0 100644 --- 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 @@ com.xuxueli xxl-job-executor-samples - 2.1.1 + 2.1.2-SNAPSHOT 4.0.0 xxl-job-executor-sample-jboot diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-jfinal/pom.xml index c708ceda..3b974975 100644 --- 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 @@ com.xuxueli xxl-job-executor-samples - 2.1.1 + 2.1.2-SNAPSHOT 4.0.0 xxl-job-executor-sample-jfinal diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-nutz/pom.xml index bf2aab94..813066dc 100644 --- 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 @@ com.xuxueli xxl-job-executor-samples - 2.1.1 + 2.1.2-SNAPSHOT 4.0.0 xxl-job-executor-sample-nutz diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-spring/pom.xml index e6c8c9fe..63422c42 100644 --- 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 @@ com.xuxueli xxl-job-executor-samples - 2.1.1 + 2.1.2-SNAPSHOT xxl-job-executor-sample-spring war diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml index daa752c6..03baa076 100644 --- 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 @@ com.xuxueli xxl-job-executor-samples - 2.1.1 + 2.1.2-SNAPSHOT xxl-job-executor-sample-springboot jar