diff --git a/pom.xml b/pom.xml
index 82098b660cf..b613194cda7 100644
--- a/pom.xml
+++ b/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 	<groupId>org.springframework.bootstrap</groupId>
 	<artifactId>spring-bootstrap-parent</artifactId>
@@ -11,10 +12,10 @@
 	<modules>
 		<module>spring-bootstrap</module>
 		<module>spring-bootstrap-actuator</module>
-		<module>spring-bootstrap-starters</module>
+		<module>spring-bootstrap-cli</module>
 		<module>spring-bootstrap-launcher</module>
 		<module>spring-bootstrap-samples</module>
-		<module>spring-bootstrap-cli</module>
+		<module>spring-bootstrap-starters</module>
 	</modules>
 	<properties>
 		<java.version>1.6</java.version>
@@ -24,16 +25,16 @@
 		<spring.security.javaconfig.version>1.0.0.CI-SNAPSHOT</spring.security.javaconfig.version>
 		<spring.integration.version>2.2.3.RELEASE</spring.integration.version>
 		<spring.batch.version>2.2.0.RELEASE</spring.batch.version>
-        <tomcat.version>7.0.39</tomcat.version>
-        <jetty.version>8.1.9.v20130131</jetty.version>
-        <aspectj.version>1.7.2</aspectj.version>
+		<tomcat.version>7.0.39</tomcat.version>
+		<jetty.version>8.1.9.v20130131</jetty.version>
+		<aspectj.version>1.7.2</aspectj.version>
 	</properties>
 
 	<scm>
 		<url>http://github.com/SpringSource/spring-bootstrap</url>
 		<connection>scm:git:git://github.com/SpringSource/spring-bootstrap.git</connection>
 		<developerConnection>scm:git:ssh://git@github.com/SpringSource/spring-bootstrap.git</developerConnection>
-    </scm>
+	</scm>
 
 	<developers>
 		<developer>
@@ -69,7 +70,7 @@
 		</snapshotRepository>
 	</distributionManagement>
 
-    <profiles>
+	<profiles>
 		<profile>
 			<id>staging</id>
 			<distributionManagement>
@@ -90,68 +91,70 @@
 		<profile>
 			<id>milestone</id>
 			<distributionManagement>
-			  <repository>
-				<id>spring-repo-milestone</id>
-				<name>Spring Milestone Repository</name>
-				<url>https://repo.springsource.org/libs-milestone-local</url>
-			  </repository>
+				<repository>
+					<id>spring-repo-milestone</id>
+					<name>Spring Milestone Repository</name>
+					<url>https://repo.springsource.org/libs-milestone-local</url>
+				</repository>
 			</distributionManagement>
 		</profile>
 		<profile>
 			<id>central</id>
 			<distributionManagement>
-			  <snapshotRepository>
-				<id>sonatype-nexus-snapshots</id>
-				<name>Sonatype Nexus Snapshots</name>
-				<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-			  </snapshotRepository>
-			  <repository>
-				<id>sonatype-nexus-staging</id>
-				<name>Nexus Release Repository</name>
-				<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-			  </repository>
+				<snapshotRepository>
+					<id>sonatype-nexus-snapshots</id>
+					<name>Sonatype Nexus Snapshots</name>
+					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+				</snapshotRepository>
+				<repository>
+					<id>sonatype-nexus-staging</id>
+					<name>Nexus Release Repository</name>
+					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+				</repository>
 			</distributionManagement>
 			<build>
-			  <plugins>
-				<plugin>
-				  <groupId>org.apache.maven.plugins</groupId>
-				  <artifactId>maven-gpg-plugin</artifactId>
-				  <executions>
-					<execution>
-					  <id>sign-artifacts</id>
-					  <phase>verify</phase>
-					  <goals>
-						<goal>sign</goal>
-					  </goals>
-					</execution>
-				  </executions>
-				</plugin>
-			  </plugins>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
 			</build>
 		</profile>
-      <profile>
-        <id>bootstrap</id>
-        <!-- deactivate when released -->
-        <activation><activeByDefault>true</activeByDefault></activation>
-        <repositories>
-          <repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>http://maven.springframework.org/snapshot</url>
-			<snapshots>
-              <enabled>true</enabled>
-			</snapshots>
-          </repository>
-          <repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>http://maven.springframework.org/milestone</url>
-			<snapshots>
-              <enabled>false</enabled>
-			</snapshots>
-          </repository>
-        </repositories>
-      </profile>
+		<profile>
+			<id>bootstrap</id>
+			<!-- deactivate when released -->
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>http://maven.springframework.org/snapshot</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>http://maven.springframework.org/milestone</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+		</profile>
 	</profiles>
 	<build>
 		<pluginManagement>
@@ -264,9 +267,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<!-- is using JDK 8
-					<additionalparam>-Xdoclint:none -quiet</additionalparam>
-					 -->
+					<!-- is using JDK 8 <additionalparam>-Xdoclint:none -quiet</additionalparam> -->
 				</configuration>
 			</plugin>
 			<plugin>
@@ -292,9 +293,9 @@
 						<exclude>**/Abstract*.java</exclude>
 					</excludes>
 					<junitArtifactName>junit:junit</junitArtifactName>
-                    <systemPropertyVariables>
-                      <java.security.egd>file:/dev/./urandom</java.security.egd>
-                    </systemPropertyVariables>
+					<systemPropertyVariables>
+						<java.security.egd>file:/dev/./urandom</java.security.egd>
+					</systemPropertyVariables>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -307,65 +308,10 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>commons-httpclient</groupId>
-				<artifactId>commons-httpclient</artifactId>
-				<version>3.1</version>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-classic</artifactId>
+				<version>1.0.7</version>
 			</dependency>
-			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>javax.servlet-api</artifactId>
-				<version>3.0.1</version>
-			</dependency>
-            <dependency>
-              <groupId>javax.servlet</groupId>
-              <artifactId>jstl</artifactId>
-              <version>1.2</version>
-            </dependency>
-			<dependency>
-              <groupId>org.hibernate.javax.persistence</groupId>
-              <artifactId>hibernate-jpa-2.0-api</artifactId>
-              <version>1.0.1.Final</version>
-			</dependency>
-            <dependency>
-              <groupId>org.hibernate</groupId>
-              <artifactId>hibernate-validator</artifactId>
-              <version>4.3.1.Final</version>
-            </dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.11</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>jcl-over-slf4j</artifactId>
-				<version>1.7.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>1.7.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.7.2</version>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-jdk14</artifactId>
-				<version>1.7.2</version>
-			</dependency>
-            <dependency>
-              <groupId>log4j</groupId>
-              <artifactId>log4j</artifactId>
-              <version>1.2.17</version>
-            </dependency>
-            <dependency>
-              <groupId>ch.qos.logback</groupId>
-              <artifactId>logback-classic</artifactId>
-              <version>1.0.7</version>
-            </dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-databind</artifactId>
@@ -381,6 +327,51 @@
 				<artifactId>jackson-datatype-joda</artifactId>
 				<version>2.2.0</version>
 			</dependency>
+			<dependency>
+				<groupId>commons-dbcp</groupId>
+				<artifactId>commons-dbcp</artifactId>
+				<version>1.4</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-httpclient</groupId>
+				<artifactId>commons-httpclient</artifactId>
+				<version>3.1</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>javax.servlet-api</artifactId>
+				<version>3.0.1</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>jstl</artifactId>
+				<version>1.2</version>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.11</version>
+			</dependency>
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+				<version>1.2.17</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sf.jopt-simple</groupId>
+				<artifactId>jopt-simple</artifactId>
+				<version>4.4</version>
+			</dependency>
+			<dependency>
+				<groupId>nz.net.ultraq.web.thymeleaf</groupId>
+				<artifactId>thymeleaf-layout-dialect</artifactId>
+				<version>1.0.6</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ivy</groupId>
+				<artifactId>ivy</artifactId>
+				<version>2.3.0</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.tomcat.embed</groupId>
 				<artifactId>tomcat-embed-core</artifactId>
@@ -396,16 +387,21 @@
 				<artifactId>tomcat-embed-jasper</artifactId>
 				<version>${tomcat.version}</version>
 			</dependency>
-            <dependency>
-              <groupId>org.apache.tomcat</groupId>
-              <artifactId>tomcat-jdbc</artifactId>
-              <version>${tomcat.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>commons-dbcp</groupId>
-              <artifactId>commons-dbcp</artifactId>
-              <version>1.4</version>
-            </dependency>
+			<dependency>
+				<groupId>org.apache.tomcat</groupId>
+				<artifactId>tomcat-jdbc</artifactId>
+				<version>${tomcat.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>aspectjrt</artifactId>
+				<version>${aspectj.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>aspectjweaver</artifactId>
+				<version>${aspectj.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.codehaus.groovy</groupId>
 				<artifactId>groovy</artifactId>
@@ -432,16 +428,21 @@
 				<artifactId>jetty-util</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
-            <dependency>
-              <groupId>org.eclipse.jetty</groupId>
-              <artifactId>jetty-jsp</artifactId>
-              <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.eclipse.jetty</groupId>
-              <artifactId>jetty-annotations</artifactId>
-              <version>${jetty.version}</version>
-            </dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-jsp</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-annotations</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.h2database</groupId>
+				<artifactId>h2</artifactId>
+				<version>1.3.171</version>
+			</dependency>
 			<dependency>
 				<groupId>org.hamcrest</groupId>
 				<artifactId>hamcrest-library</artifactId>
@@ -452,21 +453,46 @@
 				<artifactId>hibernate-entitymanager</artifactId>
 				<version>4.2.1.Final</version>
 			</dependency>
+			<dependency>
+				<groupId>org.hibernate.javax.persistence</groupId>
+				<artifactId>hibernate-jpa-2.0-api</artifactId>
+				<version>1.0.1.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>org.hibernate</groupId>
+				<artifactId>hibernate-validator</artifactId>
+				<version>4.3.1.Final</version>
+			</dependency>
 			<dependency>
 				<groupId>org.hsqldb</groupId>
 				<artifactId>hsqldb</artifactId>
 				<version>2.2.9</version>
 			</dependency>
-			<dependency>
-				<groupId>com.h2database</groupId>
-				<artifactId>h2</artifactId>
-				<version>1.3.171</version>
-			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
 				<version>1.9.5</version>
 			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>jcl-over-slf4j</artifactId>
+				<version>1.7.2</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>1.7.2</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-log4j12</artifactId>
+				<version>1.7.2</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-jdk14</artifactId>
+				<version>1.7.2</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.security</groupId>
 				<artifactId>spring-security-javaconfig</artifactId>
@@ -501,12 +527,12 @@
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-context-support</artifactId>
 				<version>${spring.version}</version>
-                <exclusions>
-                  <exclusion>
-					<groupId>quartz</groupId>
-					<artifactId>quartz</artifactId>
-                  </exclusion>
-                </exclusions>
+				<exclusions>
+					<exclusion>
+						<groupId>quartz</groupId>
+						<artifactId>quartz</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
@@ -537,12 +563,12 @@
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-oxm</artifactId>
 				<version>${spring.version}</version>
-                <exclusions>
-                  <exclusion>
-					<groupId>commons-lang</groupId>
-					<artifactId>commons-lang</artifactId>
-                  </exclusion>
-                </exclusions>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-lang</groupId>
+						<artifactId>commons-lang</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
@@ -559,11 +585,11 @@
 				<artifactId>spring-batch-core</artifactId>
 				<version>${spring.batch.version}</version>
 			</dependency>
-            <dependency>
-              <groupId>org.springframework.integration</groupId>
-              <artifactId>spring-integration-core</artifactId>
-              <version>${spring.integration.version}</version>
-            </dependency>
+			<dependency>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-core</artifactId>
+				<version>${spring.integration.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-jpa</artifactId>
@@ -579,36 +605,21 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-            <dependency>
-              <groupId>org.springframework.hateoas</groupId>
-              <artifactId>spring-hateoas</artifactId>
-              <version>0.5.0.RELEASE</version>
-            </dependency>
-            <dependency>
-              <groupId>org.aspectj</groupId>
-              <artifactId>aspectjrt</artifactId>
-              <version>${aspectj.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.aspectj</groupId>
-              <artifactId>aspectjweaver</artifactId>
-              <version>${aspectj.version}</version>
-            </dependency>
+			<dependency>
+				<groupId>org.springframework.hateoas</groupId>
+				<artifactId>spring-hateoas</artifactId>
+				<version>0.5.0.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.thymeleaf</groupId>
+				<artifactId>thymeleaf-spring3</artifactId>
+				<version>2.0.16</version>
+			</dependency>
 			<dependency>
 				<groupId>org.yaml</groupId>
 				<artifactId>snakeyaml</artifactId>
 				<version>1.12</version>
 			</dependency>
-            <dependency>
-              <groupId>org.thymeleaf</groupId>
-              <artifactId>thymeleaf-spring3</artifactId>
-              <version>2.0.16</version>
-            </dependency>
-            <dependency>
-              <groupId>nz.net.ultraq.web.thymeleaf</groupId>
-              <artifactId>thymeleaf-layout-dialect</artifactId>
-              <version>1.0.6</version>
-            </dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
diff --git a/spring-bootstrap-actuator/pom.xml b/spring-bootstrap-actuator/pom.xml
index e52382e3104..d5a2e90175f 100644
--- a/spring-bootstrap-actuator/pom.xml
+++ b/spring-bootstrap-actuator/pom.xml
@@ -55,5 +55,10 @@
 			<artifactId>tomcat-embed-core</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-logging-juli</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-bootstrap-cli/pom.xml b/spring-bootstrap-cli/pom.xml
index 55dbe057f40..6f7b0fc119c 100644
--- a/spring-bootstrap-cli/pom.xml
+++ b/spring-bootstrap-cli/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
@@ -15,51 +16,56 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-shade-plugin</artifactId>
-					<dependencies>
-						<dependency>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>spring-bootstrap</artifactId>
-							<version>${project.version}</version>
-						</dependency>
-					</dependencies>
-					<configuration>
-						<createDependencyReducedPom>true</createDependencyReducedPom>
-						<filters>
-							<filter>
-								<artifact>*:*</artifact>
-								<excludes>
-									<exclude>META-INF/*.SF</exclude>
-									<exclude>META-INF/*.DSA</exclude>
-									<exclude>META-INF/*.RSA</exclude>
-								</excludes>
-							</filter>
-						</filters>
-					</configuration>
-					<executions>
-						<execution>
-							<phase>package</phase>
-							<goals>
-								<goal>shade</goal>
-							</goals>
-							<configuration>
-								<transformers>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-										<resource>META-INF/spring.handlers</resource>
-									</transformer>
-									<transformer implementation="org.springframework.bootstrap.maven.PropertiesMergingResourceTransformer">
-										<resource>META-INF/spring.factories</resource>
-									</transformer>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-										<resource>META-INF/spring.schemas</resource>
-									</transformer>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-									<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-										<mainClass>${start-class}</mainClass>
-									</transformer>
-								</transformers>
-							</configuration>
-						</execution>
-					</executions>
+				<dependencies>
+					<dependency>
+						<groupId>${project.groupId}</groupId>
+						<artifactId>spring-bootstrap</artifactId>
+						<version>${project.version}</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<createDependencyReducedPom>true</createDependencyReducedPom>
+					<filters>
+						<filter>
+							<artifact>*:*</artifact>
+							<excludes>
+								<exclude>META-INF/*.SF</exclude>
+								<exclude>META-INF/*.DSA</exclude>
+								<exclude>META-INF/*.RSA</exclude>
+							</excludes>
+						</filter>
+					</filters>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<resource>META-INF/spring.handlers</resource>
+								</transformer>
+								<transformer
+									implementation="org.springframework.bootstrap.maven.PropertiesMergingResourceTransformer">
+									<resource>META-INF/spring.factories</resource>
+								</transformer>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<resource>META-INF/spring.schemas</resource>
+								</transformer>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>${start-class}</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -94,12 +100,10 @@
 		<dependency>
 			<groupId>org.apache.ivy</groupId>
 			<artifactId>ivy</artifactId>
-			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.jopt-simple</groupId>
 			<artifactId>jopt-simple</artifactId>
-			<version>4.4</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-bootstrap-launcher/pom.xml b/spring-bootstrap-launcher/pom.xml
index 46b19cce483..95891143bab 100644
--- a/spring-bootstrap-launcher/pom.xml
+++ b/spring-bootstrap-launcher/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-maven-plugin/pom.xml b/spring-bootstrap-maven-plugin/pom.xml
new file mode 100644
index 00000000000..8515dbe4485
--- /dev/null
+++ b/spring-bootstrap-maven-plugin/pom.xml
@@ -0,0 +1,94 @@
+<?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>
+		<groupId>org.springframework.bootstrap</groupId>
+		<artifactId>spring-bootstrap-parent</artifactId>
+		<version>0.5.0.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-bootstrap-maven-plugin</artifactId>
+	<packaging>maven-plugin</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-war-plugin</artifactId>
+			<version>2.3</version>
+			<type>maven-plugin</type>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-archiver</artifactId>
+			<version>2.1.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-container-default</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.codehaus.plexus</groupId>
+					<artifactId>plexus-component-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugin-tools</groupId>
+			<artifactId>maven-plugin-annotations</artifactId>
+			<version>3.2</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<version>3.2</version>
+				<executions>
+					<execution>
+						<id>generate-descriptor</id>
+						<goals>
+							<goal>descriptor</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
+		<profile>
+			<id>run-its</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-invoker-plugin</artifactId>
+						<version>1.8</version>
+						<configuration>
+							<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+							<settingsFile>src/it/settings.xml</settingsFile>
+							<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+							<postBuildHookScript>verify</postBuildHookScript>
+							<debug>true</debug>
+						</configuration>
+						<executions>
+							<execution>
+								<id>integration-test</id>
+								<goals>
+									<goal>install</goal>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
diff --git a/spring-bootstrap-maven-plugin/src/it/executable-jar-project/pom.xml b/spring-bootstrap-maven-plugin/src/it/executable-jar-project/pom.xml
new file mode 100644
index 00000000000..2a4d3e2e8f3
--- /dev/null
+++ b/spring-bootstrap-maven-plugin/src/it/executable-jar-project/pom.xml
@@ -0,0 +1,19 @@
+<?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>
+	<groupId>org.springframework.bootstrap.maven.test</groupId>
+	<artifactId>executable-jar-project</artifactId>
+	<version>0.0.1.BUILD-SNAPSHOT</version>
+	<packaging>executable-jar</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>@project.groupId@</groupId>
+				<artifactId>@project.artifactId@</artifactId>
+				<version>@project.version@</version>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-bootstrap-samples/pom.xml b/spring-bootstrap-samples/pom.xml
index 6f6999a4dcb..a69ec9ce364 100644
--- a/spring-bootstrap-samples/pom.xml
+++ b/spring-bootstrap-samples/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
@@ -88,14 +89,14 @@
 						</execution>
 					</executions>
 				</plugin>
-                <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>exec-maven-plugin</artifactId>
-                  <configuration>
-					<includePluginDependencies>true</includePluginDependencies>
-                    <mainClass>${start-class}</mainClass>
-                  </configuration>
-                </plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<configuration>
+						<includePluginDependencies>true</includePluginDependencies>
+						<mainClass>${start-class}</mainClass>
+					</configuration>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
@@ -127,17 +128,22 @@
 							</goals>
 							<configuration>
 								<transformers>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<transformer
+										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 										<resource>META-INF/spring.handlers</resource>
 									</transformer>
-									<transformer implementation="org.springframework.bootstrap.maven.PropertiesMergingResourceTransformer">
+									<transformer
+										implementation="org.springframework.bootstrap.maven.PropertiesMergingResourceTransformer">
 										<resource>META-INF/spring.factories</resource>
 									</transformer>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<transformer
+										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 										<resource>META-INF/spring.schemas</resource>
 									</transformer>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-									<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<transformer
+										implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+									<transformer
+										implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 										<mainClass>${start-class}</mainClass>
 									</transformer>
 								</transformers>
@@ -147,36 +153,36 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
-        <plugins>
-          <plugin>
-            <!--skip deploy (these are just samples) -->
-            <artifactId>maven-deploy-plugin</artifactId>
-            <configuration>
-              <skip>true</skip>
-            </configuration>
-          </plugin>
-        </plugins>
+		<plugins>
+			<plugin>
+				<!--skip deploy (these are just samples) -->
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 	<dependencyManagement>
 		<dependencies>
-          <dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-          </dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-core</artifactId>
+				<version>${spring.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <scope>runtime</scope>
-      </dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml
index c761d570b1f..e063130a391 100644
--- a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
index 13dc7de29e8..0e13dff5567 100644
--- a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-data-sample/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
index 37620e97b2e..20d8c858c3c 100644
--- a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-jetty-sample/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
index 6c3b97a43a9..227e2856680 100644
--- a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-profile-sample/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml
index 2309f642fc2..61f9f91b641 100644
--- a/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-sample/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
index 15489ce4b1f..809fd74309d 100644
--- a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-simple-sample/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
index 61fe365f0e1..0f5e0c50b71 100644
--- a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
index c60120f7e7c..31943bf1e2f 100644
--- a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-xml-sample/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-starters/pom.xml b/spring-bootstrap-starters/pom.xml
index 93d72070ca3..2969917c9ca 100644
--- a/spring-bootstrap-starters/pom.xml
+++ b/spring-bootstrap-starters/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
@@ -9,10 +10,10 @@
 	<artifactId>spring-bootstrap-starters</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring.bootstrap.version>0.5.0.BUILD-SNAPSHOT</spring.bootstrap.version>
-        <start-class>org.springframework.bootstrap.main.Spring</start-class>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<spring.bootstrap.version>0.5.0.BUILD-SNAPSHOT</spring.bootstrap.version>
+		<start-class>org.springframework.bootstrap.main.Spring</start-class>
 	</properties>
 	<modules>
 		<module>spring-bootstrap-starter</module>
@@ -23,55 +24,55 @@
 		<module>spring-bootstrap-tomcat-starter</module>
 		<module>spring-bootstrap-web-starter</module>
 	</modules>
-    <dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap</artifactId>
-          <version>${spring.bootstrap.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap-actuator</artifactId>
-          <version>${spring.bootstrap.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap-starter</artifactId>
-          <version>${spring.bootstrap.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap-actuator-starter</artifactId>
-          <version>${spring.bootstrap.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap-web-starter</artifactId>
-          <version>${spring.bootstrap.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap-tomcat-starter</artifactId>
-          <version>${spring.bootstrap.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap-jpa-starter</artifactId>
-          <version>${spring.bootstrap.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap-batch-starter</artifactId>
-          <version>${spring.bootstrap.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.bootstrap</groupId>
-          <artifactId>spring-bootstrap-integration-starter</artifactId>
-          <version>${spring.bootstrap.version}</version>
-        </dependency>
-      </dependencies>
-    </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap</artifactId>
+				<version>${spring.bootstrap.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap-actuator</artifactId>
+				<version>${spring.bootstrap.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap-starter</artifactId>
+				<version>${spring.bootstrap.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap-actuator-starter</artifactId>
+				<version>${spring.bootstrap.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap-web-starter</artifactId>
+				<version>${spring.bootstrap.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap-tomcat-starter</artifactId>
+				<version>${spring.bootstrap.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap-jpa-starter</artifactId>
+				<version>${spring.bootstrap.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap-batch-starter</artifactId>
+				<version>${spring.bootstrap.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap-integration-starter</artifactId>
+				<version>${spring.bootstrap.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -100,68 +101,73 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-    <build>
-      <pluginManagement>
-        <plugins>
-          <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <configuration>
-					<includePluginDependencies>true</includePluginDependencies>
-                    <mainClass>${start-class}</mainClass>
-                </configuration>
-           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
-            <dependencies>
-              <dependency>
-                <groupId>org.springframework.bootstrap</groupId>
-                <artifactId>spring-bootstrap</artifactId>
-                <version>${spring.bootstrap.version}</version>
-              </dependency>
-            </dependencies>
-            <configuration>
-              <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-              <createDependencyReducedPom>true</createDependencyReducedPom>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.SF</exclude>
-                    <exclude>META-INF/*.DSA</exclude>
-                    <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<configuration>
+						<includePluginDependencies>true</includePluginDependencies>
+						<mainClass>${start-class}</mainClass>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-shade-plugin</artifactId>
+					<dependencies>
+						<dependency>
+							<groupId>org.springframework.bootstrap</groupId>
+							<artifactId>spring-bootstrap</artifactId>
+							<version>${spring.bootstrap.version}</version>
+						</dependency>
+					</dependencies>
+					<configuration>
+						<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
+						<createDependencyReducedPom>true</createDependencyReducedPom>
+						<filters>
+							<filter>
+								<artifact>*:*</artifact>
+								<excludes>
+									<exclude>META-INF/*.SF</exclude>
+									<exclude>META-INF/*.DSA</exclude>
+									<exclude>META-INF/*.RSA</exclude>
+								</excludes>
 							</filter>
-              </filters>
-            </configuration>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>shade</goal>
-                </goals>
-                <configuration>
-                  <transformers>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                      <resource>META-INF/spring.handlers</resource>
-                    </transformer>
-                    <transformer implementation="org.springframework.bootstrap.maven.PropertiesMergingResourceTransformer">
-                      <resource>META-INF/spring.factories</resource>
-                    </transformer>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                      <resource>META-INF/spring.schemas</resource>
-                    </transformer>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                      <mainClass>${start-class}</mainClass>
-                    </transformer>
-                  </transformers>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </pluginManagement>
-    </build>
+						</filters>
+					</configuration>
+					<executions>
+						<execution>
+							<phase>package</phase>
+							<goals>
+								<goal>shade</goal>
+							</goals>
+							<configuration>
+								<transformers>
+									<transformer
+										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+										<resource>META-INF/spring.handlers</resource>
+									</transformer>
+									<transformer
+										implementation="org.springframework.bootstrap.maven.PropertiesMergingResourceTransformer">
+										<resource>META-INF/spring.factories</resource>
+									</transformer>
+									<transformer
+										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+										<resource>META-INF/spring.schemas</resource>
+									</transformer>
+									<transformer
+										implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+									<transformer
+										implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+										<mainClass>${start-class}</mainClass>
+									</transformer>
+								</transformers>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
diff --git a/spring-bootstrap-starters/spring-bootstrap-actuator-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-actuator-starter/pom.xml
index c91a3b55724..47e350e8144 100644
--- a/spring-bootstrap-starters/spring-bootstrap-actuator-starter/pom.xml
+++ b/spring-bootstrap-starters/spring-bootstrap-actuator-starter/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-starters/spring-bootstrap-batch-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-batch-starter/pom.xml
index a7a11af78a6..1c38bf119ea 100644
--- a/spring-bootstrap-starters/spring-bootstrap-batch-starter/pom.xml
+++ b/spring-bootstrap-starters/spring-bootstrap-batch-starter/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml
index dd881cc337d..ed1f279a4d6 100644
--- a/spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml
+++ b/spring-bootstrap-starters/spring-bootstrap-integration-starter/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-starters/spring-bootstrap-jpa-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-jpa-starter/pom.xml
index 90fe964b1c3..26b1cbdba41 100644
--- a/spring-bootstrap-starters/spring-bootstrap-jpa-starter/pom.xml
+++ b/spring-bootstrap-starters/spring-bootstrap-jpa-starter/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>
diff --git a/spring-bootstrap-starters/spring-bootstrap-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-starter/pom.xml
index 1b5af270766..a4c23b17a03 100644
--- a/spring-bootstrap-starters/spring-bootstrap-starter/pom.xml
+++ b/spring-bootstrap-starters/spring-bootstrap-starter/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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 		<groupId>org.springframework.bootstrap</groupId>