Merge branch '1.2.x'

spring-boot-actuator-docs/pom.xml

@@ -174,13 +174,13 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-        		<configuration>
+				<configuration>
 					<includes>
 						<include>**/*.html</include>
 						<include>**/*.png</include>
 					</includes>
 				</configuration>
-      		</plugin>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>

spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml

@@ -35,7 +35,7 @@
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-validation</artifactId>
-		        </exclusion>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml

@@ -34,7 +34,7 @@
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-validation</artifactId>
-		        </exclusion>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

spring-boot-parent/pom.xml

@@ -415,27 +415,27 @@
 										<ignore />
 									</action>
 								</pluginExecution>
-              					<pluginExecution>
-                					<pluginExecutionFilter>
-                  						<groupId>
-                  							org.apache.maven.plugins
-                  						</groupId>
-                  						<artifactId>
-                  							maven-invoker-plugin
-                  						</artifactId>
-                  						<versionRange>
-                  							[1.0.0,)
-                  						</versionRange>
-                  						<goals>
-                    						<goal>
-                    							install
-                    						</goal>
-                  						</goals>
-                					</pluginExecutionFilter>
-                					<action>
-                  						<ignore />
-                					</action>
-              					</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-invoker-plugin
+										</artifactId>
+										<versionRange>
+											[1.0.0,)
+										</versionRange>
+										<goals>
+											<goal>
+												install
+											</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
 							</pluginExecutions>
 						</lifecycleMappingMetadata>
 					</configuration>

spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml

@@ -33,10 +33,10 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-		    <groupId>org.cassandraunit</groupId>
-		    <artifactId>cassandra-unit-spring</artifactId>
-		    <version>2.1.9.2</version>
-		    <scope>test</scope>
+			<groupId>org.cassandraunit</groupId>
+			<artifactId>cassandra-unit-spring</artifactId>
+			<version>2.1.9.2</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<build>

spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml

@@ -6,9 +6,9 @@
 	<artifactId>executable-war</artifactId>
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<packaging>war</packaging>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 	<build>
 		<plugins>
 			<plugin>