Merge branch '1.0.x'

2017-04-14 17:10:17 +02:00
parent 0f870e7bab 3b00f11efc
commit 1a22c00359
32 changed files with 285 additions and 59 deletions
--- a/samples/standalone/contracts/com/example/server/pom.xml
+++ b/samples/standalone/contracts/com/example/server/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 		<spring-cloud-dependencies.version>Dalston.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
 		<excludeBuildFolders>true</excludeBuildFolders>
 	</properties>
--- a/samples/standalone/dsl/http-server/gradle.properties
+++ b/samples/standalone/dsl/http-server/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=false
-verifierVersion=1.1.0.BUILD-SNAPSHOT
+verifierVersion=1.1.1.BUILD-SNAPSHOT
 BOM_VERSION=Dalston.BUILD-SNAPSHOT
--- a/samples/standalone/dsl/http-server/pom.xml
+++ b/samples/standalone/dsl/http-server/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 		<spring-cloud-dependencies.version>Dalston.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
 	</properties>

@@ -42,10 +42,10 @@

 		<!-- tag::verifier_test_dependencies[] -->
 		<dependency>
-		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-starter-contract-verifier</artifactId>
-		<scope>test</scope>
-	</dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-contract-verifier</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- end::verifier_test_dependencies[] -->
 	</dependencies>

--- a/samples/standalone/dsl/pom.xml
+++ b/samples/standalone/dsl/pom.xml
@@ -17,7 +17,7 @@
 	<description>Spring Cloud Contract Standalone Test Samples used for end to end tests</description>

 	<properties>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<modules>
--- a/samples/standalone/messaging/pom.xml
+++ b/samples/standalone/messaging/pom.xml
@@ -17,7 +17,7 @@
 	<description>Spring Cloud Contract Standalone Test Samples used for end to end tests</description>

 	<properties>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<modules>
--- a/samples/standalone/messaging/stream-sink/gradle.properties
+++ b/samples/standalone/messaging/stream-sink/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=false
-verifierVersion=1.1.0.BUILD-SNAPSHOT
+verifierVersion=1.1.1.BUILD-SNAPSHOT
 BOM_VERSION=Dalston.BUILD-SNAPSHOT
--- a/samples/standalone/messaging/stream-sink/pom.xml
+++ b/samples/standalone/messaging/stream-sink/pom.xml
@@ -21,7 +21,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<!-- tag::jars[] -->
--- a/samples/standalone/messaging/stream-source/build.gradle
+++ b/samples/standalone/messaging/stream-source/build.gradle
@@ -9,6 +9,8 @@ buildscript {
 	dependencies {
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.0.BUILD-SNAPSHOT"
 		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"
 	}
 }

@@ -51,7 +53,9 @@ dependencies {
 	compile("org.springframework.cloud:spring-cloud-starter-stream-rabbit")

 	testCompile 'org.springframework.cloud:spring-cloud-starter-contract-verifier'
-	testCompile("org.springframework.cloud:spring-cloud-stream-test-support")
+	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"
 }

 task stubsJar(type: Jar, dependsOn: "generateWireMockClientStubs") {
--- a/samples/standalone/messaging/stream-source/gradle.properties
+++ b/samples/standalone/messaging/stream-source/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=false
-verifierVersion=1.1.0.BUILD-SNAPSHOT
+verifierVersion=1.1.1.BUILD-SNAPSHOT
 BOM_VERSION=Dalston.BUILD-SNAPSHOT
--- a/samples/standalone/messaging/stream-source/pom.xml
+++ b/samples/standalone/messaging/stream-source/pom.xml
@@ -21,7 +21,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
@@ -42,6 +42,31 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier</artifactId>
+			<version>${spring-cloud-contract.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.jayway.restassured</groupId>
+					<artifactId>rest-assured</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.jayway.restassured</groupId>
+					<artifactId>spring-mock-mvc</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- Example of overriding Rest Assured version -->
+		<dependency>
+			<groupId>io.rest-assured</groupId>
+			<artifactId>rest-assured</artifactId>
+			<version>3.0.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.rest-assured</groupId>
+			<artifactId>spring-mock-mvc</artifactId>
+			<version>3.0.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -77,6 +102,22 @@
 						</baseClassMapping>
 					</baseClassMappings>
 				</configuration>
+
+				<!-- 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>
+						<artifactId>rest-assured</artifactId>
+						<version>3.0.2</version>
+						<scope>compile</scope>
+					</dependency>
+					<dependency>
+						<groupId>io.rest-assured</groupId>
+						<artifactId>spring-mock-mvc</artifactId>
+						<version>3.0.2</version>
+						<scope>compile</scope>
+					</dependency>
+				</dependencies>
 			</plugin>

 			<plugin>
--- a/samples/standalone/messaging/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
+++ b/samples/standalone/messaging/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java
@@ -16,11 +16,14 @@

 package com.example.source;

+import io.restassured.module.mockmvc.RestAssuredMockMvc;
+import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.context.WebApplicationContext;

 /**
 * Base class for sensor autogenerated tests (used by Spring Cloud Contract).
@@ -37,6 +40,14 @@ public abstract class SensorSourceTestBase {
 	@Autowired
 	ContractVerifierSampleStreamSourceApplication application;

+	@Autowired
+	WebApplicationContext context;
+
+	@Before
+	public void setup() {
+		RestAssuredMockMvc.webAppContextSetup(this.context);
+	}
+
 	public void createSensorData() {
 		application.poll();
 	}
--- a/samples/standalone/messaging/stream-source/src/test/resources/contracts/shouldReturnOkWhenServiceIsHealthy.groovy
+++ b/samples/standalone/messaging/stream-source/src/test/resources/contracts/shouldReturnOkWhenServiceIsHealthy.groovy
@@ -0,0 +1,11 @@
+package contracts
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		method(GET())
+		url("/health")
+	}
+	response {
+		status(200)
+	}
+}
--- a/samples/standalone/pact/pact-http-server/gradle.properties
+++ b/samples/standalone/pact/pact-http-server/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=false
-verifierVersion=1.1.0.BUILD-SNAPSHOT
+verifierVersion=1.1.1.BUILD-SNAPSHOT
 BOM_VERSION=Dalston.BUILD-SNAPSHOT
--- a/samples/standalone/pact/pact-http-server/pom.xml
+++ b/samples/standalone/pact/pact-http-server/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 		<spring-cloud-dependencies.version>Dalston.BUILD-SNAPSHOT</spring-cloud-dependencies.version>
 	</properties>

--- a/samples/standalone/pact/pom.xml
+++ b/samples/standalone/pact/pom.xml
@@ -17,7 +17,7 @@
 	<description>Spring Cloud Contract Standalone Test Samples used for end to end tests with Pact</description>

 	<properties>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<modules>
--- a/samples/standalone/restdocs/http-client/gradle.properties
+++ b/samples/standalone/restdocs/http-client/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=false
-verifierVersion=1.1.0.BUILD-SNAPSHOT
+verifierVersion=1.1.1.BUILD-SNAPSHOT
 BOM_VERSION=Dalston.BUILD-SNAPSHOT
--- a/samples/standalone/restdocs/http-client/pom.xml
+++ b/samples/standalone/restdocs/http-client/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 		<spring-cloud-commons.version>1.1.8.RELEASE</spring-cloud-commons.version>
 	</properties>

--- a/samples/standalone/restdocs/http-server/gradle.properties
+++ b/samples/standalone/restdocs/http-server/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=false
-verifierVersion=1.1.0.BUILD-SNAPSHOT
+verifierVersion=1.1.1.BUILD-SNAPSHOT
 BOM_VERSION=Dalston.BUILD-SNAPSHOT
--- a/samples/standalone/restdocs/http-server/pom.xml
+++ b/samples/standalone/restdocs/http-server/pom.xml
@@ -20,7 +20,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/standalone/restdocs/pom.xml
+++ b/samples/standalone/restdocs/pom.xml
@@ -17,7 +17,7 @@
 	<description>Spring Cloud Contract Standalone Test Samples used for end to end tests</description>

 	<properties>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<modules>
--- a/samples/wiremock-jetty/pom.xml
+++ b/samples/wiremock-jetty/pom.xml
@@ -21,7 +21,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/wiremock-native/pom.xml
+++ b/samples/wiremock-native/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<jetty.version>9.2.13.v20150730</jetty.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/wiremock-tomcat/pom.xml
+++ b/samples/wiremock-tomcat/pom.xml
@@ -21,7 +21,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/wiremock-undertow-ssl/pom.xml
+++ b/samples/wiremock-undertow-ssl/pom.xml
@@ -21,7 +21,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/wiremock-undertow/pom.xml
+++ b/samples/wiremock-undertow/pom.xml
@@ -21,7 +21,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>1.1.1.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>