Merge branch '1.2.x'

11 years ago · 0a42a0e0d6
3 changed files with 3 additions and 0 deletions
--- 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 @@
				@@ -62,6 +62,7 @@
 				<configuration>
 					<container>
 						<containerId>tomcat8x</containerId>
+						<timeout>300000</timeout>
 						<zipUrlInstaller>
 							<url>http://www.us.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
 						</zipUrlInstaller>
--- 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 @@
				@@ -67,6 +67,7 @@
 				<configuration>
 					<container>
 						<containerId>tomee1x</containerId>
+						<timeout>300000</timeout>
 						<zipUrlInstaller>
 							<url>http://www.us.apache.org/dist/tomee/tomee-${tomee.version}/apache-tomee-${tomee.version}-webprofile.zip</url>
 						</zipUrlInstaller>
--- 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 @@
				@@ -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>