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

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.2.2.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-docs</artifactId>
@@ -16,7 +16,7 @@
<docs.main>spring-cloud-contract</docs.main>
<main.basedir>${basedir}/..</main.basedir>
<maven.plugin.plugin.version>3.4</maven.plugin.plugin.version>
<docs.whitelisted.branches>1.0.x,1.1.x</docs.whitelisted.branches>
<docs.whitelisted.branches>1.0.x,1.1.x,2.0.x</docs.whitelisted.branches>
</properties>
<build>
<plugins>