diff --git a/README.adoc b/README.adoc index 4063470a6b..a46b696049 100644 --- a/README.adoc +++ b/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 <> section for more information. We highly recommend using the map notation! +Consult the <> 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: org.springframework.cloud spring-cloud-dependencies - ${spring-cloud-release.version} + ${spring-cloud-release-train.version} pom import diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index c091616c79..cebcc2184f 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/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"] diff --git a/docs/src/main/asciidoc/spring-cloud-contract.adoc b/docs/src/main/asciidoc/spring-cloud-contract.adoc index a0b79b8813..b6c600d7fe 100644 --- a/docs/src/main/asciidoc/spring-cloud-contract.adoc +++ b/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 diff --git a/docs/src/main/asciidoc/verifier_contract.adoc b/docs/src/main/asciidoc/verifier_contract.adoc index 9c23c7837f..cd2ddf4068 100644 --- a/docs/src/main/asciidoc/verifier_contract.adoc +++ b/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 diff --git a/docs/src/main/asciidoc/verifier_faq.adoc b/docs/src/main/asciidoc/verifier_faq.adoc index 504d44006e..b368552a18 100644 --- a/docs/src/main/asciidoc/verifier_faq.adoc +++ b/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 diff --git a/docs/src/main/asciidoc/verifier_introduction.adoc b/docs/src/main/asciidoc/verifier_introduction.adoc index 5d0b9493ae..30302124b3 100644 --- a/docs/src/main/asciidoc/verifier_introduction.adoc +++ b/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 <> section for more information. We highly recommend using the map notation! +Consult the <> 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]. diff --git a/docs/src/main/asciidoc/verifier_setup.adoc b/docs/src/main/asciidoc/verifier_setup.adoc index 4ab26828de..ec5394fcad 100644 --- a/docs/src/main/asciidoc/verifier_setup.adoc +++ b/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. diff --git a/docs/src/main/asciidoc/verifier_stubrunner_msg.adoc b/docs/src/main/asciidoc/verifier_stubrunner_msg.adoc index 5402d775ec..725c4e8db9 100644 --- a/docs/src/main/asciidoc/verifier_stubrunner_msg.adoc +++ b/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 diff --git a/tests/spring-cloud-contract-stub-runner-integration/README.adoc b/tests/spring-cloud-contract-stub-runner-integration/README.adoc index baba7e3ab3..ccae044b9a 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/README.adoc +++ b/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}`