From 9fe8362c89c2a2a8a2558c6c0885e54122397fba Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Mon, 2 Apr 2018 23:43:35 +0200
Subject: [PATCH] Removed the explicit setting of pact-jvm-model

---
 pom.xml                                               | 11 -----------
 samples/standalone/pact/pact-http-client/build.gradle |  1 -
 samples/standalone/pact/pact-http-client/pom.xml      |  6 ------
 samples/standalone/pact/pact-http-server/build.gradle |  1 -
 samples/standalone/pact/pact-http-server/pom.xml      |  5 -----
 .../spring-cloud-contract-maven-plugin/pom.xml        |  5 -----
 .../src/test/projects/pact/pom.xml                    |  5 -----
 7 files changed, 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index e761718110..0a48822454 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,17 +134,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<dependency>
-				<groupId>au.com.dius</groupId>
-				<artifactId>pact-jvm-model</artifactId>
-				<version>${pact.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy-all</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<dependency>
 				<groupId>com.github.jknack</groupId>
 				<artifactId>handlebars</artifactId>
diff --git a/samples/standalone/pact/pact-http-client/build.gradle b/samples/standalone/pact/pact-http-client/build.gradle
index 46debdf267..7f6b1e318d 100644
--- a/samples/standalone/pact/pact-http-client/build.gradle
+++ b/samples/standalone/pact/pact-http-client/build.gradle
@@ -40,7 +40,6 @@ dependencies {
 	testCompile "org.springframework.cloud:spring-cloud-starter-contract-stub-runner"
 	//tag::pact_dependency[]
 	testCompile "org.springframework.cloud:spring-cloud-contract-pact"
-	testCompile 'au.com.dius:pact-jvm-model:3.5.13'
 	//end::pact_dependency[]
 }
 
diff --git a/samples/standalone/pact/pact-http-client/pom.xml b/samples/standalone/pact/pact-http-client/pom.xml
index 0eeaec3700..5dcd390dc1 100644
--- a/samples/standalone/pact/pact-http-client/pom.xml
+++ b/samples/standalone/pact/pact-http-client/pom.xml
@@ -49,12 +49,6 @@
 			<artifactId>spring-cloud-contract-pact</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>au.com.dius</groupId>
-			<artifactId>pact-jvm-model</artifactId>
-			<version>3.5.13</version>
-			<scope>test</scope>
-		</dependency>
 		<!-- end::pact_dependency[] -->
 
 	</dependencies>
diff --git a/samples/standalone/pact/pact-http-server/build.gradle b/samples/standalone/pact/pact-http-server/build.gradle
index 8b2522b63a..965f46113f 100644
--- a/samples/standalone/pact/pact-http-server/build.gradle
+++ b/samples/standalone/pact/pact-http-server/build.gradle
@@ -11,7 +11,6 @@ buildscript {
 		classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 		//tag::pact_dependency[]
 		classpath "org.springframework.cloud:spring-cloud-contract-pact:${findProperty('verifierVersion') ?: verifierVersion}"
-		classpath 'au.com.dius:pact-jvm-model:3.5.13'
 		//end::pact_dependency[]
 	}
 }
diff --git a/samples/standalone/pact/pact-http-server/pom.xml b/samples/standalone/pact/pact-http-server/pom.xml
index f01e074236..22708cc14d 100644
--- a/samples/standalone/pact/pact-http-server/pom.xml
+++ b/samples/standalone/pact/pact-http-server/pom.xml
@@ -80,11 +80,6 @@
 						<artifactId>spring-cloud-contract-pact</artifactId>
 						<version>${spring-cloud-contract.version}</version>
 					</dependency>
-					<dependency>
-						<groupId>au.com.dius</groupId>
-						<artifactId>pact-jvm-model</artifactId>
-						<version>3.5.13</version>
-					</dependency>
 				</dependencies>
 			</plugin>
 			<!-- end::pact_dependency[] -->
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
index 9911b7e4db..71bc3b0a02 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
@@ -418,11 +418,6 @@
 			<artifactId>spring-cloud-contract-pact</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>au.com.dius</groupId>
-			<artifactId>pact-jvm-model</artifactId>
-			<scope>test</scope>
-		</dependency>
 
 	</dependencies>
 
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml
index 2027b26d9a..90d1797f54 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml
@@ -49,11 +49,6 @@
 						<artifactId>spring-cloud-contract-pact</artifactId>
 						<version>${spring.cloud.contract.version}</version>
 					</dependency>
-					<dependency>
-						<groupId>au.com.dius</groupId>
-						<artifactId>pact-jvm-model</artifactId>
-						<version>3.5.13</version>
-					</dependency>
 				</dependencies>
 			</plugin>
 		</plugins>