瀏覽代碼

项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;

xuxueli 6 年之前
父節點
當前提交
78e135200c

+ 1 - 0
doc/XXL-JOB官方文档.md 查看文件

1293
 - 37、任务执行日志、调度日志字段类型调整,改为text类型并取消字数限制;
1293
 - 37、任务执行日志、调度日志字段类型调整,改为text类型并取消字数限制;
1294
 - 38、GLUE任务脚本字段类型调整,改为mediumtext类型,提高GLUE长度上限;
1294
 - 38、GLUE任务脚本字段类型调整,改为mediumtext类型,提高GLUE长度上限;
1295
 - 39、任务监控线程Log输出优化,运行中任务的监控Log改为debug级别,减少非核心日志量;
1295
 - 39、任务监控线程Log输出优化,运行中任务的监控Log改为debug级别,减少非核心日志量;
1296
+- 40、项目依赖全量升级至较新稳定版本,如spring、Jackson、groovy等等;
1296
 
1297
 
1297
 ### TODO LIST
1298
 ### TODO LIST
1298
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
1299
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;

+ 14 - 14
pom.xml 查看文件

17
     </modules>
17
     </modules>
18
 
18
 
19
 	<properties>
19
 	<properties>
20
-		<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
21
-		<jsp-api.version>2.2</jsp-api.version>
20
+		<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
21
+		<javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
22
 
22
 
23
-		<spring.version>4.3.14.RELEASE</spring.version>
24
-		<jackson.version>2.9.4</jackson.version>
23
+		<spring.version>4.3.19.RELEASE</spring.version>
24
+		<jackson.version>2.9.6</jackson.version>
25
 		<aspectjweaver.version>1.8.13</aspectjweaver.version>
25
 		<aspectjweaver.version>1.8.13</aspectjweaver.version>
26
 		<slf4j-api.version>1.7.25</slf4j-api.version>
26
 		<slf4j-api.version>1.7.25</slf4j-api.version>
27
-		<freemarker.version>2.3.23</freemarker.version>
27
+		<freemarker.version>2.3.28</freemarker.version>
28
 		<junit.version>4.12</junit.version>
28
 		<junit.version>4.12</junit.version>
29
 
29
 
30
-		<jetty-server.version>9.2.24.v20180105</jetty-server.version>
30
+		<jetty-server.version>9.2.26.v20180806</jetty-server.version>
31
 		<hessian.version>4.0.51</hessian.version>
31
 		<hessian.version>4.0.51</hessian.version>
32
-		<httpclient.version>4.5.5</httpclient.version>
32
+		<httpclient.version>4.5.6</httpclient.version>
33
 		
33
 		
34
 		<commons-exec.version>1.3</commons-exec.version>
34
 		<commons-exec.version>1.3</commons-exec.version>
35
-		<commons-collections4.version>4.1</commons-collections4.version>
36
-		<commons-lang3.version>3.7</commons-lang3.version>
35
+		<commons-collections4.version>4.2</commons-collections4.version>
36
+		<commons-lang3.version>3.8.1</commons-lang3.version>
37
 		<commons-email.version>1.5</commons-email.version>
37
 		<commons-email.version>1.5</commons-email.version>
38
 
38
 
39
 		<c3p0.version>0.9.5.2</c3p0.version>
39
 		<c3p0.version>0.9.5.2</c3p0.version>
40
-		<mysql-connector-java.version>5.1.45</mysql-connector-java.version>
41
-		<mybatis-spring.version>1.3.1</mybatis-spring.version>
42
-		<mybatis.version>3.4.5</mybatis.version>
40
+		<mysql-connector-java.version>5.1.47</mysql-connector-java.version>
41
+		<mybatis-spring.version>1.3.2</mybatis-spring.version>
42
+		<mybatis.version>3.4.6</mybatis.version>
43
 
43
 
44
-		<groovy-all.version>2.4.13</groovy-all.version>
44
+		<groovy-all.version>2.4.15</groovy-all.version>
45
 		<quartz.version>2.3.0</quartz.version>
45
 		<quartz.version>2.3.0</quartz.version>
46
 
46
 
47
-		<spring-boot.version>1.5.10.RELEASE</spring-boot.version>
47
+		<spring-boot.version>1.5.16.RELEASE</spring-boot.version>
48
 	</properties>
48
 	</properties>
49
 
49
 
50
 	<build>
50
 	<build>

+ 3 - 2
xxl-job-admin/pom.xml 查看文件

53
 		</dependency>
53
 		</dependency>
54
 		<dependency>
54
 		<dependency>
55
 			<groupId>javax.servlet.jsp</groupId>
55
 			<groupId>javax.servlet.jsp</groupId>
56
-			<artifactId>jsp-api</artifactId>
57
-			<version>${jsp-api.version}</version>
56
+			<artifactId>javax.servlet.jsp-api</artifactId>
57
+			<version>${javax.servlet.jsp-api.version}</version>
58
 		</dependency>
58
 		</dependency>
59
+
59
 		<!-- freemarker -->
60
 		<!-- freemarker -->
60
 		<dependency>
61
 		<dependency>
61
 			<groupId>org.freemarker</groupId>
62
 			<groupId>org.freemarker</groupId>

+ 4 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java 查看文件

1
 package com.xxl.job.admin.core.util;
1
 package com.xxl.job.admin.core.util;
2
 
2
 
3
 import freemarker.ext.beans.BeansWrapper;
3
 import freemarker.ext.beans.BeansWrapper;
4
+import freemarker.ext.beans.BeansWrapperBuilder;
5
+import freemarker.template.Configuration;
4
 import freemarker.template.TemplateHashModel;
6
 import freemarker.template.TemplateHashModel;
5
 
7
 
6
 /**
8
 /**
10
  */
12
  */
11
 public class FtlUtil {
13
 public class FtlUtil {
12
 
14
 
15
+    private static BeansWrapper wrapper = new BeansWrapperBuilder(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS).build();     //BeansWrapper.getDefaultInstance();
16
+
13
     public static TemplateHashModel generateStaticModel(String packageName) {
17
     public static TemplateHashModel generateStaticModel(String packageName) {
14
         try {
18
         try {
15
-            BeansWrapper wrapper = BeansWrapper.getDefaultInstance();
16
             TemplateHashModel staticModels = wrapper.getStaticModels();
19
             TemplateHashModel staticModels = wrapper.getStaticModels();
17
             TemplateHashModel fileStatics = (TemplateHashModel) staticModels.get(packageName);
20
             TemplateHashModel fileStatics = (TemplateHashModel) staticModels.get(packageName);
18
             return fileStatics;
21
             return fileStatics;

+ 27 - 27
xxl-job-core/pom.xml 查看文件

15
 
15
 
16
 	<dependencies>
16
 	<dependencies>
17
 		<!-- servlet -->
17
 		<!-- servlet -->
18
-		<dependency>
18
+		<!--<dependency>
19
 			<groupId>javax.servlet</groupId>
19
 			<groupId>javax.servlet</groupId>
20
 			<artifactId>javax.servlet-api</artifactId>
20
 			<artifactId>javax.servlet-api</artifactId>
21
 			<version>${javax.servlet-api.version}</version>
21
 			<version>${javax.servlet-api.version}</version>
22
 		</dependency>
22
 		</dependency>
23
 		<dependency>
23
 		<dependency>
24
 			<groupId>javax.servlet.jsp</groupId>
24
 			<groupId>javax.servlet.jsp</groupId>
25
-			<artifactId>jsp-api</artifactId>
26
-			<version>${jsp-api.version}</version>
25
+			<artifactId>javax.servlet.jsp-api</artifactId>
26
+			<version>${javax.servlet.jsp-api.version}</version>
27
+		</dependency>-->
28
+
29
+		<!-- slf4j -->
30
+		<dependency>
31
+			<groupId>org.slf4j</groupId>
32
+			<artifactId>slf4j-api</artifactId>
33
+			<version>${slf4j-api.version}</version>
27
 		</dependency>
34
 		</dependency>
28
 
35
 
29
 		<!-- jetty -->
36
 		<!-- jetty -->
33
 			<version>${jetty-server.version}</version>
40
 			<version>${jetty-server.version}</version>
34
 		</dependency>
41
 		</dependency>
35
 
42
 
36
-		<!-- slf4j -->
43
+		<!-- httpclient -->
37
 		<dependency>
44
 		<dependency>
38
-			<groupId>org.slf4j</groupId>
39
-			<artifactId>slf4j-api</artifactId>
40
-			<version>${slf4j-api.version}</version>
45
+			<groupId>org.apache.httpcomponents</groupId>
46
+			<artifactId>httpclient</artifactId>
47
+			<version>${httpclient.version}</version>
41
 		</dependency>
48
 		</dependency>
42
 
49
 
43
 		<!-- hessian -->
50
 		<!-- hessian -->
47
 			<version>${hessian.version}</version>
54
 			<version>${hessian.version}</version>
48
 		</dependency>
55
 		</dependency>
49
 
56
 
50
-		<!-- jackson -->
57
+		<!-- groovy-all -->
51
 		<dependency>
58
 		<dependency>
52
-			<groupId>com.fasterxml.jackson.core</groupId>
53
-			<artifactId>jackson-databind</artifactId>
54
-			<version>${jackson.version}</version>
59
+			<groupId>org.codehaus.groovy</groupId>
60
+			<artifactId>groovy-all</artifactId>
61
+			<version>${groovy-all.version}</version>
55
 		</dependency>
62
 		</dependency>
56
 
63
 
57
-		<!-- httpclient -->
64
+		<!-- commons-exec -->
58
 		<dependency>
65
 		<dependency>
59
-			<groupId>org.apache.httpcomponents</groupId>
60
-			<artifactId>httpclient</artifactId>
61
-			<version>${httpclient.version}</version>
66
+			<groupId>org.apache.commons</groupId>
67
+			<artifactId>commons-exec</artifactId>
68
+			<version>${commons-exec.version}</version>
62
 		</dependency>
69
 		</dependency>
63
-		
70
+
64
 		<!-- spring-context -->
71
 		<!-- spring-context -->
65
 		<dependency>
72
 		<dependency>
66
 			<groupId>org.springframework</groupId>
73
 			<groupId>org.springframework</groupId>
67
 			<artifactId>spring-context</artifactId>
74
 			<artifactId>spring-context</artifactId>
68
 			<version>${spring.version}</version>
75
 			<version>${spring.version}</version>
69
 		</dependency>
76
 		</dependency>
70
-		
71
-		<!-- groovy-all -->
72
-		<dependency>
73
-			<groupId>org.codehaus.groovy</groupId>
74
-			<artifactId>groovy-all</artifactId>
75
-			<version>${groovy-all.version}</version>
76
-		</dependency>
77
 
77
 
78
-		<!-- commons-exec -->
78
+		<!-- jackson -->
79
 		<dependency>
79
 		<dependency>
80
-			<groupId>org.apache.commons</groupId>
81
-			<artifactId>commons-exec</artifactId>
82
-			<version>${commons-exec.version}</version>
80
+			<groupId>com.fasterxml.jackson.core</groupId>
81
+			<artifactId>jackson-databind</artifactId>
82
+			<version>${jackson.version}</version>
83
 		</dependency>
83
 		</dependency>
84
 
84
 
85
 	</dependencies>
85
 	</dependencies>