From a5938fb23e151253445744788382529e05724905 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Sun, 13 Nov 2016 16:59:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC1?= =?UTF-8?q?.5.1-SNAPSHOT=E7=89=88=E6=9C=AC=EF=BC=9B=202=E3=80=81=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8CPOM=E6=B8=85=E7=90=86?= =?UTF-8?q?=EF=BC=9B=203=E3=80=81Spring=E5=8D=87=E7=BA=A7=E8=87=B33.2.17.R?= =?UTF-8?q?ELEASE=E7=89=88=E6=9C=AC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++++-- pom.xml | 2 +- xxl-job-admin/pom.xml | 9 ++++----- .../xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java | 4 ++-- xxl-job-core/pom.xml | 7 ++----- .../src/main/java/com/xxl/job/core/util/DBUtil.java | 2 +- xxl-job-executor-example/pom.xml | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 80523030..65dd50d3 100644 --- a/README.md +++ b/README.md @@ -685,9 +685,13 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 7、表结构调整,底层重构优化; - 8、"调度中心"自动注册和发现,failover: 调度中心周期性自动注册, 任务回调时可以感知在线的所有调度中心地址, 通过failover的方式进行任务回调,避免回调单点风险。 +#### 6.10 版本 V1.5.1 特性 +- 1、代码优化,POM清理; +- 2、Spring升级至3.2.17.RELEASE版本; +- 3、Jetty升级新版本; +- 4、集群执行器选择规则自定义:单点=选择第一个,随机=随机选择一个; + #### 规划中 -- 1、集群执行器选择规则自定义:选择第一个,或者随机等; -- 2、升级jetty,spring等版本; - 3、任务执行规则自定义:假如前一个任务正在执行,后续调度执行规则支持自定义; 串行(默认,当前逻辑):后续调度入调度队列; 并行:后续调度并行执行; diff --git a/pom.xml b/pom.xml index 1bf98176..4ad21e5b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.xuxueli xxl-job - 1.5.0 + 1.5.1-SNAPSHOT pom xxl-job diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml index d51e43bc..e5c77363 100644 --- a/xxl-job-admin/pom.xml +++ b/xxl-job-admin/pom.xml @@ -4,14 +4,14 @@ com.xuxueli xxl-job - 1.5.0 + 1.5.1-SNAPSHOT xxl-job-admin war - 1.5.0 - 3.2.14.RELEASE + 1.5.1-SNAPSHOT + 3.2.17.RELEASE @@ -82,13 +82,12 @@ javax.servlet servlet-api 2.5 - provided + javax.servlet.jsp jsp-api 2.1 - provided diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java index 60efa4d5..dd53fa2b 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java @@ -31,7 +31,7 @@ public class XxlJobRegistryDaoImpl implements IXxlJobRegistryDao { @Override public int registryUpdate(String registryGroup, String registryKey, String registryValue) { - Map params = new HashMap(); + Map params = new HashMap(); params.put("registryGroup", registryGroup); params.put("registryKey", registryKey); params.put("registryValue", registryValue); @@ -41,7 +41,7 @@ public class XxlJobRegistryDaoImpl implements IXxlJobRegistryDao { @Override public int registrySave(String registryGroup, String registryKey, String registryValue) { - Map params = new HashMap(); + Map params = new HashMap(); params.put("registryGroup", registryGroup); params.put("registryKey", registryKey); params.put("registryValue", registryValue); diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml index fff89cab..151684c9 100644 --- a/xxl-job-core/pom.xml +++ b/xxl-job-core/pom.xml @@ -4,13 +4,13 @@ com.xuxueli xxl-job - 1.5.0 + 1.5.1-SNAPSHOT xxl-job-core jar - 3.2.14.RELEASE + 3.2.17.RELEASE @@ -19,13 +19,11 @@ javax.servlet servlet-api 2.5 - provided javax.servlet.jsp jsp-api 2.1 - provided @@ -61,7 +59,6 @@ org.springframework spring-context ${spring.version} - compile diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/DBUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/DBUtil.java index da522b8c..3ac3c7d6 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/util/DBUtil.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/DBUtil.java @@ -78,7 +78,7 @@ public class DBUtil { private static List> resultSetToList(ResultSet resultSet) throws SQLException { if (resultSet == null) { - return Collections.EMPTY_LIST; + return new ArrayList>(); } ResultSetMetaData resultSetMetaData = resultSet.getMetaData(); // 得到结果集(rs)的结构信息,比如字段数、字段名等 diff --git a/xxl-job-executor-example/pom.xml b/xxl-job-executor-example/pom.xml index 964b444b..3e401bf6 100644 --- a/xxl-job-executor-example/pom.xml +++ b/xxl-job-executor-example/pom.xml @@ -4,14 +4,14 @@ com.xuxueli xxl-job - 1.5.0 + 1.5.1-SNAPSHOT xxl-job-executor-example war - 1.5.0 - 3.2.14.RELEASE + 1.5.1-SNAPSHOT + 3.2.17.RELEASE