diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
index 30e6072373d2f4b18d6d5defebcfe9ad396cda58..d1fe55046fb229fa031b43e4e2fb70ebc3a8ced9 100644
--- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
+++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md"
@@ -1293,6 +1293,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
- 37、任务执行日志、调度日志字段类型调整,改为text类型并取消字数限制;
- 38、GLUE任务脚本字段类型调整,改为mediumtext类型,提高GLUE长度上限;
- 39、任务监控线程Log输出优化,运行中任务的监控Log改为debug级别,减少非核心日志量;
+- 40、项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;
### TODO LIST
- 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
diff --git a/pom.xml b/pom.xml
index 4a6c432e6a76fef063e86c0f58cd65a5f4c6f709..a396e5130812f742bd693a1cb74fc5875260a73f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,34 +17,34 @@
- 3.0.1
- 2.2
+ 3.1.0
+ 2.3.3
- 4.3.14.RELEASE
- 2.9.4
+ 4.3.19.RELEASE
+ 2.9.6
1.8.13
1.7.25
- 2.3.23
+ 2.3.28
4.12
- 9.2.24.v20180105
+ 9.2.26.v20180806
4.0.51
- 4.5.5
+ 4.5.6
1.3
- 4.1
- 3.7
+ 4.2
+ 3.8.1
1.5
0.9.5.2
- 5.1.45
- 1.3.1
- 3.4.5
+ 5.1.47
+ 1.3.2
+ 3.4.6
- 2.4.13
+ 2.4.15
2.3.0
- 1.5.10.RELEASE
+ 1.5.16.RELEASE
diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml
index 3e0f4c34bd4fc248692d4d4ea1d0bc79142e4cb4..d2a8b04a2f5a0159dfa6522176b1242c2c4c3873 100644
--- a/xxl-job-admin/pom.xml
+++ b/xxl-job-admin/pom.xml
@@ -53,9 +53,10 @@
javax.servlet.jsp
- jsp-api
- ${jsp-api.version}
+ javax.servlet.jsp-api
+ ${javax.servlet.jsp-api.version}
+
org.freemarker
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java
index fe888a1c70e2f8a3dd0b98ac58539baf71b7c980..d80e95186d444046251c925ddbce13c1fa0b0fb7 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java
@@ -1,6 +1,8 @@
package com.xxl.job.admin.core.util;
import freemarker.ext.beans.BeansWrapper;
+import freemarker.ext.beans.BeansWrapperBuilder;
+import freemarker.template.Configuration;
import freemarker.template.TemplateHashModel;
/**
@@ -10,9 +12,10 @@ import freemarker.template.TemplateHashModel;
*/
public class FtlUtil {
+ private static BeansWrapper wrapper = new BeansWrapperBuilder(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS).build(); //BeansWrapper.getDefaultInstance();
+
public static TemplateHashModel generateStaticModel(String packageName) {
try {
- BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
TemplateHashModel staticModels = wrapper.getStaticModels();
TemplateHashModel fileStatics = (TemplateHashModel) staticModels.get(packageName);
return fileStatics;
diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml
index 20c32edcad3e833a2338bd9f6738adfeb2ff617f..c36640a7fb104f0bc5d0072b852c89c07e092eef 100644
--- a/xxl-job-core/pom.xml
+++ b/xxl-job-core/pom.xml
@@ -15,15 +15,22 @@
-
+
+
+
+
+ org.slf4j
+ slf4j-api
+ ${slf4j-api.version}
@@ -33,11 +40,11 @@
${jetty-server.version}
-
+
- org.slf4j
- slf4j-api
- ${slf4j-api.version}
+ org.apache.httpcomponents
+ httpclient
+ ${httpclient.version}
@@ -47,39 +54,32 @@
${hessian.version}
-
+
- com.fasterxml.jackson.core
- jackson-databind
- ${jackson.version}
+ org.codehaus.groovy
+ groovy-all
+ ${groovy-all.version}
-
+
- org.apache.httpcomponents
- httpclient
- ${httpclient.version}
+ org.apache.commons
+ commons-exec
+ ${commons-exec.version}
-
+
org.springframework
spring-context
${spring.version}
-
-
-
- org.codehaus.groovy
- groovy-all
- ${groovy-all.version}
-
-
+
- org.apache.commons
- commons-exec
- ${commons-exec.version}
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson.version}