From 4a36c2e041cddc6c4a07dcd9ab7c473ed1bfae6f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 9 Jun 2015 15:33:38 +0100
Subject: [PATCH] Increase the timeout period for container startup in
 deployment tests

The build currently fails intermittently when an external container,
usually TomEE or Wildfly, fails to start within the default timeout
period of two minutes. This commit updates the timeout to 5 minutes for
all containers (Tomcat, TomEE and Wildfly) in the hope that it will
help to stabilise the CI build.
---
 .../spring-boot-deployment-test-tomcat/pom.xml                   | 1 +
 .../spring-boot-deployment-test-tomee/pom.xml                    | 1 +
 .../spring-boot-deployment-test-wildfly/pom.xml                  | 1 +
 3 files changed, 3 insertions(+)

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 67917580333..3d5f61e3193 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
@@ -62,6 +62,7 @@
 				<configuration>
 					<container>
 						<containerId>tomcat8x</containerId>
+						<timeout>300000</timeout>
 						<zipUrlInstaller>
 							<url>http://mirrors.ibiblio.org/apache/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
 						</zipUrlInstaller>
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 0af63f30042..3624c710611 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
@@ -67,6 +67,7 @@
 				<configuration>
 					<container>
 						<containerId>tomee1x</containerId>
+						<timeout>300000</timeout>
 						<zipUrlInstaller>
 							<url>http://mirrors.ibiblio.org/apache/tomee/tomee-${tomee.version}/apache-tomee-${tomee.version}-webprofile.zip</url>
 						</zipUrlInstaller>
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 9828296b906..1fb6c200c58 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
@@ -63,6 +63,7 @@
 				<configuration>
 					<container>
 						<containerId>wildfly8x</containerId>
+						<timeout>300000</timeout>
 						<zipUrlInstaller>
 							<url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip</url>
 						</zipUrlInstaller>