Merge branch '2.0.x'

README.adoc

@@ -1,6 +1,6 @@
 // Do not edit this file (e.g. go instead to src/main/asciidoc)
 
-:branch: master
+:branch: 2.0.x
 image::https://badges.gitter.im/Join%20Chat.svg[Gitter, link="https://gitter.im/spring-cloud/spring-cloud-contract?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 image::https://codecov.io/gh/spring-cloud/spring-cloud-contract/branch/{branch}/graph/badge.svg["codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-contract"]
 image::https://circleci.com/gh/spring-cloud/spring-cloud-contract.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-contract"]
@@ -1032,7 +1032,7 @@ of an identifier or a timestamp, you need not hardcode a value. You want to allo
 different ranges of values. To enable ranges of values, you can set regular expressions
 matching those values for the consumer side. You can provide the body by means of either
 a map notation or String with interpolations.
-Consult the <<contract_dsl>> section for more information. We highly recommend using the map notation!
+Consult the <<contract-dsl>> section for more information. We highly recommend using the map notation!
 
 TIP: You must understand the map notation in order to set up contracts. Please read the
 http://groovy-lang.org/json.html[Groovy docs regarding JSON].
@@ -1146,7 +1146,7 @@ Add the `Spring Cloud Contract` BOM:
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-dependencies</artifactId>
-            <version>${spring-cloud-release.version}</version>
+            <version>${spring-cloud-release-train.version}</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

docs/src/main/asciidoc/README.adoc

@@ -1,4 +1,4 @@
-:branch: master
+:branch: 2.0.x
 image::https://badges.gitter.im/Join%20Chat.svg[Gitter, link="https://gitter.im/spring-cloud/spring-cloud-contract?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 image::https://codecov.io/gh/spring-cloud/spring-cloud-contract/branch/{branch}/graph/badge.svg["codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-contract"]
 image::https://circleci.com/gh/spring-cloud/spring-cloud-contract.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-contract"]

docs/src/main/asciidoc/spring-cloud-contract.adoc

@@ -5,7 +5,7 @@
 :numbered:
 :icons: font
 :sectlinks: true
-:branch: master
+:branch: 2.0.x
 
 = Spring Cloud Contract
 

docs/src/main/asciidoc/verifier_contract.adoc

@@ -1,3 +1,4 @@
+[[contract-dsl]]
 == Contract DSL
 
 Spring Cloud Contract supports out of the box 2 types of DSL. One written in

docs/src/main/asciidoc/verifier_faq.adoc

@@ -1,5 +1,5 @@
 :introduction_url: https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/{branch}
-:samples_branch: 2.0.x
+:samples_branch: master
 
 == Spring Cloud Contract FAQ
 

docs/src/main/asciidoc/verifier_introduction.adoc

@@ -701,7 +701,7 @@ of an identifier or a timestamp, you need not hardcode a value. You want to allo
 different ranges of values. To enable ranges of values, you can set regular expressions
 matching those values for the consumer side. You can provide the body by means of either
 a map notation or String with interpolations.
-Consult the <<contract_dsl>> section for more information. We highly recommend using the map notation!
+Consult the <<contract-dsl>> section for more information. We highly recommend using the map notation!
 
 TIP: You must understand the map notation in order to set up contracts. Please read the
 http://groovy-lang.org/json.html[Groovy docs regarding JSON].

docs/src/main/asciidoc/verifier_setup.adoc

@@ -990,7 +990,7 @@ name of `scenario1` and the three following steps:
 . logout marked as `Step2` which will close the scenario.
 
 More details about WireMock scenarios can be found at
-http://wiremock.org/stateful-behaviour.html[http://wiremock.org/stateful-behaviour.html]
+http://wiremock.org/docs/stateful-behaviour/[http://wiremock.org/docs/stateful-behaviour/]
 
 Spring Cloud Contract Verifier also generates tests with a guaranteed order of execution.
 

docs/src/main/asciidoc/verifier_stubrunner_msg.adoc

@@ -1,3 +1,4 @@
+[[stub-runner-for-messaging]]
 == Stub Runner for Messaging
 
 Stub Runner can run the published stubs in memory. It can integrate with the following

tests/spring-cloud-contract-stub-runner-integration/README.adoc

@@ -102,7 +102,7 @@ The received message would pass the following assertions:
 include::src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/integration/IntegrationStubRunnerSpec.groovy[tags=client_trigger_message,indent=0]
 ----
 
-[[integration-scenario-1]]
+[[integration-scenario-2]]
 ===== Scenario 2 (output triggered by input)
 
 Since the route is set for you, you can send a message to the `{output_name}`