From 9be467ed51b3c530f84b9dc27f1dcf08ad2428c6 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Mon, 16 Jan 2017 14:41:14 +0100
Subject: [PATCH] Fixed the order of tests in parallel build

---
 samples/pom.xml                            | 18 ++++++++++++++++++
 scripts/parallelBuild.sh                   |  4 ++--
 spring-cloud-contract-dependencies/pom.xml | 10 ++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/samples/pom.xml b/samples/pom.xml
index bea978884c..44b724105c 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -29,6 +29,24 @@
 		<!-- standalone tests get executed separately by invoker plugin -->
     </modules>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-stub-runner</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-maven-plugin</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-contract-gradle-plugin</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
  	<build>
 		<plugins>
 	        <plugin>
diff --git a/scripts/parallelBuild.sh b/scripts/parallelBuild.sh
index 8942800822..8ee774cbb2 100755
--- a/scripts/parallelBuild.sh
+++ b/scripts/parallelBuild.sh
@@ -4,7 +4,7 @@ source common.sh || source scripts/common.sh || echo "No common.sh script found.
 
 set -e
 
-[[ -z "${CORES}" ]] && CORES=8
+[[ -z "${CORES}" ]] && CORES=4
 echo -e "\n\nRUNNING PARALLEL BUILD WITH [${CORES}] CORES\n\n"
 
-./mvnw clean install -Pdocs -T ${CORES} && ./mvnw install -Pintegration -T ${CORES} -Dinvoker.parallelThreads=${CORES} -pl :spring-cloud-contract-samples
\ No newline at end of file
+./mvnw clean install -Pdocs,integration -T ${CORES} -Dinvoker.parallelThreads=${CORES}
\ No newline at end of file
diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
index c15841730c..20618a7062 100644
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -60,6 +60,16 @@
 				<artifactId>spring-cloud-starter-contract-stub-runner-jetty</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-contract-maven-plugin</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-contract-gradle-plugin</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.github.tomakehurst</groupId>
 				<artifactId>wiremock</artifactId>