From 2c2f49e98dd171e9aec4971bf1938a44a0f7ba38 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Thu, 23 Jul 2020 15:19:41 +0200
Subject: [PATCH] Fixing RestAssured setup by excluding spring import

---
 docker/spring-cloud-contract-docker/project/build.gradle  | 5 +++--
 .../spring-cloud-starter-contract-verifier/pom.xml        | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docker/spring-cloud-contract-docker/project/build.gradle b/docker/spring-cloud-contract-docker/project/build.gradle
index 8597990e5a..fa867456af 100644
--- a/docker/spring-cloud-contract-docker/project/build.gradle
+++ b/docker/spring-cloud-contract-docker/project/build.gradle
@@ -105,7 +105,7 @@ task copyOutput(type: Copy) {
 	into '/spring-cloud-contract-output'
 }
 
-test{
+test {
 	finalizedBy("copyOutput")
 	useJUnitPlatform()
 }
@@ -155,7 +155,8 @@ task resolveDependencies {
 			println "Retrieving dependencies for $name"
 			try {
 				config.files
-			} catch (e) {
+			}
+			catch (e) {
 				project.logger.info e.message // some cannot be resolved, silentlyish skip them
 			}
 		}
diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
index 0dd26dfa9e..24a1c5f25d 100644
--- a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
+++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
@@ -26,6 +26,10 @@
 					<groupId>com.sun.xml.bind</groupId>
 					<artifactId>jaxb-osgi</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -36,6 +40,10 @@
 					<groupId>com.sun.xml.bind</groupId>
 					<artifactId>jaxb-osgi</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>