Merge branch '1.5.x'

12dda513 · Stephane Nicoll · b0ffe18e · 2f4a1f95 · 12dda513 · 12dda513
Commit 12dda513 authored May 03, 2017 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

pom.xml pom.xml +0 -3

pom.xml spring-boot-dependencies/pom.xml +0 -3

No files found.
--- 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
@@ -218,9 +218,6 @@
 		<maven-war-plugin.version>2.6</maven-war-plugin.version>
 		<versions-maven-plugin.version>2.3</versions-maven-plugin.version>
 	</properties>
-	<prerequisites>
-		<maven>3.2.1</maven>
-	</prerequisites>
 	<dependencyManagement>
 		<dependencies>
 			<!-- Spring Boot -->