diff --git a/README.md b/README.md index a297e67a..8a3399c1 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,9 @@ + + + diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 45ae36e3..40860bf5 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -1,6 +1,7 @@ ## 《分布式任务调度平台XXL-JOB》 [![Build Status](https://travis-ci.org/xuxueli/xxl-job.svg?branch=master)](https://travis-ci.org/xuxueli/xxl-job) +[![Docker Status](https://img.shields.io/badge/docker-passing-brightgreen.svg)](https://hub.docker.com/r/xuxueli/xxl-job-admin/) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/) [![GitHub release](https://img.shields.io/github/release/xuxueli/xxl-job.svg)](https://github.com/xuxueli/xxl-job/releases) [![License](https://img.shields.io/badge/license-GPLv3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0.html) @@ -1330,7 +1331,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 40、项目依赖全量升级至较新稳定版本，如spring、Jackson、groovy等等； - 41、docker支持：调度中心提供 Dockerfile 方便快速构建docker镜像； -### 6.23 版本 V2.0.0 特性[迭代中] +### 6.23 版本 V2.0.0 特性[2018-11-04] - 1、调度中心迁移到 springboot； - 2、底层通讯组件迁移至 xxl-rpc； - 3、IP获取逻辑优化，优先遍历网卡来获取可用IP； @@ -1344,7 +1345,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 11、项目依赖升级 groovy 至较新稳定版本；pom清理； - 12、子任务失败重试重试逻辑优化，子任务失败时将会按照其预设的失败重试次数主动进行重试 - 13、多项UI组件升级到最新版本，如：CodeMirror、Echarts、Jquery 等； -- 14、[迭代中]docker镜像，并且推送docker镜像到中央仓库，更进一步实现产品开箱即用； +- 14、提供官方docker镜像，并推送至中央仓库，更进一步实现产品开箱即用； ### TODO LIST diff --git a/pom.xml b/pom.xml index 283bf323..9221e0fc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.xuxueli xxl-job - 2.0.0-SNAPSHOT + 2.0.0 pom ${project.artifactId} diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index c2bb3b3e..b14c70a4 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.xuxueli xxl-job - 2.0.0-SNAPSHOT + 2.0.0 xxl-job-admin jar @@ -69,14 +69,12 @@ spring-boot-starter-freemarker - org.mybatis.spring.boot mybatis-spring-boot-starter ${mybatis-spring-boot-starter.version} - mysql @@ -84,7 +82,6 @@ ${mysql-connector-java.version} - org.apache.commons @@ -104,7 +101,6 @@ ${commons-email.version} - org.quartz-scheduler @@ -112,7 +108,6 @@ ${quartz.version} - com.xuxueli diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties index 43207f76..76dd1d53 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.0.0-SNAPSHOT +admin_version=2.0.0 ## system system_tips=系统提示 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 5e53cded..3045f40e 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.0.0-SNAPSHOT +admin_version=2.0.0 ## system system_tips=System message diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml index 6328750e..bcccc37d 100644 --- a/xxl-job-core/pom.xml +++ b/xxl-job-core/pom.xml @@ -4,7 +4,7 @@ com.xuxueli xxl-job - 2.0.0-SNAPSHOT + 2.0.0 xxl-job-core jar diff --git a/xxl-job-executor-samples/pom.xml b/xxl-job-executor-samples/pom.xml index 97115d33..488a7089 100644 --- a/xxl-job-executor-samples/pom.xml +++ b/xxl-job-executor-samples/pom.xml @@ -5,7 +5,7 @@ com.xuxueli xxl-job - 2.0.0-SNAPSHOT + 2.0.0 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 a56d797e..788835ae 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.0.0-SNAPSHOT + 2.0.0 xxl-job-executor-sample-frameless jar 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 21b467ac..0763deba 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 @@ xxl-job-executor-samples com.xuxueli - 2.0.0-SNAPSHOT + 2.0.0 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 99f2a428..41540b5b 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.0.0-SNAPSHOT + 2.0.0 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 b01e1c48..a76a95fb 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.0.0-SNAPSHOT + 2.0.0 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 87988d44..99a2193a 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.0.0-SNAPSHOT + 2.0.0 xxl-job-executor-sample-springboot jar