Revert "Revert "Merge branch 'master' into 2.0.x""

This reverts commit 822dd4b732.
This commit is contained in:
Marcin Grzejszczak
2017-12-20 16:37:38 +01:00
parent 640f8e493e
commit 80f0e66292
200 changed files with 1690 additions and 3075 deletions

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-samples-standalone</artifactId>
<version>1.2.2.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -17,7 +17,7 @@
<description>Spring Cloud Contract Standalone Test Samples used for end to end tests</description>
<properties>
<spring-cloud-contract.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<modules>