Merge branch '1.4.x' into 1.5.x

8 years ago · 2f4a1f9531
parent ea33cc2f7d 93bd1108bf
commit 2f4a1f9531
2 changed files with 0 additions and 6 deletions
--- a/pom.xml
+++ b/pom.xml
@ -43,9 +43,6 @@
 			</roles>
 		</developer>
 	</developers>
-	<prerequisites>
-		<maven>3.2.1</maven>
-	</prerequisites>
 	<properties>
 		<main.basedir>${basedir}</main.basedir>
 	</properties>
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@ -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 -->