From bb19df016d784b2404c1abf95e44b9c671e104c7 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Thu, 2 Jul 2020 18:10:52 +0200
Subject: [PATCH] Removed setting of rest assured version. Aligned with Boot;
 fixes gh-1431

---
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 .../project/gradlew                           |  2 -
 .../project/gradlew.bat                       |  1 -
 pom.xml                                       | 63 -------------------
 4 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties b/docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties
index a4b4429748..4c5803d13c 100644
--- a/docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties
+++ b/docker/spring-cloud-contract-docker/project/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/docker/spring-cloud-contract-docker/project/gradlew b/docker/spring-cloud-contract-docker/project/gradlew
index fbd7c51583..2fe81a7d95 100755
--- a/docker/spring-cloud-contract-docker/project/gradlew
+++ b/docker/spring-cloud-contract-docker/project/gradlew
@@ -82,7 +82,6 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -130,7 +129,6 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/docker/spring-cloud-contract-docker/project/gradlew.bat b/docker/spring-cloud-contract-docker/project/gradlew.bat
index a9f778a7a9..9109989e3c 100644
--- a/docker/spring-cloud-contract-docker/project/gradlew.bat
+++ b/docker/spring-cloud-contract-docker/project/gradlew.bat
@@ -84,7 +84,6 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
-
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
diff --git a/pom.xml b/pom.xml
index c84f6dd8e9..c92c6d3699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,6 @@
 		<handlebars.version>4.2.0</handlebars.version>
 		<jgit.version>5.5.1.201910021850-r</jgit.version>
 		<javax-inject.version>1</javax-inject.version>
-		<rest-assured.version>4.2.0</rest-assured.version>
 
 		<junit-platform.version>1.3.2</junit-platform.version>
 		<junit-vintage.version>5.6.2</junit-vintage.version>
@@ -462,68 +461,6 @@
 				<artifactId>kotlin-compiler-embeddable</artifactId>
 				<version>${contract.kotlin.version}</version>
 			</dependency>
-
-			<!-- rest assured -->
-
-			<dependency>
-				<groupId>io.rest-assured</groupId>
-				<artifactId>rest-assured</artifactId>
-				<version>${rest-assured.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy-xml</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>io.rest-assured</groupId>
-				<artifactId>json-path</artifactId>
-				<version>${rest-assured.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.rest-assured</groupId>
-				<artifactId>xml-path</artifactId>
-				<version>${rest-assured.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.rest-assured</groupId>
-				<artifactId>spring-mock-mvc</artifactId>
-				<version>${rest-assured.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>spring-web</artifactId>
-						<groupId>org.springframework</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>spring-webmvc</artifactId>
-						<groupId>org.springframework</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>spring-test</artifactId>
-						<groupId>org.springframework</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>io.rest-assured</groupId>
-				<artifactId>spring-web-test-client</artifactId>
-				<version>${rest-assured.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>spring-context</artifactId>
-						<groupId>org.springframework</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>spring-webflux</artifactId>
-						<groupId>org.springframework</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>