From 78e135200c34966af62ba6fd63ca7de3db959e41 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Mon, 24 Sep 2018 23:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BE=9D=E8=B5=96=E5=85=A8?=
 =?UTF-8?q?=E9=87=8F=E5=8D=87=E7=BA=A7=E8=87=B3=E8=BE=83=E6=96=B0=E7=A8=B3?=
 =?UTF-8?q?=E5=AE=9A=E7=89=88=E6=9C=AC=EF=BC=8C=E5=A6=82spring=E3=80=81Jac?=
 =?UTF-8?q?kson=E3=80=81groovy=E7=AD=89=E7=AD=89=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...30\346\226\271\346\226\207\346\241\243.md" |  1 +
 pom.xml                                       | 28 +++++-----
 xxl-job-admin/pom.xml                         |  5 +-
 .../com/xxl/job/admin/core/util/FtlUtil.java  |  5 +-
 xxl-job-core/pom.xml                          | 54 +++++++++----------
 5 files changed, 49 insertions(+), 44 deletions(-)

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 30e60723..d1fe5504 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 4a6c432e..a396e513 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,34 +17,34 @@
     </modules>
 
 	<properties>
-		<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
-		<jsp-api.version>2.2</jsp-api.version>
+		<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+		<javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
 
-		<spring.version>4.3.14.RELEASE</spring.version>
-		<jackson.version>2.9.4</jackson.version>
+		<spring.version>4.3.19.RELEASE</spring.version>
+		<jackson.version>2.9.6</jackson.version>
 		<aspectjweaver.version>1.8.13</aspectjweaver.version>
 		<slf4j-api.version>1.7.25</slf4j-api.version>
-		<freemarker.version>2.3.23</freemarker.version>
+		<freemarker.version>2.3.28</freemarker.version>
 		<junit.version>4.12</junit.version>
 
-		<jetty-server.version>9.2.24.v20180105</jetty-server.version>
+		<jetty-server.version>9.2.26.v20180806</jetty-server.version>
 		<hessian.version>4.0.51</hessian.version>
-		<httpclient.version>4.5.5</httpclient.version>
+		<httpclient.version>4.5.6</httpclient.version>
 		
 		<commons-exec.version>1.3</commons-exec.version>
-		<commons-collections4.version>4.1</commons-collections4.version>
-		<commons-lang3.version>3.7</commons-lang3.version>
+		<commons-collections4.version>4.2</commons-collections4.version>
+		<commons-lang3.version>3.8.1</commons-lang3.version>
 		<commons-email.version>1.5</commons-email.version>
 
 		<c3p0.version>0.9.5.2</c3p0.version>
-		<mysql-connector-java.version>5.1.45</mysql-connector-java.version>
-		<mybatis-spring.version>1.3.1</mybatis-spring.version>
-		<mybatis.version>3.4.5</mybatis.version>
+		<mysql-connector-java.version>5.1.47</mysql-connector-java.version>
+		<mybatis-spring.version>1.3.2</mybatis-spring.version>
+		<mybatis.version>3.4.6</mybatis.version>
 
-		<groovy-all.version>2.4.13</groovy-all.version>
+		<groovy-all.version>2.4.15</groovy-all.version>
 		<quartz.version>2.3.0</quartz.version>
 
-		<spring-boot.version>1.5.10.RELEASE</spring-boot.version>
+		<spring-boot.version>1.5.16.RELEASE</spring-boot.version>
 	</properties>
 
 	<build>
diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml
index 3e0f4c34..d2a8b04a 100644
--- a/xxl-job-admin/pom.xml
+++ b/xxl-job-admin/pom.xml
@@ -53,9 +53,10 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>${jsp-api.version}</version>
+			<artifactId>javax.servlet.jsp-api</artifactId>
+			<version>${javax.servlet.jsp-api.version}</version>
 		</dependency>
+
 		<!-- freemarker -->
 		<dependency>
 			<groupId>org.freemarker</groupId>
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 fe888a1c..d80e9518 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 20c32edc..c36640a7 100644
--- a/xxl-job-core/pom.xml
+++ b/xxl-job-core/pom.xml
@@ -15,15 +15,22 @@
 
 	<dependencies>
 		<!-- servlet -->
-		<dependency>
+		<!--<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<version>${javax.servlet-api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>
-			<artifactId>jsp-api</artifactId>
-			<version>${jsp-api.version}</version>
+			<artifactId>javax.servlet.jsp-api</artifactId>
+			<version>${javax.servlet.jsp-api.version}</version>
+		</dependency>-->
+
+		<!-- slf4j -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-api.version}</version>
 		</dependency>
 
 		<!-- jetty -->
@@ -33,11 +40,11 @@
 			<version>${jetty-server.version}</version>
 		</dependency>
 
-		<!-- slf4j -->
+		<!-- httpclient -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j-api.version}</version>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>${httpclient.version}</version>
 		</dependency>
 
 		<!-- hessian -->
@@ -47,39 +54,32 @@
 			<version>${hessian.version}</version>
 		</dependency>
 
-		<!-- jackson -->
+		<!-- groovy-all -->
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
+			<version>${groovy-all.version}</version>
 		</dependency>
 
-		<!-- httpclient -->
+		<!-- commons-exec -->
 		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>${httpclient.version}</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-exec</artifactId>
+			<version>${commons-exec.version}</version>
 		</dependency>
-		
+
 		<!-- spring-context -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
-		
-		<!-- groovy-all -->
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-all</artifactId>
-			<version>${groovy-all.version}</version>
-		</dependency>
 
-		<!-- commons-exec -->
+		<!-- jackson -->
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-exec</artifactId>
-			<version>${commons-exec.version}</version>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
 		</dependency>
 
 	</dependencies>
-- 
GitLab