Bumped rest assured to 3.0

fixes #267

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle

@@ -11,6 +11,8 @@ apply plugin: 'maven-publish'
 group = 'org.springframework.cloud.testprojects'
 
 ext {
+	restAssuredVersion = '3.0.2'
+
 	contractsDir = file("repository/mappings")
 	stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/repository/")
 }
@@ -23,14 +25,14 @@ repositories {
 dependencies {
 	compile "org.springframework:spring-web"
 	compile "org.springframework:spring-context-support"
-	compile "org.codehaus.groovy:groovy-all:2.4.5"
+	compile "org.codehaus.groovy:groovy-all:2.4.11"
 	compile 'com.jayway.jsonpath:json-path-assert:2.2.0'
 
 	testCompile "com.github.tomakehurst:wiremock:${wiremockVersion}"
 	testCompile "com.toomuchcoding.jsonassert:jsonassert:${jsonAssertVersion}"
 	testCompile "org.spockframework:spock-spring:1.0-groovy-2.4"
-	testCompile "com.jayway.restassured:rest-assured:$restAssuredVersion"
-	testCompile "com.jayway.restassured:spring-mock-mvc:$restAssuredVersion"
+	testCompile "io.restassured:rest-assured:$restAssuredVersion"
+	testCompile "io.restassured:spring-mock-mvc:$restAssuredVersion"
 	testCompile "ch.qos.logback:logback-classic:1.1.2"
 	testCompile "org.springframework.cloud:spring-cloud-contract-verifier:${verifierVersion}"
 }

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/src/test/groovy/org/springframework/cloud/contract/verifier/twitter/places/BaseMockMvcSpec.groovy

@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.contract.verifier.twitter.places
 
-import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc
+import io.restassured.module.mockmvc.RestAssuredMockMvc
 import org.springframework.cloud.contract.verifier.twitter.place.PairIdController
 import spock.lang.Specification
 

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle

@@ -20,7 +20,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.1.RELEASE")
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.4.RELEASE")
 	}
 }
 
@@ -31,7 +31,6 @@ allprojects {
 }
 
 ext {
-	restAssuredVersion = '2.5.0'
 	spockVersion = '1.0-groovy-2.4'
 
 	contractVerifierStubsBaseDirectory = 'src/test/resources/stubs'
@@ -46,7 +45,7 @@ subprojects {
 	}
 
 	dependencies {
-		testCompile 'org.codehaus.groovy:groovy-all:2.4.5'
+		testCompile 'org.codehaus.groovy:groovy-all:2.4.11'
 		testCompile "org.spockframework:spock-core:$spockVersion"
 		testCompile 'junit:junit:4.12'
 		testCompile "com.github.tomakehurst:wiremock:${wiremockVersion}"

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle

@@ -20,12 +20,12 @@ buildscript {
 		mavenLocal()
 	}
 	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.1.RELEASE")
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.4.RELEASE")
 	}
 }
 
 ext {
-	restAssuredVersion = '2.5.0'
+	restAssuredVersion = '3.0.2'
 	spockVersion = '1.0-groovy-2.4'
 
 	contractVerifierStubsBaseDirectory = 'src/test/resources/stubs'
@@ -42,7 +42,7 @@ subprojects {
 	}
 
 	dependencies {
-		testCompile "org.codehaus.groovy:groovy-all:2.4.5"
+		testCompile "org.codehaus.groovy:groovy-all:2.4.11"
 		testCompile "org.spockframework:spock-core:$spockVersion"
 		testCompile("junit:junit:4.12")
 		testCompile "com.github.tomakehurst:wiremock:${wiremockVersion}"
@@ -85,8 +85,8 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService')
 		testCompile "org.mockito:mockito-core"
 		testCompile "org.springframework:spring-test"
 		testCompile "org.springframework.boot:spring-boot-test"
-		testCompile "com.jayway.restassured:rest-assured:$restAssuredVersion"
-		testCompile "com.jayway.restassured:spring-mock-mvc:$restAssuredVersion"
+		testCompile "io.rest-assured:rest-assured:$restAssuredVersion"
+		testCompile "io.rest-assured:spring-mock-mvc:$restAssuredVersion"
 	}
 
 	task cleanup(type: Delete) {
@@ -108,7 +108,7 @@ configure(project(':fraudDetectionService')) {
 
 configure(project(':loanApplicationService')) {
 
-	task copyCollaboratorStubs(type: Copy) {
+	task copyCollaboratorStubs(type: com.sun.org.apache.xalan.internal.xsltc.compiler.Copy) {
 		File fraudBuildDir = project(':fraudDetectionService').buildDir
 		from(new File(fraudBuildDir, "/production/${project(':fraudDetectionService').name}-stubs/"))
 		into "src/test/resources/"

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/src/test/groovy/org/springframework/cloud/MvcSpec.groovy

@@ -17,7 +17,7 @@
 package org.springframework.cloud
 
 import org.springframework.cloud.frauddetection.FraudDetectionController
-import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc
+import io.restassured.module.mockmvc.RestAssuredMockMvc
 import spock.lang.Specification
 
 class MvcSpec extends Specification {

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/src/test/java/org/springframework/cloud/MvcTest.java

@@ -1,6 +1,6 @@
 package org.springframework.cloud;
 
-import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
+import io.restassured.module.mockmvc.RestAssuredMockMvc;
 import org.junit.Before;
 
 public class MvcTest {

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle

@@ -20,12 +20,12 @@ buildscript {
 		mavenLocal()
 	}
 	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.1.RELEASE")
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.4.RELEASE")
 	}
 }
 
 ext {
-	restAssuredVersion = '2.5.0'
+	restAssuredVersion = '3.0.2'
 	spockVersion = '1.0-groovy-2.4'
 
 	contractVerifierStubsBaseDirectory = 'src/test/resources/stubs'
@@ -43,9 +43,9 @@ subprojects {
 	}
 
 	dependencies {
-		testCompile "org.codehaus.groovy:groovy-all:2.4.5"
+		testCompile "org.codehaus.groovy:groovy-all:2.4.11"
 		testCompile "org.spockframework:spock-core:$spockVersion"
-		testCompile("junit:junit:4.12")
+		testCompile "junit:junit:4.12"
 		testCompile "com.github.tomakehurst:wiremock:${wiremockVersion}"
 		testCompile "com.toomuchcoding.jsonassert:jsonassert:${jsonAssertVersion}"
 		testCompile "org.assertj:assertj-core:2.4.1"
@@ -109,8 +109,8 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService')
 		testCompile "org.mockito:mockito-core"
 		testCompile "org.springframework:spring-test"
 		testCompile "org.springframework.boot:spring-boot-test"
-		testCompile "com.jayway.restassured:rest-assured:$restAssuredVersion"
-		testCompile "com.jayway.restassured:spring-mock-mvc:$restAssuredVersion"
+		testCompile "io.rest-assured:rest-assured:$restAssuredVersion"
+		testCompile "io.rest-assured:spring-mock-mvc:$restAssuredVersion"
 	}
 
 	task cleanup(type: Delete) {

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/src/test/groovy/org/springframework/cloud/MvcSpec.groovy

@@ -17,7 +17,7 @@
 package org.springframework.cloud
 
 import org.springframework.cloud.frauddetection.FraudDetectionController
-import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc
+import io.restassured.module.mockmvc.RestAssuredMockMvc
 import spock.lang.Specification
 
 class MvcSpec extends Specification {

spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/fraudDetectionService/src/test/java/org/springframework/cloud/MvcTest.java

@@ -1,6 +1,6 @@
 package org.springframework.cloud;
 
-import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
+import io.restassured.module.mockmvc.RestAssuredMockMvc;
 import org.junit.Before;
 
 public class MvcTest {

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml

@@ -49,15 +49,15 @@
         <!-- verifier test dependencies-->
         <!-- tag::dependencies[] -->
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>2.9.0</version>
+            <version>3.0.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>spring-mock-mvc</artifactId>
-            <version>2.9.0</version>
+            <version>3.0.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/src/test/java/com/blogspot/toomuchcoding/frauddetection/BaseAccurest.java

@@ -16,7 +16,7 @@
  */
 package com.blogspot.toomuchcoding.frauddetection;
 
-import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
+import io.restassured.module.mockmvc.RestAssuredMockMvc;
 
 import org.junit.Before;
 

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.4.RELEASE</version>
     </parent>
 
     <dependencies>

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/src/test/java/hello/BaseAccurest.java

@@ -16,7 +16,7 @@
  */
 package hello;
 
-import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
+import io.restassured.module.mockmvc.RestAssuredMockMvc;
 
 import org.junit.Before;
 

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.4.RELEASE</version>
     </parent>
 
     <dependencies>

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/src/test/groovy/hello/BaseAccurest.groovy

@@ -16,7 +16,7 @@
  */
 package hello
 
-import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc
+import io.restassured.module.mockmvc.RestAssuredMockMvc
 import spock.lang.Specification
 
 public class BaseAccurest extends Specification {

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.4.RELEASE</version>
     </parent>
 
     <dependencies>

spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/src/test/java/hello/BaseAccurest.java

@@ -16,7 +16,7 @@
  */
 package hello;
 
-import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
+import io.restassured.module.mockmvc.RestAssuredMockMvc;
 
 import org.junit.Before;