Merge branch '1.4.x' into 1.5.x

pull/8866/merge
Stephane Nicoll 8 years ago
commit 2f4a1f9531

@ -43,9 +43,6 @@
</roles> </roles>
</developer> </developer>
</developers> </developers>
<prerequisites>
<maven>3.2.1</maven>
</prerequisites>
<properties> <properties>
<main.basedir>${basedir}</main.basedir> <main.basedir>${basedir}</main.basedir>
</properties> </properties>

@ -217,9 +217,6 @@
<maven-war-plugin.version>2.6</maven-war-plugin.version> <maven-war-plugin.version>2.6</maven-war-plugin.version>
<versions-maven-plugin.version>2.2</versions-maven-plugin.version> <versions-maven-plugin.version>2.2</versions-maven-plugin.version>
</properties> </properties>
<prerequisites>
<maven>3.2.1</maven>
</prerequisites>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- Spring Boot --> <!-- Spring Boot -->

Loading…
Cancel
Save