Merge branch '1.5.x'

Author: wilkinsona

spring-boot-project/spring-boot-parent/pom.xml

@@ -100,7 +100,7 @@
 			<dependency>
 				<groupId>io.spring.gradle</groupId>
 				<artifactId>dependency-management-plugin</artifactId>
-				<version>1.0.4.RELEASE</version>
+				<version>1.0.5.RELEASE</version>
 			</dependency>
 			<dependency>
 				<groupId>jline</groupId>