Skip to content

Commit

Permalink
Merge pull request #167 from qq254963746/develop
Browse files Browse the repository at this point in the history 
1.6.3 release
  • Loading branch information
@qq254963746
qq254963746 committed Dec 19, 2015
2 parents f1eca39 + 9e399b0 commit e7fd063
Show file tree
Hide file tree
Showing 33 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion build.cmd
View file
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
@@ -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}")"
Expand Down
2 changes: 1 addition & 1 deletion lts-admin/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion lts-core/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion lts-core/src/main/java/com/lts/core/support/Version.java
View file
Expand Up @@ -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.3-SNAPSHOT");
private static final String VERSION = getVersion(Version.class, "1.6.3");

static {
// 检查是否存在重复的jar包
Expand Down
2 changes: 1 addition & 1 deletion lts-example/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion lts-jobclient/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-jobtracker/pom.xml
View file
Expand Up @@ -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>

Expand Down
3 changes: 2 additions & 1 deletion lts-jobtracker/src/main/java/com/lts/jobtracker/complete/JobFinishHandler.java
View file
Expand Up @@ -3,6 +3,7 @@
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;
Expand Down Expand Up @@ -66,7 +67,7 @@ private void finishScheduleJob(String jobId) {
cronJobPo.setGmtModified(SystemClock.now());
application.getExecutableJobQueue().add(cronJobPo);
} catch (DuplicateJobException e) {
LOGGER.warn(e.getMessage(), e);
LOGGER.warn("ExecutableJobQueue already exist:" + JSON.toJSONString(cronJobPo));
}
}
}
2 changes: 1 addition & 1 deletion lts-jobtracker/src/main/java/com/lts/jobtracker/complete/JobRetryHandler.java
View file
Expand Up @@ -71,7 +71,7 @@ public void onComplete(List<TaskTrackerJobResult> results) {
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());
Expand Down
2 changes: 1 addition & 1 deletion lts-jobtracker/src/main/java/com/lts/jobtracker/sender/JobSender.java
View file
Expand Up @@ -41,7 +41,7 @@ public SendResult send(String taskTrackerNodeGroup, String taskTrackerIdentity,
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);
}
Expand Down
2 changes: 1 addition & 1 deletion lts-jobtracker/src/main/java/com/lts/jobtracker/support/JobPusher.java
View file
Expand Up @@ -175,7 +175,7 @@ public void operationComplete(ResponseFuture responseFuture) {
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());
Expand Down
3 changes: 1 addition & 2 deletions lts-jobtracker/src/main/java/com/lts/jobtracker/support/checker/ExecutingDeadJobChecker.java
View file
Expand Up @@ -183,8 +183,7 @@ private void fixDeadJob(JobPo jobPo) {
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
Expand Down
2 changes: 1 addition & 1 deletion lts-logger/lts-logger-api/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-logger/lts-logger-console/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-logger/lts-logger-mongo/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-logger/lts-logger-mysql/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-logger/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-queue/lts-queue-api/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-queue/lts-queue-mongo/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion lts-queue/lts-queue-mysql/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-queue/lts-queue-mysql/src/main/resources/sql/lts_cron_job_queue.sql
View file
Expand Up @@ -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`),
Expand Down
2 changes: 1 addition & 1 deletion lts-queue/lts-queue-mysql/src/main/resources/sql/lts_executable_job_queue.sql
View file
Expand Up @@ -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`),
Expand Down
2 changes: 1 addition & 1 deletion lts-queue/lts-queue-mysql/src/main/resources/sql/lts_executing_job_queue.sql
View file
Expand Up @@ -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`),
Expand Down
2 changes: 1 addition & 1 deletion lts-queue/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-spring/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion lts-startup/lts-startup-admin/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-startup/lts-startup-jobtracker/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-startup/lts-startup-tasktracker/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-startup/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts-tasktracker/pom.xml
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lts/pom.xml
View file
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -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>
Expand Down

0 comments on commit e7fd063

Please sign in to comment.