From e9af4248081c79dabe13dac35cabf322f52cdde7 Mon Sep 17 00:00:00 2001 From: hugui <254963746@qq.com> Date: Tue, 23 Feb 2016 23:04:13 +0800 Subject: [PATCH 1/2] 1.6.4 release --- lts-admin/pom.xml | 2 +- lts-core/pom.xml | 2 +- lts-example/pom.xml | 2 +- lts-jobclient/pom.xml | 2 +- lts-jobtracker/pom.xml | 2 +- .../lts/jobtracker/support/cluster/JobClientManager.java | 7 ------- lts-logger/pom.xml | 2 +- lts-queue/pom.xml | 2 +- lts-spring/pom.xml | 2 +- lts-startup/lts-startup-admin/pom.xml | 2 +- lts-startup/lts-startup-jobtracker/pom.xml | 2 +- lts-startup/lts-startup-tasktracker/pom.xml | 2 +- lts-startup/pom.xml | 2 +- lts-tasktracker/pom.xml | 2 +- lts/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 15 insertions(+), 22 deletions(-) diff --git a/lts-admin/pom.xml b/lts-admin/pom.xml index 46c647522..fbd0d9d46 100644 --- a/lts-admin/pom.xml +++ b/lts-admin/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 war diff --git a/lts-core/pom.xml b/lts-core/pom.xml index 5abb9e67a..c0a3a878a 100644 --- a/lts-core/pom.xml +++ b/lts-core/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 jar diff --git a/lts-example/pom.xml b/lts-example/pom.xml index f2b21619f..c1219c8e0 100644 --- a/lts-example/pom.xml +++ b/lts-example/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 lts-example diff --git a/lts-jobclient/pom.xml b/lts-jobclient/pom.xml index c579f1548..8388ba16c 100644 --- a/lts-jobclient/pom.xml +++ b/lts-jobclient/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 diff --git a/lts-jobtracker/pom.xml b/lts-jobtracker/pom.xml index bb973d78b..011a25695 100644 --- a/lts-jobtracker/pom.xml +++ b/lts-jobtracker/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 diff --git a/lts-jobtracker/src/main/java/com/lts/jobtracker/support/cluster/JobClientManager.java b/lts-jobtracker/src/main/java/com/lts/jobtracker/support/cluster/JobClientManager.java index dc79ccafd..ed3163b20 100644 --- a/lts-jobtracker/src/main/java/com/lts/jobtracker/support/cluster/JobClientManager.java +++ b/lts-jobtracker/src/main/java/com/lts/jobtracker/support/cluster/JobClientManager.java @@ -44,8 +44,6 @@ public Set getNodeGroups() { /** * 添加节点 - * - * @param node */ public void addNode(Node node) { // channel 可能为 null @@ -71,8 +69,6 @@ public void addNode(Node node) { /** * 删除节点 - * - * @param node */ public void removeNode(Node node) { Set jobClientNodes = NODE_MAP.get(node.getGroup()); @@ -88,9 +84,6 @@ public void removeNode(Node node) { /** * 得到 可用的 客户端节点 - * - * @param nodeGroup - * @return */ public JobClientNode getAvailableJobClient(String nodeGroup) { diff --git a/lts-logger/pom.xml b/lts-logger/pom.xml index 05437710f..019bc7019 100644 --- a/lts-logger/pom.xml +++ b/lts-logger/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 diff --git a/lts-queue/pom.xml b/lts-queue/pom.xml index 4d604fbcf..19527d670 100644 --- a/lts-queue/pom.xml +++ b/lts-queue/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 diff --git a/lts-spring/pom.xml b/lts-spring/pom.xml index 19ab84d8c..6ac2e0176 100644 --- a/lts-spring/pom.xml +++ b/lts-spring/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 jar diff --git a/lts-startup/lts-startup-admin/pom.xml b/lts-startup/lts-startup-admin/pom.xml index 75a3a9e96..df939807b 100644 --- a/lts-startup/lts-startup-admin/pom.xml +++ b/lts-startup/lts-startup-admin/pom.xml @@ -5,7 +5,7 @@ lts-startup com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 diff --git a/lts-startup/lts-startup-jobtracker/pom.xml b/lts-startup/lts-startup-jobtracker/pom.xml index be8850e8e..7063e3898 100644 --- a/lts-startup/lts-startup-jobtracker/pom.xml +++ b/lts-startup/lts-startup-jobtracker/pom.xml @@ -5,7 +5,7 @@ lts-startup com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 diff --git a/lts-startup/lts-startup-tasktracker/pom.xml b/lts-startup/lts-startup-tasktracker/pom.xml index 3e777cdc7..ba44ad146 100644 --- a/lts-startup/lts-startup-tasktracker/pom.xml +++ b/lts-startup/lts-startup-tasktracker/pom.xml @@ -5,7 +5,7 @@ lts-startup com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 diff --git a/lts-startup/pom.xml b/lts-startup/pom.xml index 75b5258ca..d9f2b2564 100644 --- a/lts-startup/pom.xml +++ b/lts-startup/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 diff --git a/lts-tasktracker/pom.xml b/lts-tasktracker/pom.xml index 62e8054cd..82ae921e4 100644 --- a/lts-tasktracker/pom.xml +++ b/lts-tasktracker/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 4.0.0 diff --git a/lts/pom.xml b/lts/pom.xml index e454d684e..26c4ba7db 100644 --- a/lts/pom.xml +++ b/lts/pom.xml @@ -5,7 +5,7 @@ lts-parent com.lts - 1.6.4-SNAPSHOT + 1.6.4 jar 4.0.0 diff --git a/pom.xml b/pom.xml index 56c4b3cf8..df2271294 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.lts lts-parent pom - 1.6.4-SNAPSHOT + 1.6.4 https://github.com/qq254963746/light-task-scheduler.git lts-core From 6382408b7d73c9d548d7e2ff5f242939f265312c Mon Sep 17 00:00:00 2001 From: hugui <254963746@qq.com> Date: Tue, 23 Feb 2016 23:04:20 +0800 Subject: [PATCH 2/2] for --- build.cmd | 2 +- build.sh | 2 +- lts-core/src/main/java/com/lts/core/support/Version.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.cmd b/build.cmd index d2fcca11b..45d1b99e8 100644 --- a/build.cmd +++ b/build.cmd @@ -4,7 +4,7 @@ start mvn clean install -DskipTests echo "LTS: mvn clean install -DskipTests" echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul -set VERSION=1.6.4-SNAPSHOT +set VERSION=1.6.4 set BASE_HOME=%~dp0% set DIST_BIN_DIR=lts-%VERSION%-bin diff --git a/build.sh b/build.sh index 8f31bd36e..5bab7743a 100644 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERSION="1.6.4-SNAPSHOT" +VERSION="1.6.4" LTS_BIN="${BASH_SOURCE-$0}" LTS_BIN="$(dirname "${LTS_BIN}")" diff --git a/lts-core/src/main/java/com/lts/core/support/Version.java b/lts-core/src/main/java/com/lts/core/support/Version.java index c5ac0fe90..e5442e415 100644 --- a/lts-core/src/main/java/com/lts/core/support/Version.java +++ b/lts-core/src/main/java/com/lts/core/support/Version.java @@ -20,7 +20,7 @@ private Version() {} private static final Logger LOGGER = LoggerFactory.getLogger(Version.class); - private static final String VERSION = getVersion(Version.class, "1.6.4-SNAPSHOT"); + private static final String VERSION = getVersion(Version.class, "1.6.4"); static { // 检查是否存在重复的jar包