diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml
index 5f64c9b633..8a60594133 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml
@@ -47,64 +47,71 @@
test
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- reserve-network-port
-
- reserve-network-port
-
- process-resources
+
+
+
+ 1.8
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ reserve-network-port
+
+ reserve-network-port
+
+ process-resources
+
+
+ appserver.port
+ appserver.admin.port
+ appserver.jms.port
+ appserver.iiop.port
+ appserver.https.port
+ appserver.iiops.port
+ appserver.iiopmutualauth.port
+ appserver.jmx.port
+ appserver.osgishell.port
+ appserver.debugger.port
+
+
+
+
+
+
+ org.codehaus.cargo
+ cargo-maven2-plugin
-
- appserver.port
- appserver.admin.port
- appserver.jms.port
- appserver.iiop.port
- appserver.https.port
- appserver.iiops.port
- appserver.iiopmutualauth.port
- appserver.jmx.port
- appserver.osgishell.port
- appserver.debugger.port
-
+
+
+ ${appserver.port}
+ ${appserver.admin.port}
+ ${appserver.jmx.port}
+ ${appserver.https.port}
+ ${appserver.debugger.port}
+ ${appserver.jms.port}
+ ${appserver.iiop.port}
+ ${appserver.iiopmutualauth.port}
+ ${appserver.iiops.port}
+ ${appserver.osgishell.port}
+
+
-
-
-
-
- org.codehaus.cargo
- cargo-maven2-plugin
-
-
-
- ${appserver.port}
- ${appserver.admin.port}
- ${appserver.jmx.port}
- ${appserver.https.port}
- ${appserver.debugger.port}
- ${appserver.jms.port}
- ${appserver.iiop.port}
- ${appserver.iiopmutualauth.port}
- ${appserver.iiops.port}
- ${appserver.osgishell.port}
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
- ${appserver.port}
-
-
-
-
-
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ ${appserver.port}
+
+
+
+
+
+
+
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
index a5c603be8e..70583cdc83 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
@@ -44,48 +44,55 @@
test
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- reserve-network-port
-
- reserve-network-port
-
- process-resources
+
+
+
+ 1.8
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ reserve-network-port
+
+ reserve-network-port
+
+ process-resources
+
+
+ appserver.port
+ appserver.ajp.port
+
+
+
+
+
+
+ org.codehaus.cargo
+ cargo-maven2-plugin
-
- appserver.port
- appserver.ajp.port
-
+
+
+ ${appserver.port}
+ ${appserver.ajp.port}
+
+
-
-
-
-
- org.codehaus.cargo
- cargo-maven2-plugin
-
-
-
- ${appserver.port}
- ${appserver.ajp.port}
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
- ${appserver.port}
-
-
-
-
-
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ ${appserver.port}
+
+
+
+
+
+
+
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
index 55bd2226fc..ac3ab6f1f7 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
@@ -49,48 +49,55 @@
test
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- reserve-network-port
-
- reserve-network-port
-
- process-resources
+
+
+
+ 1.8
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ reserve-network-port
+
+ reserve-network-port
+
+ process-resources
+
+
+ appserver.port
+ appserver.ajp.port
+
+
+
+
+
+
+ org.codehaus.cargo
+ cargo-maven2-plugin
-
- appserver.port
- appserver.ajp.port
-
+
+
+ ${appserver.port}
+ ${appserver.ajp.port}
+
+
-
-
-
-
- org.codehaus.cargo
- cargo-maven2-plugin
-
-
-
- ${appserver.port}
- ${appserver.ajp.port}
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
- ${appserver.port}
-
-
-
-
-
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ ${appserver.port}
+
+
+
+
+
+
+
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
index 4c6effca3e..1fdce26590 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
@@ -44,53 +44,60 @@
test
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- reserve-network-port
-
- reserve-network-port
-
- process-resources
+
+
+
+ 1.8
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ reserve-network-port
+
+ reserve-network-port
+
+ process-resources
+
+
+ appserver.port
+ appserver.ajp.port
+ appserver.transaction.port
+
+
+
+
+
+
+ org.codehaus.cargo
+ cargo-maven2-plugin
-
- appserver.port
- appserver.ajp.port
- appserver.transaction.port
-
+
+
+ ${appserver.port}
+ ${appserver.ajp.port}
+
+ ${appserver.transaction.port}
+
+ standalone-full
+
+
-
-
-
-
- org.codehaus.cargo
- cargo-maven2-plugin
-
-
-
- ${appserver.port}
- ${appserver.ajp.port}
-
- ${appserver.transaction.port}
-
- standalone-full
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
- ${appserver.port}
-
-
-
-
-
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ ${appserver.port}
+
+
+
+
+
+
+
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
index f2c3e205b3..520b433f4a 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
@@ -43,46 +43,53 @@
test
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- reserve-network-port
-
- reserve-network-port
-
- process-resources
+
+
+
+ 1.8
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ reserve-network-port
+
+ reserve-network-port
+
+ process-resources
+
+
+ appserver.port
+
+
+
+
+
+
+ org.codehaus.cargo
+ cargo-maven2-plugin
-
- appserver.port
-
+
+
+ ${appserver.port}
+
+
-
-
-
-
- org.codehaus.cargo
- cargo-maven2-plugin
-
-
-
- ${appserver.port}
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
- ${appserver.port}
-
-
-
-
-
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ ${appserver.port}
+
+
+
+
+
+
+