Merge branch 'master' into 2.0.x

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

@@ -363,7 +363,7 @@ for the following configuration file:
 
 [source,yml,indent=0]
 ----
-include::src/test/resources/application-test.yml[]
+include::src/test/resources/application-test.yml[tags=test]
 ----
 
 Instead of using the properties you can also use the properties inside the `@AutoConfigureStubRunner`.
@@ -414,7 +414,7 @@ for the following configuration file
 
 [source,yml,indent=0]
 ----
-include::src/test/resources/application.yml[]
+include::src/test/resources/application.yml[tags=ids]
 ----
 
 ===== Test profiles and service discovery

spring-cloud-contract-stub-runner/src/test/resources/application-test.yml

@@ -1,9 +1,11 @@
+# tag::test[]
 stubrunner:
   repositoryRoot: classpath:m2repo/repository/
   ids:
     - org.springframework.cloud.contract.verifier.stubs:loanIssuance
     - org.springframework.cloud.contract.verifier.stubs:fraudDetectionServer
     - org.springframework.cloud.contract.verifier.stubs:bootService
+# end::test[]
   cloud:
     enabled: false
 

spring-cloud-contract-stub-runner/src/test/resources/application.yml

@@ -2,7 +2,10 @@ spring.cloud:
   zookeeper.enabled: false
   consul.enabled: false
 eureka.client.enabled: false
+stubrunner.camel.enabled: false
+# tag::ids[]
 stubrunner:
   idsToServiceIds:
     ivyNotation: someValueInsideYourCode
-    fraudDetectionServer: someNameThatShouldMapFraudDetectionServer
+    fraudDetectionServer: someNameThatShouldMapFraudDetectionServer
+# end::ids[]