From ff7e4ffa8a4e7c4d964ae7b84a7977f6d806b7f6 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Mon, 11 Jan 2016 10:53:20 +0100
Subject: [PATCH] Fixed surefire and failsafe plugins setup, fixed docker tests

---
 pom.xml                                            | 14 +++++++++++---
 .../main/java/tools/AbstractIntegrationTest.java   |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index eade96317..dbde4f800 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
 		<maven.compiler.testSource>1.8</maven.compiler.testSource>
-		<surefire.plugin.version>2.9</surefire.plugin.version>
+		<surefire.plugin.version>2.19.1</surefire.plugin.version>
 	</properties>
 
 	<profiles>
@@ -235,7 +235,7 @@
 				<plugins>
 					<plugin>
 						<artifactId>maven-failsafe-plugin</artifactId>
-						<version>2.19.1</version>
+						<version>${surefire.plugin.version}</version>
 						<configuration>
 							<useFile>false</useFile>
 							<includes>
@@ -244,11 +244,19 @@
 						</configuration>
 						<executions>
 							<execution>
-								<id>integration-test</id>
+								<id>failsafe-integration-tests</id>
+								<phase>integration-test</phase>
 								<goals>
 									<goal>integration-test</goal>
 								</goals>
 							</execution>
+							<execution>
+								<id>failsafe-verify</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>verify</goal>
+								</goals>
+							</execution>
 						</executions>
 					</plugin>
 				</plugins>
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java
index 74c4f57aa..80a94c073 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java
@@ -29,7 +29,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
 abstract public class AbstractIntegrationTest {
 
 	@Value("${test.pollinterval:1}") protected int pollInterval;
-	@Value("${test.timeout:1}") protected int timeout;
+	@Value("${test.timeout:10}") protected int timeout;
 
 	protected ConditionFactory await() {
 		return Awaitility.await().pollInterval(pollInterval, SECONDS).atMost(timeout, SECONDS);