Release 版本：2.0.0

6 years ago · b990724e5f
parent 78a1bbd5d5
commit b990724e5f
13 changed files with 17 additions and 18 deletions
--- a/README.md
+++ b/README.md
@ -10,6 +10,9 @@
        <a href="https://travis-ci.org/xuxueli/xxl-job">
            <img src="https://travis-ci.org/xuxueli/xxl-job.svg?branch=master" >
        </a>
+        <a href="https://hub.docker.com/r/xuxueli/xxl-job-admin/">
+            <img src="https://img.shields.io/badge/docker-passing-brightgreen.svg" >
+        </a>
        <a href="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/">
            <img src="https://maven-badges.herokuapp.com/maven-central/com.xuxueli/xxl-job/badge.svg" >
        </a>
--- 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
--- 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.0.0-SNAPSHOT</version>
+	<version>2.0.0</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.0.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 	</parent>
 	<artifactId>xxl-job-admin</artifactId>
 	<packaging>jar</packaging>
@ -69,14 +69,12 @@
 			<artifactId>spring-boot-starter-freemarker</artifactId>
 		</dependency>

-
 		<!-- mybatis-starter：mybatis + mybatis-spring + tomcat-jdbc（default） -->
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<version>${mybatis-spring-boot-starter.version}</version>
 		</dependency>
-
 		<!-- mysql -->
 		<dependency>
 			<groupId>mysql</groupId>
@ -84,7 +82,6 @@
 			<version>${mysql-connector-java.version}</version>
 		</dependency>

-
 		<!-- commons-collections4 -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@ -104,7 +101,6 @@
 			<version>${commons-email.version}</version>
 		</dependency>

-
 		<!-- quartz ：quartz-2.2.3/c3p0-0.9.1.1/slf4j-api-1.6.6 -->
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
@ -112,7 +108,6 @@
 			<version>${quartz.version}</version>
 		</dependency>

-
 		<!-- xxl-job-core -->
 		<dependency>
 			<groupId>com.xuxueli</groupId>
--- 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=系统提示
--- 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
--- 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.0.0-SNAPSHOT</version>
+		<version>2.0.0</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.0.0-SNAPSHOT</version>
+        <version>2.0.0</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.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
    </parent>
    <artifactId>xxl-job-executor-sample-frameless</artifactId>
    <packaging>jar</packaging>
--- 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>
        <artifactId>xxl-job-executor-samples</artifactId>
        <groupId>com.xuxueli</groupId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0</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.0.0-SNAPSHOT</version>
+        <version>2.0.0</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.0.0-SNAPSHOT</version>
+		<version>2.0.0</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.0.0-SNAPSHOT</version>
+        <version>2.0.0</version>
    </parent>
    <artifactId>xxl-job-executor-sample-springboot</artifactId>
    <packaging>jar</packaging>