root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2017-05-03 13:21:59 +02:00
parent ea33cc2f7d 93bd1108bf
commit 2f4a1f9531
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

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

3
spring-boot-dependencies/pom.xml
View File

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