浏览代码

升级正式版本:1.6.2

xueli.xue 8 年之前
父节点
当前提交
463d8fe5a4

+ 1 - 1
pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.xuxueli</groupId>
 	<groupId>com.xuxueli</groupId>
 	<artifactId>xxl-job</artifactId>
 	<artifactId>xxl-job</artifactId>
-	<version>1.6.2-SNAPSHOT</version>
+	<version>1.6.2</version>
 	<packaging>pom</packaging>
 	<packaging>pom</packaging>
 
 
 	<name>xxl-job</name>
 	<name>xxl-job</name>

+ 2 - 2
xxl-job-admin/pom.xml

@@ -4,13 +4,13 @@
 	<parent>
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-job</artifactId>
 		<artifactId>xxl-job</artifactId>
-		<version>1.6.2-SNAPSHOT</version>
+		<version>1.6.2</version>
 	</parent>
 	</parent>
 	<artifactId>xxl-job-admin</artifactId>
 	<artifactId>xxl-job-admin</artifactId>
 	<packaging>war</packaging>
 	<packaging>war</packaging>
 
 
 	<properties>
 	<properties>
-		<xxl-job.version>1.6.2-SNAPSHOT</xxl-job.version>
+		<xxl-job.version>1.6.2</xxl-job.version>
 		<spring.version>3.2.17.RELEASE</spring.version>
 		<spring.version>3.2.17.RELEASE</spring.version>
 	</properties>
 	</properties>
 
 

+ 1 - 1
xxl-job-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-job</artifactId>
 		<artifactId>xxl-job</artifactId>
-		<version>1.6.2-SNAPSHOT</version>
+		<version>1.6.2</version>
 	</parent>
 	</parent>
 	<artifactId>xxl-job-core</artifactId>
 	<artifactId>xxl-job-core</artifactId>
 	<packaging>jar</packaging>
 	<packaging>jar</packaging>

+ 2 - 2
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java

@@ -102,7 +102,7 @@ public class JobThread extends Thread{
 						TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), executeResult));
 						TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), executeResult));
 					} else {
 					} else {
 						// is killed
 						// is killed
-						ReturnT stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [业务运行中,被强制终止]");
+						ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [业务运行中,被强制终止]");
 						TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
 						TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
 					}
 					}
 				}
 				}
@@ -116,7 +116,7 @@ public class JobThread extends Thread{
 			TriggerParam triggerParam = triggerQueue.poll();
 			TriggerParam triggerParam = triggerQueue.poll();
 			if (triggerParam!=null) {
 			if (triggerParam!=null) {
 				// is killed
 				// is killed
-				ReturnT stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [任务尚未执行,在调度队列中被终止]");
+				ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [任务尚未执行,在调度队列中被终止]");
 				TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
 				TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogAddress(), stopResult));
 			}
 			}
 		}
 		}

+ 2 - 2
xxl-job-executor-example/pom.xml

@@ -4,13 +4,13 @@
 	<parent>
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-job</artifactId>
 		<artifactId>xxl-job</artifactId>
-		<version>1.6.2-SNAPSHOT</version>
+		<version>1.6.2</version>
 	</parent>
 	</parent>
 	<artifactId>xxl-job-executor-example</artifactId>
 	<artifactId>xxl-job-executor-example</artifactId>
 	<packaging>war</packaging>
 	<packaging>war</packaging>
 
 
 	<properties>
 	<properties>
-		<xxl-job.version>1.6.2-SNAPSHOT</xxl-job.version>
+		<xxl-job.version>1.6.2</xxl-job.version>
 		<spring.version>3.2.17.RELEASE</spring.version>
 		<spring.version>3.2.17.RELEASE</spring.version>
 	</properties>
 	</properties>