Merge pull request #130 from qq254963746/develop

Develop
ltsopensource · Oct 19, 2015 · f18269d · f18269d
2 parents a7033da + 236151a
commit f18269d
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 26 deletions.
diff --git 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.0-beta2
+set VERSION=1.6.1
 set BASE_HOME=%~dp0%
 set DIST_BIN_DIR=lts-%VERSION%-bin
 

diff --git a/build.sh b/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="1.6.0-beta2"
+VERSION="1.6.1"
 
 LTS_BIN="${BASH_SOURCE-$0}"
 LTS_BIN="$(dirname "${LTS_BIN}")"

diff --git a/lts-admin/pom.xml b/lts-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>

diff --git a/lts-core/pom.xml b/lts-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

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
@@ -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.0-beta2");
+    private static final String VERSION = getVersion(Version.class, "1.6.1");
 
     static {
         // 检查是否存在重复的jar包

diff --git a/lts-example/pom.xml b/lts-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>lts-example</artifactId>

diff --git a/lts-example/src/main/java/com/lts/example/api/JobClientTest.java b/lts-example/src/main/java/com/lts/example/api/JobClientTest.java
@@ -53,8 +53,8 @@ public static void testProtector() {
 //      final JobClient jobClient = new JobClient();
         jobClient.setNodeGroup("test_jobClient");
         jobClient.setClusterName("test_cluster");
-//        jobClient.setRegistryAddress("zookeeper://127.0.0.1:2181");
-        jobClient.setRegistryAddress("redis://127.0.0.1:6379");
+        jobClient.setRegistryAddress("zookeeper://127.0.0.1:2181");
+//        jobClient.setRegistryAddress("redis://127.0.0.1:6379");
         // 任务重试保存地址，默认用户目录下
 //        jobClient.setFailStorePath(Constants.USER_HOME);
         jobClient.setJobFinishedHandler(new JobFinishedHandlerImpl());

diff --git a/lts-jobclient/pom.xml b/lts-jobclient/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-jobtracker/pom.xml b/lts-jobtracker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-logger/lts-logger-api/pom.xml b/lts-logger/lts-logger-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-logger</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-logger/lts-logger-console/pom.xml b/lts-logger/lts-logger-console/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-logger</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-logger/lts-logger-mongo/pom.xml b/lts-logger/lts-logger-mongo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-logger</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-logger/lts-logger-mysql/pom.xml b/lts-logger/lts-logger-mysql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-logger</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-logger/pom.xml b/lts-logger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-queue/lts-queue-api/pom.xml b/lts-queue/lts-queue-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-queue</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-queue/lts-queue-mongo/pom.xml b/lts-queue/lts-queue-mongo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-queue</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/lts-queue/lts-queue-mysql/pom.xml b/lts-queue/lts-queue-mysql/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-queue</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-queue/pom.xml b/lts-queue/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-spring/pom.xml b/lts-spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/lts-startup/lts-startup-admin/pom.xml b/lts-startup/lts-startup-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-startup</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-startup/lts-startup-jobtracker/pom.xml b/lts-startup/lts-startup-jobtracker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-startup</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-startup/lts-startup-tasktracker/pom.xml b/lts-startup/lts-startup-tasktracker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-startup</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-startup/pom.xml b/lts-startup/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/lts-tasktracker/pom.xml b/lts-tasktracker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.0-beta2</version>
+        <version>1.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.lts</groupId>
     <artifactId>lts-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.0-beta2</version>
+    <version>1.6.1</version>
     <modules>
         <module>lts-core</module>
         <module>lts-jobtracker</module>