From 7f626e8b7cb6eb08ca70f9b0439732ff18d893de Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Tue, 14 Apr 2020 17:29:12 +0800 Subject: [PATCH] upgrade version --- doc/XXL-JOB官方文档.md | 3 + doc/db/tables_xxl_job.sql | 2 +- pom.xml | 2 +- xxl-job-admin/pom.xml | 2 +- .../main/resources/i18n/message_en.properties | 2 +- .../resources/i18n/message_zh_CN.properties | 2 +- .../resources/i18n/message_zh_TC.properties | 2 +- xxl-job-core/pom.xml | 152 +++++++++--------- xxl-job-executor-samples/pom.xml | 2 +- .../xxl-job-executor-sample-frameless/pom.xml | 2 +- .../xxl-job-executor-sample-jboot/pom.xml | 2 +- .../xxl-job-executor-sample-jfinal/pom.xml | 2 +- .../xxl-job-executor-sample-nutz/pom.xml | 2 +- .../xxl-job-executor-sample-spring/pom.xml | 2 +- .../pom.xml | 2 +- 15 files changed, 92 insertions(+), 89 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 22e5bda5..c166bf27 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1960,6 +1960,9 @@ data: post-data - 22、执行备注消息长度限制，修复数据超长无法存储导致导致回调失败的问题； 注意：XxlJobSpringExecutor组件个别字段调整：“appName” 调整为 “appname” ，升级时该组件时需要注意； +### 7.31 版本 v2.2.1 Release Notes[迭代中] + + ### TODO LIST - 1、任务分片路由：分片采用一致性Hash算法计算出尽量稳定的分片顺序，即使注册机器存在波动也不会引起分批分片顺序大的波动；目前采用IP自然排序，可以满足需求，待定； - 2、调度隔离：调度中心针对不同执行器，各自维护不同的调度和远程触发组件。 diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 52e015c4..f465bb60 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -1,5 +1,5 @@ # -# XXL-JOB v2.2.0 +# XXL-JOB v2.2.1-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 565a93c4..9520005c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.xuxueli xxl-job - 2.2.0 + 2.2.1-SNAPSHOT pom ${project.artifactId} diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index f1646528..6ac10f33 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.xuxueli xxl-job - 2.2.0 + 2.2.1-SNAPSHOT xxl-job-admin jar 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 43634999..ab9f9ea9 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.2.0 +admin_version=2.2.1-SNAPSHOT admin_i18n=en ## system diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties index 1b9f0035..1fe8d230 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties @@ -1,6 +1,6 @@ admin_name=任务调度中心 admin_name_full=分布式任务调度平台XXL-JOB -admin_version=2.2.0 +admin_version=2.2.1-SNAPSHOT admin_i18n= ## system diff --git a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties index 4558e4dc..9aaccf9d 100755 --- a/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties @@ -1,6 +1,6 @@ admin_name=任務調度中心 admin_name_full=分布式任務調度平臺XXL-JOB -admin_version=2.2.0 +admin_version=2.2.1-SNAPSHOT admin_i18n= ## system diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml index 79e8944b..8b36206b 100644 --- a/xxl-job-core/pom.xml +++ b/xxl-job-core/pom.xml @@ -1,77 +1,77 @@ - - 4.0.0 - - com.xuxueli - xxl-job - 2.2.0 - - xxl-job-core - jar - - ${project.artifactId} - A distributed task scheduling framework. - https://www.xuxueli.com/ - - - - - - io.netty - netty-all - ${netty-all.version} - - - com.google.code.gson - gson - ${gson.version} - - - - - - org.codehaus.groovy - groovy - ${groovy.version} - - - - - org.springframework - spring-context - ${spring.version} - provided - - - - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j-api.version} - test - - - - junit - junit - ${junit.version} - test - - - - - javax.annotation - javax.annotation-api - ${javax.annotation-api.version} - provided - - - - + + 4.0.0 + + com.xuxueli + xxl-job + 2.2.1-SNAPSHOT + + xxl-job-core + jar + + ${project.artifactId} + A distributed task scheduling framework. + https://www.xuxueli.com/ + + + + + + io.netty + netty-all + ${netty-all.version} + + + com.google.code.gson + gson + ${gson.version} + + + + + + org.codehaus.groovy + groovy + ${groovy.version} + + + + + org.springframework + spring-context + ${spring.version} + provided + + + + + + org.slf4j + slf4j-api + ${slf4j-api.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j-api.version} + test + + + + junit + junit + ${junit.version} + test + + + + + javax.annotation + javax.annotation-api + ${javax.annotation-api.version} + provided + + + + \ No newline at end of file diff --git a/xxl-job-executor-samples/pom.xml b/xxl-job-executor-samples/pom.xml index c9392637..e7d86458 100644 --- a/xxl-job-executor-samples/pom.xml +++ b/xxl-job-executor-samples/pom.xml @@ -5,7 +5,7 @@ com.xuxueli xxl-job - 2.2.0 + 2.2.1-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 bc99aec1..025d9cce 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.2.0 + 2.2.1-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 96c6ec9d..b1e7967b 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.2.0 + 2.2.1-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 a4c0a52d..435d284f 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.2.0 + 2.2.1-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 7422344a..8b8e2b75 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.2.0 + 2.2.1-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 b0c9eaa6..e5386cad 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.2.0 + 2.2.1-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 6978742d..6a67d421 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.2.0 + 2.2.1-SNAPSHOT xxl-job-executor-sample-springboot jar