Skip to content

S
spring-boot
Commit 2f4a1f95 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.4.x' into 1.5.x

parents ea33cc2f 93bd1108
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
pom.xml
View file @ 2f4a1f95
...@@ -43,9 +43,6 @@ ...@@ -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>
......
spring-boot-dependencies/pom.xml
View file @ 2f4a1f95
...@@ -217,9 +217,6 @@ ...@@ -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 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment