| 
															
																@@ -24,15 +24,13 @@ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<maven.compiler.target>1.7</maven.compiler.target>
 
															 | 
															
															 | 
															
																 		<maven.compiler.target>1.7</maven.compiler.target>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<maven.test.skip>true</maven.test.skip>
 
															 | 
															
															 | 
															
																 		<maven.test.skip>true</maven.test.skip>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-		<!--<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-		<javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>-->
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<xxl-rpc.version>1.2.1</xxl-rpc.version>
 
															 | 
															
															 | 
															
																 		<xxl-rpc.version>1.2.1</xxl-rpc.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-		<spring-boot.version>1.5.17.RELEASE</spring-boot.version>
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+		<spring-boot.version>1.5.18.RELEASE</spring-boot.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<mybatis-spring-boot-starter.version>1.3.2</mybatis-spring-boot-starter.version>
 
															 | 
															
															 | 
															
																 		<mybatis-spring-boot-starter.version>1.3.2</mybatis-spring-boot-starter.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<mysql-connector-java.version>5.1.47</mysql-connector-java.version>
 
															 | 
															
															 | 
															
																 		<mysql-connector-java.version>5.1.47</mysql-connector-java.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-		<spring.version>4.3.20.RELEASE</spring.version>
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+		<spring.version>4.3.21.RELEASE</spring.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<slf4j-api.version>1.7.25</slf4j-api.version>
 
															 | 
															
															 | 
															
																 		<slf4j-api.version>1.7.25</slf4j-api.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<freemarker.version>2.3.28</freemarker.version>
 
															 | 
															
															 | 
															
																 		<freemarker.version>2.3.28</freemarker.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<junit.version>4.12</junit.version>
 
															 | 
															
															 | 
															
																 		<junit.version>4.12</junit.version>
 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@@ -41,10 +39,10 @@ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<commons-collections4.version>4.2</commons-collections4.version>
 
															 | 
															
															 | 
															
																 		<commons-collections4.version>4.2</commons-collections4.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<commons-lang3.version>3.8.1</commons-lang3.version>
 
															 | 
															
															 | 
															
																 		<commons-lang3.version>3.8.1</commons-lang3.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-		<groovy-all.version>2.5.3</groovy-all.version>
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+		<groovy.version>2.5.5</groovy.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<quartz.version>2.3.0</quartz.version>
 
															 | 
															
															 | 
															
																 		<quartz.version>2.3.0</quartz.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-		<jackson.version>2.9.7</jackson.version>
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+		<jackson.version>2.9.8</jackson.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 		<jetty-server.version>9.2.26.v20180806</jetty-server.version>
 
															 | 
															
															 | 
															
																 		<jetty-server.version>9.2.26.v20180806</jetty-server.version>
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 	</properties>
 
															 | 
															
															 | 
															
																 	</properties>
 
															 |