diff --git a/spring-boot-deployment-tests/pom.xml b/spring-boot-deployment-tests/pom.xml
index ee6d3811b8..ffbba6c40d 100644
--- a/spring-boot-deployment-tests/pom.xml
+++ b/spring-boot-deployment-tests/pom.xml
@@ -19,10 +19,60 @@
${basedir}/..
1.7
+
+ 300000
+ ${user.home}/.cargo/installs
spring-boot-deployment-test-tomee
spring-boot-deployment-test-tomcat
spring-boot-deployment-test-wildfly
+
+
+
+
+
+ org.codehaus.cargo
+ cargo-maven2-plugin
+
+
+ ${cargo.container.id}
+ ${cargo.timeout}
+
+ ${cargo.container.url}
+ ${cargo.container.download-dir}
+
+
+
+
+
+ /bootapp
+
+ http://localhost:${appserver.port}/bootapp
+ 30000
+
+
+
+
+
+ start-cargo
+ pre-integration-test
+
+ start
+
+
+
+ stop-cargo
+ post-integration-test
+
+ stop
+
+
+
+
+
+
+
+
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 896f68a4de..8d863235fd 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
@@ -17,6 +17,10 @@
${basedir}/../..
+ tomcat8x
+
+ http://mirrors.ibiblio.org/apache/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
+
@@ -60,45 +64,13 @@
org.codehaus.cargo
cargo-maven2-plugin
-
- tomcat8x
- 300000
-
- http://mirrors.ibiblio.org/apache/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
-
-
${appserver.port}
${appserver.ajp.port}
-
-
-
- /bootapp
-
- http://localhost:${appserver.port}/bootapp
- 30000
-
-
-
-
- start-cargo
- pre-integration-test
-
- start
-
-
-
- stop-cargo
- post-integration-test
-
- stop
-
-
-
org.apache.maven.plugins
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 db2534de15..9df1c938ba 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
@@ -18,6 +18,10 @@
${basedir}/../..
1.7.1
+ tomee1x
+
+ http://mirrors.ibiblio.org/apache/tomee/tomee-${tomee.version}/apache-tomee-${tomee.version}-webprofile.zip
+
@@ -65,45 +69,13 @@
org.codehaus.cargo
cargo-maven2-plugin
-
- tomee1x
- 300000
-
- http://mirrors.ibiblio.org/apache/tomee/tomee-${tomee.version}/apache-tomee-${tomee.version}-webprofile.zip
-
-
${appserver.port}
${appserver.ajp.port}
-
-
-
- /bootapp
-
- http://localhost:${appserver.port}/bootapp
- 30000
-
-
-
-
- start-cargo
- pre-integration-test
-
- start
-
-
-
- stop-cargo
- post-integration-test
-
- stop
-
-
-
org.apache.maven.plugins
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 6e7d453bc7..80a9f2f741 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
@@ -18,6 +18,9 @@
${basedir}/../..
8.2.0.Final
+ wildfly8x
+ http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
+
@@ -62,13 +65,6 @@
org.codehaus.cargo
cargo-maven2-plugin
-
- wildfly8x
- 300000
-
- http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
-
-
${appserver.port}
@@ -79,32 +75,7 @@
standalone-full
-
-
-
- /bootapp
-
- http://localhost:${appserver.port}/bootapp
- 30000
-
-
-
-
- start-cargo
- pre-integration-test
-
- start
-
-
-
- stop-cargo
- post-integration-test
-
- stop
-
-
-
org.apache.maven.plugins