1.6.3 release

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.3-SNAPSHOT
+set VERSION=1.6.3
 set BASE_HOME=%~dp0%
 set DIST_BIN_DIR=lts-%VERSION%-bin
 

build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="1.6.3-SNAPSHOT"
+VERSION="1.6.3"
 
 LTS_BIN="${BASH_SOURCE-$0}"
 LTS_BIN="$(dirname "${LTS_BIN}")"

lts-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>

lts-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

lts-core/src/main/java/com/lts/core/support/Version.java

@@ -20,7 +20,7 @@ public final class Version {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Version.class);
 
-    private static final String VERSION = getVersion(Version.class, "1.6.3-SNAPSHOT");
+    private static final String VERSION = getVersion(Version.class, "1.6.3");
 
     static {
         // 检查是否存在重复的jar包

lts-example/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>lts-example</artifactId>

lts-jobclient/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-jobtracker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-jobtracker/src/main/java/com/lts/jobtracker/complete/JobFinishHandler.java

@@ -3,6 +3,7 @@ package com.lts.jobtracker.complete;
 import com.lts.core.commons.utils.CollectionUtils;
 import com.lts.core.domain.JobWrapper;
 import com.lts.core.domain.TaskTrackerJobResult;
+import com.lts.core.json.JSON;
 import com.lts.core.logger.Logger;
 import com.lts.core.logger.LoggerFactory;
 import com.lts.core.support.LoggerName;
@@ -66,7 +67,7 @@ public class JobFinishHandler implements JobCompleteHandler {
             cronJobPo.setGmtModified(SystemClock.now());
             application.getExecutableJobQueue().add(cronJobPo);
         } catch (DuplicateJobException e) {
-            LOGGER.warn(e.getMessage(), e);
+            LOGGER.warn("ExecutableJobQueue already exist:" + JSON.toJSONString(cronJobPo));
         }
     }
 }

lts-jobtracker/src/main/java/com/lts/jobtracker/complete/JobRetryHandler.java

@@ -71,7 +71,7 @@ public class JobRetryHandler implements JobCompleteHandler {
             try {
                 application.getExecutableJobQueue().add(jobPo);
             } catch (DuplicateJobException e) {
-                LOGGER.warn("Add Executable Job error jobPo={}", JSON.toJSONString(jobPo), e);
+                LOGGER.warn("ExecutableJobQueue already exist:" + JSON.toJSONString(jobPo));
             }
             // 从正在执行的队列中移除
             application.getExecutingJobQueue().remove(jobPo.getJobId());

lts-jobtracker/src/main/java/com/lts/jobtracker/sender/JobSender.java

@@ -41,7 +41,7 @@ public class JobSender {
         try {
             application.getExecutingJobQueue().add(jobPo);
         } catch (DuplicateJobException e) {
-            LOGGER.warn("Add Executing Job error, jobPo={}", JSON.toJSONString(jobPo), e);
+            LOGGER.warn("ExecutingJobQueue already exist:" + JSON.toJSONString(jobPo));
             application.getExecutableJobQueue().resume(jobPo);
             return new SendResult(false, JobPushResult.FAILED);
         }

lts-jobtracker/src/main/java/com/lts/jobtracker/support/JobPusher.java

@@ -175,7 +175,7 @@ public class JobPusher {
                         jobPo.setIsRunning(true);
                         application.getExecutableJobQueue().add(jobPo);
                     } catch (DuplicateJobException e) {
-                        LOGGER.warn("Add Executable Job error jobPo={}", JSON.toJSONString(jobPo), e);
+                        LOGGER.warn("ExecutableJobQueue already exist:" + JSON.toJSONString(jobPo));
                         needResume = false;
                     }
                     application.getExecutingJobQueue().remove(jobPo.getJobId());

lts-jobtracker/src/main/java/com/lts/jobtracker/support/checker/ExecutingDeadJobChecker.java

@@ -183,8 +183,7 @@ public class ExecutingDeadJobChecker {
             try {
                 application.getExecutableJobQueue().add(jobPo);
             } catch (DuplicateJobException e) {
-                // ignore
-                LOGGER.warn("Add Executable Job error jobPo={}", JSON.toJSONString(jobPo), e);
+                LOGGER.warn("ExecutableJobQueue already exist:" + JSON.toJSONString(jobPo));
             }
 
             // 2. remove from executing queue

lts-logger/lts-logger-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-logger</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-logger/lts-logger-console/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-logger</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-logger/lts-logger-mongo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-logger</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-logger/lts-logger-mysql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-logger</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-logger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-queue/lts-queue-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-queue</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-queue/lts-queue-mongo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-queue</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

lts-queue/lts-queue-mysql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-queue</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-queue/lts-queue-mysql/src/main/resources/sql/lts_cron_job_queue.sql

@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS `{tableName}` (
   `is_running` tinyint(11) DEFAULT NULL COMMENT '是否正在执行',
   `task_tracker_identity` varchar(64) DEFAULT NULL COMMENT '执行的taskTracker的唯一标识',
   `need_feedback` tinyint(4) DEFAULT NULL COMMENT '是否需要反馈给客户端',
-  `cron_expression` varchar(32) DEFAULT NULL COMMENT '执行时间表达式 (和 quartz 表达式一样)',
+  `cron_expression` varchar(128) DEFAULT NULL COMMENT '执行时间表达式 (和 quartz 表达式一样)',
   `trigger_time` bigint(20) DEFAULT NULL COMMENT '下一次执行时间',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_job_id` (`job_id`),

lts-queue/lts-queue-mysql/src/main/resources/sql/lts_executable_job_queue.sql

@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS `{tableName}` (
   `is_running` tinyint(11) DEFAULT NULL COMMENT '是否正在执行',
   `task_tracker_identity` varchar(64) DEFAULT NULL COMMENT '执行的taskTracker的唯一标识',
   `need_feedback` tinyint(4) DEFAULT NULL COMMENT '是否需要反馈给客户端',
-  `cron_expression` varchar(32) DEFAULT NULL COMMENT '执行时间表达式 (和 quartz 表达式一样)',
+  `cron_expression` varchar(128) DEFAULT NULL COMMENT '执行时间表达式 (和 quartz 表达式一样)',
   `trigger_time` bigint(20) DEFAULT NULL COMMENT '下一次执行时间',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_job_id` (`job_id`),

lts-queue/lts-queue-mysql/src/main/resources/sql/lts_executing_job_queue.sql

@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS `{tableName}` (
   `is_running` tinyint(11) DEFAULT NULL COMMENT '是否正在执行',
   `task_tracker_identity` varchar(64) DEFAULT NULL COMMENT '执行的taskTracker的唯一标识',
   `need_feedback` tinyint(4) DEFAULT NULL COMMENT '是否需要反馈给客户端',
-  `cron_expression` varchar(32) DEFAULT NULL COMMENT '执行时间表达式 (和 quartz 表达式一样)',
+  `cron_expression` varchar(128) DEFAULT NULL COMMENT '执行时间表达式 (和 quartz 表达式一样)',
   `trigger_time` bigint(20) DEFAULT NULL COMMENT '下一次执行时间',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_job_id` (`job_id`),

lts-queue/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-spring/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

lts-startup/lts-startup-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-startup</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-startup/lts-startup-jobtracker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-startup</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-startup/lts-startup-tasktracker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-startup</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-startup/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts-tasktracker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

lts/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.lts</groupId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.3</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.lts</groupId>
     <artifactId>lts-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.3-SNAPSHOT</version>
+    <version>1.6.3</version>
     <modules>
         <module>lts-core</module>
         <module>lts-jobtracker</module>