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

@@ -171,4 +171,12 @@ This exception will occur due to the fact that the tests got generated with
an old version of plugin and at test execution time you have an incompatible
version of the release train (and vice versa).
Done via https://github.com/spring-cloud/spring-cloud-contract/issues/267[issue 267]
Done via https://github.com/spring-cloud/spring-cloud-contract/issues/267[issue 267]
[[cloud-verifier-1.2-2.0]]
=== 1.2.x -> 2.0.x
==== No Camel support
We will add back Apache Camel support only after this https://issues.apache.org/jira/browse/CAMEL-11430[issue]
gets fixed

View File

@@ -5,7 +5,6 @@ frameworks:
* Spring Integration
* Spring Cloud Stream
* Apache Camel
* Spring AMQP
It also provides entry points to integrate with any other solution on the market.
@@ -39,14 +38,14 @@ or the other in your tests.
[source,groovy]
----
include::{tests_path}/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy[tags=client_trigger,indent=0]
include::{tests_path}/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy[tags=client_trigger,indent=0]
----
[[trigger-group-artifact-ids]]
==== Trigger by Group and Artifact Ids
[source,groovy]
----
include::{tests_path}/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy[tags=trigger_group_artifact,indent=0]
include::{tests_path}/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy[tags=trigger_group_artifact,indent=0]
----
[[trigger-artifact-ids]]
@@ -54,7 +53,7 @@ include::{tests_path}/spring-cloud-contract-stub-runner-camel/src/test/groovy/or
[source,groovy]
----
include::{tests_path}/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy[tags=trigger_artifact,indent=0]
include::{tests_path}/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy[tags=trigger_artifact,indent=0]
----
[[trigger-all-messages]]
@@ -62,11 +61,9 @@ include::{tests_path}/spring-cloud-contract-stub-runner-camel/src/test/groovy/or
[source,groovy]
----
include::{tests_path}/spring-cloud-contract-stub-runner-camel/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/camel/CamelStubRunnerSpec.groovy[tags=trigger_all,indent=0]
include::{tests_path}/spring-cloud-contract-stub-runner-stream/src/test/groovy/org/springframework/cloud/contract/stubrunner/messaging/stream/StreamStubRunnerSpec.groovy[tags=trigger_all,indent=0]
----
include::{tests_path}/spring-cloud-contract-stub-runner-camel/README.adoc[]
include::{tests_path}/spring-cloud-contract-stub-runner-integration/README.adoc[]
include::{tests_path}/spring-cloud-contract-stub-runner-stream/README.adoc[]