Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-05-03 13:22:13 +02:00
commit 12dda513f9
2 changed files with 0 additions and 6 deletions

View File

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

View File

@ -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 -->