|
@@ -22,39 +22,30 @@
|
22
|
22
|
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
23
|
23
|
<maven.compiler.source>1.7</maven.compiler.source>
|
24
|
24
|
<maven.compiler.target>1.7</maven.compiler.target>
|
25
|
|
-
|
26
|
25
|
<maven.test.skip>true</maven.test.skip>
|
27
|
26
|
|
|
27
|
+ <!--<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
|
|
28
|
+ <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>-->
|
28
|
29
|
|
29
|
|
- <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
|
30
|
|
- <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
|
|
30
|
+ <spring-boot.version>1.5.17.RELEASE</spring-boot.version>
|
|
31
|
+ <mybatis-spring-boot-starter.version>1.3.2</mybatis-spring-boot-starter.version>
|
|
32
|
+ <mysql-connector-java.version>5.1.47</mysql-connector-java.version>
|
31
|
33
|
|
32
|
34
|
<spring.version>4.3.20.RELEASE</spring.version>
|
33
|
|
- <jackson.version>2.9.7</jackson.version>
|
34
|
35
|
<slf4j-api.version>1.7.25</slf4j-api.version>
|
35
|
36
|
<freemarker.version>2.3.28</freemarker.version>
|
36
|
37
|
<junit.version>4.12</junit.version>
|
37
|
38
|
|
38
|
|
- <jetty-server.version>9.2.26.v20180806</jetty-server.version>
|
39
|
|
- <hessian.version>4.0.51</hessian.version>
|
40
|
|
- <httpclient.version>4.5.6</httpclient.version>
|
41
|
|
-
|
42
|
39
|
<commons-exec.version>1.3</commons-exec.version>
|
43
|
40
|
<commons-collections4.version>4.2</commons-collections4.version>
|
44
|
41
|
<commons-lang3.version>3.8.1</commons-lang3.version>
|
45
|
42
|
<commons-email.version>1.5</commons-email.version>
|
46
|
43
|
|
47
|
|
- <c3p0.version>0.9.5.2</c3p0.version>
|
48
|
|
- <mysql-connector-java.version>5.1.47</mysql-connector-java.version>
|
49
|
|
- <mybatis-spring.version>1.3.2</mybatis-spring.version>
|
50
|
|
- <mybatis.version>3.4.6</mybatis.version>
|
51
|
|
-
|
52
|
|
- <groovy-all.version>2.4.15</groovy-all.version>
|
|
44
|
+ <groovy-all.version>2.5.3</groovy-all.version>
|
53
|
45
|
<quartz.version>2.3.0</quartz.version>
|
54
|
46
|
|
55
|
|
- <spring-boot.version>1.5.17.RELEASE</spring-boot.version>
|
56
|
|
- <mybatis-spring-boot-starter.version>1.3.2</mybatis-spring-boot-starter.version>
|
57
|
|
-
|
|
47
|
+ <jackson.version>2.9.7</jackson.version>
|
|
48
|
+ <jetty-server.version>9.2.26.v20180806</jetty-server.version>
|
58
|
49
|
|
59
|
50
|
</properties>
|
60
|
51
|
|