|  | @@ -22,39 +22,30 @@
 | 
	
		
			
				|  |  |  		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 | 
	
		
			
				|  |  |  		<maven.compiler.source>1.7</maven.compiler.source>
 | 
	
		
			
				|  |  |  		<maven.compiler.target>1.7</maven.compiler.target>
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  		<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>-->
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -		<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-boot.version>1.5.17.RELEASE</spring-boot.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>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  		<spring.version>4.3.20.RELEASE</spring.version>
 | 
	
		
			
				|  |  | -		<jackson.version>2.9.7</jackson.version>
 | 
	
		
			
				|  |  |  		<slf4j-api.version>1.7.25</slf4j-api.version>
 | 
	
		
			
				|  |  |  		<freemarker.version>2.3.28</freemarker.version>
 | 
	
		
			
				|  |  |  		<junit.version>4.12</junit.version>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -		<jetty-server.version>9.2.26.v20180806</jetty-server.version>
 | 
	
		
			
				|  |  | -		<hessian.version>4.0.51</hessian.version>
 | 
	
		
			
				|  |  | -		<httpclient.version>4.5.6</httpclient.version>
 | 
	
		
			
				|  |  | -		
 | 
	
		
			
				|  |  |  		<commons-exec.version>1.3</commons-exec.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.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.15</groovy-all.version>
 | 
	
		
			
				|  |  | +		<groovy-all.version>2.5.3</groovy-all.version>
 | 
	
		
			
				|  |  |  		<quartz.version>2.3.0</quartz.version>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -		<spring-boot.version>1.5.17.RELEASE</spring-boot.version>
 | 
	
		
			
				|  |  | -		<mybatis-spring-boot-starter.version>1.3.2</mybatis-spring-boot-starter.version>
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +		<jackson.version>2.9.7</jackson.version>
 | 
	
		
			
				|  |  | +		<jetty-server.version>9.2.26.v20180806</jetty-server.version>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  	</properties>
 | 
	
		
			
				|  |  |  
 |