Merge branch '1.5.x'

spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml

@@ -1,11 +1,12 @@
-	<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<!-- Your own application should inherit from spring-boot-starter-parent -->
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-samples</artifactId>
-		<version>1.4.2.BUILD-SNAPSHOT</version>
+		<version>1.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot-sample-test-nomockito</artifactId>
 	<name>Spring Boot Test Sample No Mockito</name>