Merge branch '1.0.x'

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>

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
+./mvnw clean install -Pdocs,integration -T ${CORES} -Dinvoker.parallelThreads=${CORES}

spring-cloud-contract-dependencies/pom.xml

@@ -65,6 +65,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>