Merge branch '1.4.x' into 1.5.x

2016-10-05 14:58:42 +01:00
parent cf28663cd7 ad3e5c04bb
commit fe10ea73b0
35 changed files with 162 additions and 33 deletions
--- a/spring-boot-samples/spring-boot-sample-web-static/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-web-static/build.gradle
@@ -19,7 +19,7 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'eclipse-wtp'
 apply plugin: 'idea'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'war'

 war {