SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumped rest assured to 3.0

Browse Source 
fixes #267
This commit is contained in:
Marcin Grzejszczak
2017-06-26 18:15:39 +02:00
parent 61411e0831
commit 7be2d8dad5
46 changed files with 173 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/standalone/contracts/com/example/server/pom.xml
View File

@@ -21,7 +21,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-dependencies.version>Dalston.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
<excludeBuildFolders>true</excludeBuildFolders>
</properties>

2
samples/standalone/dsl/http-client/gradle.properties
View File

@@ -1,2 +1,2 @@
org.gradle.daemon=false
BOM_VERSION=Dalston.BUILD-SNAPSHOT
BOM_VERSION=Edgware.BUILD-SNAPSHOT

2
samples/standalone/dsl/http-client/pom.xml
View File

@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-dependencies.version>Dalston.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
</properties>
<dependencies>

2
samples/standalone/dsl/http-server/gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.2.0.BUILD-SNAPSHOT
BOM_VERSION=Dalston.BUILD-SNAPSHOT
BOM_VERSION=Edgware.BUILD-SNAPSHOT

2
samples/standalone/dsl/http-server/pom.xml
View File

@@ -21,7 +21,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-dependencies.version>Dalston.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
</properties>
<dependencies>

2
samples/standalone/dsl/http-server/src/test/java/com/example/fraud/FraudBase.java
View File

@@ -2,7 +2,7 @@ package com.example.fraud;
import org.junit.Before;
import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
import io.restassured.module.mockmvc.RestAssuredMockMvc;
public class FraudBase {
@Before

2
samples/standalone/dsl/http-server/src/test/java/com/example/fraud/FraudnameBase.java
View File

@@ -2,7 +2,7 @@ package com.example.fraud;
import org.junit.Before;
import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
import io.restassured.module.mockmvc.RestAssuredMockMvc;
public class FraudnameBase {

2
samples/standalone/messaging/stream-sink/gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.2.0.BUILD-SNAPSHOT
BOM_VERSION=Dalston.BUILD-SNAPSHOT
BOM_VERSION=Edgware.BUILD-SNAPSHOT

2
samples/standalone/messaging/stream-sink/pom.xml
View File

@@ -48,7 +48,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.BUILD-SNAPSHOT</version>
<version>Edgware.BUILD-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>

8
samples/standalone/messaging/stream-source/build.gradle
View File

@@ -9,8 +9,8 @@ buildscript {
dependencies {
classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.3.RELEASE"
classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
classpath "io.rest-assured:rest-assured:3.0.2"
classpath "io.rest-assured:spring-mock-mvc:3.0.2"
classpath "com.jayway.restassured:rest-assured:2.9.0"
classpath "com.jayway.restassured:spring-mock-mvc:2.9.0"
}
}
@@ -54,8 +54,8 @@ dependencies {
testCompile 'org.springframework.cloud:spring-cloud-starter-contract-verifier'
testCompile "org.springframework.cloud:spring-cloud-stream-test-support"
testCompile "io.rest-assured:rest-assured:3.0.2"
testCompile "io.rest-assured:spring-mock-mvc:3.0.2"
testCompile "com.jayway.restassured:rest-assured:2.9.0"
testCompile "com.jayway.restassured:spring-mock-mvc:2.9.0"
}
task stubsJar(type: Jar, dependsOn: "generateWireMockClientStubs") {

2
samples/standalone/messaging/stream-source/gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.2.0.BUILD-SNAPSHOT
BOM_VERSION=Dalston.BUILD-SNAPSHOT
BOM_VERSION=Edgware.BUILD-SNAPSHOT

22
samples/standalone/messaging/stream-source/pom.xml
View File

@@ -46,11 +46,11 @@
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.jayway.restassured</groupId>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
</exclusion>
<exclusion>
<groupId>com.jayway.restassured</groupId>
<groupId>io.rest-assured</groupId>
<artifactId>spring-mock-mvc</artifactId>
</exclusion>
</exclusions>
@@ -58,15 +58,15 @@
<!-- Example of overriding Rest Assured version -->
<dependency>
<groupId>io.rest-assured</groupId>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
<version>3.0.2</version>
<version>2.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<groupId>com.jayway.restassured</groupId>
<artifactId>spring-mock-mvc</artifactId>
<version>3.0.2</version>
<version>2.9.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Dalston.BUILD-SNAPSHOT</version>
<version>Edgware.BUILD-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -106,15 +106,15 @@
<!-- Example of using Rest Assured 3.x. If you don't add this section Rest Assured 2.9.0 will be used -->
<dependencies>
<dependency>
<groupId>io.rest-assured</groupId>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
<version>3.0.2</version>
<version>2.9.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<groupId>com.jayway.restassured</groupId>
<artifactId>spring-mock-mvc</artifactId>
<version>3.0.2</version>
<version>2.9.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
samples/standalone/messaging/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
View File

@@ -16,7 +16,7 @@
package com.example.source;
import io.restassured.module.mockmvc.RestAssuredMockMvc;
import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;

2
samples/standalone/pact/pact-http-client/gradle.properties
View File

@@ -1,2 +1,2 @@
org.gradle.daemon=false
BOM_VERSION=Dalston.BUILD-SNAPSHOT
BOM_VERSION=Edgware.BUILD-SNAPSHOT

2
samples/standalone/pact/pact-http-client/pom.xml
View File

@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-dependencies.version>Dalston.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
</properties>
<dependencies>

2
samples/standalone/pact/pact-http-server/gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.2.0.BUILD-SNAPSHOT
BOM_VERSION=Dalston.BUILD-SNAPSHOT
BOM_VERSION=Edgware.BUILD-SNAPSHOT

2
samples/standalone/pact/pact-http-server/pom.xml
View File

@@ -21,7 +21,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-dependencies.version>Dalston.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>Edgware.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
</properties>
<dependencies>

2
samples/standalone/pact/pact-http-server/src/test/java/com/example/fraud/FraudBase.java
View File

@@ -2,7 +2,7 @@ package com.example.fraud;
import org.junit.Before;
import com.jayway.restassured.module.mockmvc.RestAssuredMockMvc;
import io.restassured.module.mockmvc.RestAssuredMockMvc;
public class FraudBase {

2
samples/standalone/restdocs/http-client/gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.2.0.BUILD-SNAPSHOT
BOM_VERSION=Dalston.BUILD-SNAPSHOT
BOM_VERSION=Edgware.BUILD-SNAPSHOT

2
samples/standalone/restdocs/http-server/gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=false
verifierVersion=1.2.0.BUILD-SNAPSHOT
BOM_VERSION=Dalston.BUILD-SNAPSHOT
BOM_VERSION=Edgware.BUILD-SNAPSHOT