From 355c0e07d98a687af3f7d34895684de452101c3b Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Fri, 22 Nov 2019 19:27:58 +0800 Subject: [PATCH] upgrade version --- doc/XXL-JOB官方文档.md | 2 +- 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 | 6 +++--- .../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 +- .../xxl-job-executor-sample-springboot/pom.xml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index f4ac5db0..eeaa27d4 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1582,7 +1582,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 19、代码优化，ConcurrentHashMap变量类型改为ConcurrentMap，避免因不同版本实现不同导致的兼容性问题； -### 6.26 版本 v2.1.1 Release Notes[规划中] +### 6.26 版本 v2.1.1 Release Notes[回归测试中，即将发布] - 1、UI优化，任务列表和日志列表数据表格宽度比例调整，避免数据换行提升体验； - 2、登录界面取消默认填写的登录账号密码； - 3、执行器表属性调整，"顺序" 属性调整为整型，解决执行器数据较多时无法正确排序的问题； diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql index 786273cf..849c7657 100644 --- a/doc/db/tables_xxl_job.sql +++ b/doc/db/tables_xxl_job.sql @@ -1,5 +1,5 @@ # -# XXL-JOB v2.1.1-SNAPSHOT +# XXL-JOB v2.1.1 # 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 6cc9b13b..6acaf7a9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.xuxueli xxl-job - 2.1.1-SNAPSHOT + 2.1.1 pom ${project.artifactId} diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index 170d967d..eed993fd 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.xuxueli xxl-job - 2.1.1-SNAPSHOT + 2.1.1 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 73f812ba..ecaac0a9 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-SNAPSHOT +admin_version=2.1.1 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 b3aaa3fe..2c610010 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-SNAPSHOT +admin_version=2.1.1 admin_i18n=en ## system diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml index 440af89a..2ed4bdab 100644 --- a/xxl-job-core/pom.xml +++ b/xxl-job-core/pom.xml @@ -4,7 +4,7 @@ com.xuxueli xxl-job - 2.1.1-SNAPSHOT + 2.1.1 xxl-job-core jar diff --git a/xxl-job-executor-samples/pom.xml b/xxl-job-executor-samples/pom.xml index c153b2b9..e1d0beb0 100644 --- a/xxl-job-executor-samples/pom.xml +++ b/xxl-job-executor-samples/pom.xml @@ -5,17 +5,17 @@ com.xuxueli xxl-job - 2.1.1-SNAPSHOT + 2.1.1 xxl-job-executor-samples pom - xxl-job-executor-sample-spring + xxl-job-executor-sample-frameless xxl-job-executor-sample-springboot + xxl-job-executor-sample-spring xxl-job-executor-sample-jfinal xxl-job-executor-sample-nutz - xxl-job-executor-sample-frameless xxl-job-executor-sample-jboot 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 f8b24ef7..44036243 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-SNAPSHOT + 2.1.1 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 2e72b064..f2e1ce29 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-SNAPSHOT + 2.1.1 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 7f70fb30..c708ceda 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-SNAPSHOT + 2.1.1 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 5b5dc800..bf2aab94 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-SNAPSHOT + 2.1.1 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 ff3992c5..e6c8c9fe 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-SNAPSHOT + 2.1.1 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 d850e2b3..daa752c6 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-SNAPSHOT + 2.1.1 xxl-job-executor-sample-springboot jar