Merge branch '1.4.x' into 1.5.x
This commit is contained in:
		
						commit
						2f4a1f9531
					
				
							
								
								
									
										3
									
								
								pom.xml
								
								
								
								
							
							
						
						
									
										3
									
								
								pom.xml
								
								
								
								
							| 
						 | 
				
			
			@ -43,9 +43,6 @@
 | 
			
		|||
			</roles>
 | 
			
		||||
		</developer>
 | 
			
		||||
	</developers>
 | 
			
		||||
	<prerequisites>
 | 
			
		||||
		<maven>3.2.1</maven>
 | 
			
		||||
	</prerequisites>
 | 
			
		||||
	<properties>
 | 
			
		||||
		<main.basedir>${basedir}</main.basedir>
 | 
			
		||||
	</properties>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -217,9 +217,6 @@
 | 
			
		|||
		<maven-war-plugin.version>2.6</maven-war-plugin.version>
 | 
			
		||||
		<versions-maven-plugin.version>2.2</versions-maven-plugin.version>
 | 
			
		||||
	</properties>
 | 
			
		||||
	<prerequisites>
 | 
			
		||||
		<maven>3.2.1</maven>
 | 
			
		||||
	</prerequisites>
 | 
			
		||||
	<dependencyManagement>
 | 
			
		||||
		<dependencies>
 | 
			
		||||
			<!-- Spring Boot -->
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue