Merge branch '1.5.x' into 2.0.x

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

@@ -26,7 +26,7 @@
 		<aether.version>1.0.2.v20150114</aether.version>
 		<maven.version>3.1.1</maven.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
-		<spring-javaformat.version>0.0.1</spring-javaformat.version>
+		<spring-javaformat.version>0.0.2</spring-javaformat.version>
 	</properties>
 	<scm>
 		<url>http://github.com/spring-projects/spring-boot</url>
@@ -578,11 +578,6 @@
 				<groupId>io.spring.javaformat</groupId>
 				<artifactId>spring-javaformat-maven-plugin</artifactId>
 				<version>${spring-javaformat.version}</version>
-				<configuration>
-					<excludes>
-						<exclude>**/HelpMojo.java</exclude>
-					</excludes>
-				</configuration>
 				<executions>
 					<execution>
 						<phase>validate</phase>

spring-boot-samples/pom.xml

@@ -15,7 +15,7 @@
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 		<java.version>1.8</java.version>
-		<spring-javaformat.version>0.0.1</spring-javaformat.version>
+		<spring-javaformat.version>0.0.2</spring-javaformat.version>
 	</properties>
 	<modules>
 		<module>spring-boot-sample-ant</module>

spring-boot-samples/spring-boot-sample-ant/pom.xml

@@ -1,5 +1,6 @@
 <?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"
+<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">
 	<!-- This POM is just to trigger the Ant/Ivy sample from Maven and to test -->
 	<modelVersion>4.0.0</modelVersion>
@@ -103,4 +104,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>