diff --git a/README.adoc b/README.adoc index 84644f2332..c236be76fc 100644 --- a/README.adoc +++ b/README.adoc @@ -19,7 +19,6 @@ If you prefer to learn about the project by doing some tutorials, you can check workshops under https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. - == Project page You can read more about Spring Cloud Contract by going to https://spring.io/projects/spring-cloud-contract[the project page] @@ -208,6 +207,39 @@ IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply chec == How to Build Spring Cloud Contract +=== Cloning the repository on Windows + +While cloning this project on Windows, some files in the git repository may exceed the Windows maximum file path limit of 255 characters, which may +result in an incorrectly (probably partially) checked out repository. + +To resolve this issue, you can set the `core.longPaths` attribute to `true` or clone the Spring Cloud Contract repository. + +To set the `core.longPaths` attribute to `true`, you have three options: + +- Change it for all users of the machine (doing so requires administrator privileges): + + +[source,bash] +---- +git config --system core.longPaths true +git clone https://github.com/spring-cloud/spring-cloud-contract.git +---- + +- Change it for the current user (no administrative privileges required): + +[source,bash] +---- +git config --global core.longPaths true +git clone https://github.com/spring-cloud/spring-cloud-contract.git +---- + +- Change for just this repository (administrative privileges depend on where the repository is being cloned to): + +[source,bash] +---- +git clone -c core.longPaths true https://github.com/spring-cloud/spring-cloud-contract.git +---- + IMPORTANT: You need to have all the necessary Groovy plugins installed for your IDE to properly resolve the sources. For example, in Intellij IDEA, having both the Eclipse Groovy Compiler Plugin and the GMavenPlus Intellij diff --git a/docker/pom.xml b/docker/pom.xml index f2019e0600..c06eebf106 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-docker-parent pom - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE Spring Cloud Contract Docker Parent Spring Cloud Contract Docker Parent diff --git a/docker/spring-cloud-contract-docker/pom.xml b/docker/spring-cloud-contract-docker/pom.xml index a0ee865e60..ec45d11256 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -12,13 +12,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-docker pom - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE Spring Cloud Contract Docker Spring Cloud Contract Docker diff --git a/docker/spring-cloud-contract-docker/project/gradle.properties b/docker/spring-cloud-contract-docker/project/gradle.properties index d1e9d2eabe..702e23dadb 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,2 +1,2 @@ org.gradle.daemon=false -verifierVersion=2.2.6.BUILD-SNAPSHOT +verifierVersion=2.2.6.RELEASE diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 15430519a5..b4aa462aaf 100644 --- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml +++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-docker pom - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index 2d103851f6..652db85171 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-docs diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 96f6b92343..be24854e0a 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,46 +1,46 @@ |=== |Name | Default | Description -|stubrunner.amqp.enabled | false | Whether to enable support for Stub Runner and AMQP. -|stubrunner.amqp.mockCOnnection | true | Whether to enable support for Stub Runner and AMQP mocked connection factory. -|stubrunner.classifier | stubs | The classifier to use by default in ivy co-ordinates for a stub. -|stubrunner.cloud.consul.enabled | true | Whether to enable stubs registration in Consul. -|stubrunner.cloud.delegate.enabled | true | Whether to enable DiscoveryClient's Stub Runner implementation. -|stubrunner.cloud.enabled | true | Whether to enable Spring Cloud support for Stub Runner. -|stubrunner.cloud.eureka.enabled | true | Whether to enable stubs registration in Eureka. -|stubrunner.cloud.loadbalancer.enabled | true | Whether to enable Stub Runner's Spring Cloud Load Balancer integration. -|stubrunner.cloud.stubbed.discovery.enabled | true | Whether Service Discovery should be stubbed for Stub Runner. If set to false, stubs will get registered in real service discovery. -|stubrunner.cloud.zookeeper.enabled | true | Whether to enable stubs registration in Zookeeper. +|stubrunner.amqp.enabled | `false` | Whether to enable support for Stub Runner and AMQP. +|stubrunner.amqp.mockCOnnection | `true` | Whether to enable support for Stub Runner and AMQP mocked connection factory. +|stubrunner.classifier | `stubs` | The classifier to use by default in ivy co-ordinates for a stub. +|stubrunner.cloud.consul.enabled | `true` | Whether to enable stubs registration in Consul. +|stubrunner.cloud.delegate.enabled | `true` | Whether to enable DiscoveryClient's Stub Runner implementation. +|stubrunner.cloud.enabled | `true` | Whether to enable Spring Cloud support for Stub Runner. +|stubrunner.cloud.eureka.enabled | `true` | Whether to enable stubs registration in Eureka. +|stubrunner.cloud.loadbalancer.enabled | `true` | Whether to enable Stub Runner's Spring Cloud Load Balancer integration. +|stubrunner.cloud.stubbed.discovery.enabled | `true` | Whether Service Discovery should be stubbed for Stub Runner. If set to false, stubs will get registered in real service discovery. +|stubrunner.cloud.zookeeper.enabled | `true` | Whether to enable stubs registration in Zookeeper. |stubrunner.consumer-name | | You can override the default {@code spring.application.name} of this field by setting a value to this parameter. -|stubrunner.delete-stubs-after-test | true | If set to {@code false} will NOT delete stubs from a temporary folder after running tests. -|stubrunner.fail-on-no-stubs | true | When enabled, this flag will tell stub runner to throw an exception when no stubs / contracts were found. -|stubrunner.generate-stubs | false | When enabled, this flag will tell stub runner to not load the generated stubs, but convert the found contracts at runtime to a stub format and run those stubs. +|stubrunner.delete-stubs-after-test | `true` | If set to {@code false} will NOT delete stubs from a temporary folder after running tests. +|stubrunner.fail-on-no-stubs | `true` | When enabled, this flag will tell stub runner to throw an exception when no stubs / contracts were found. +|stubrunner.generate-stubs | `false` | When enabled, this flag will tell stub runner to not load the generated stubs, but convert the found contracts at runtime to a stub format and run those stubs. |stubrunner.http-server-stub-configurer | | Configuration for an HTTP server stub. -|stubrunner.ids | [] | The ids of the stubs to run in "ivy" notation ([groupId]:artifactId:[version]:[classifier][:port]). {@code groupId}, {@code classifier}, {@code version} and {@code port} can be optional. +|stubrunner.ids | `[]` | The ids of the stubs to run in "ivy" notation ([groupId]:artifactId:[version]:[classifier][:port]). {@code groupId}, {@code classifier}, {@code version} and {@code port} can be optional. |stubrunner.ids-to-service-ids | | Mapping of Ivy notation based ids to serviceIds inside your application. Example "a:b" -> "myService" "artifactId" -> "myOtherService" -|stubrunner.integration.enabled | true | Whether to enable Stub Runner integration with Spring Integration. -|stubrunner.jms.enabled | true | Whether to enable Stub Runner integration with Spring JMS. -|stubrunner.kafka.enabled | true | Whether to enable Stub Runner integration with Spring Kafka. -|stubrunner.kafka.initializer.enabled | true | Whether to allow Stub Runner to take care of polling for messages instead of the KafkaStubMessages component. The latter should be used only on the producer side. +|stubrunner.integration.enabled | `true` | Whether to enable Stub Runner integration with Spring Integration. +|stubrunner.jms.enabled | `true` | Whether to enable Stub Runner integration with Spring JMS. +|stubrunner.kafka.enabled | `true` | Whether to enable Stub Runner integration with Spring Kafka. +|stubrunner.kafka.initializer.enabled | `true` | Whether to allow Stub Runner to take care of polling for messages instead of the KafkaStubMessages component. The latter should be used only on the producer side. |stubrunner.mappings-output-folder | | Dumps the mappings of each HTTP server to the selected folder. -|stubrunner.max-port | 15000 | Max value of a port for the automatically started WireMock server. -|stubrunner.min-port | 10000 | Min value of a port for the automatically started WireMock server. +|stubrunner.max-port | `15000` | Max value of a port for the automatically started WireMock server. +|stubrunner.min-port | `10000` | Min value of a port for the automatically started WireMock server. |stubrunner.password | | Repository password. |stubrunner.properties | | Map of properties that can be passed to custom {@link org.springframework.cloud.contract.stubrunner.StubDownloaderBuilder}. |stubrunner.proxy-host | | Repository proxy host. |stubrunner.proxy-port | | Repository proxy port. -|stubrunner.stream.enabled | true | Whether to enable Stub Runner integration with Spring Cloud Stream. +|stubrunner.stream.enabled | `true` | Whether to enable Stub Runner integration with Spring Cloud Stream. |stubrunner.stubs-mode | | Pick where the stubs should come from. -|stubrunner.stubs-per-consumer | false | Should only stubs for this particular consumer get registered in HTTP server stub. +|stubrunner.stubs-per-consumer | `false` | Should only stubs for this particular consumer get registered in HTTP server stub. |stubrunner.username | | Repository username. -|wiremock.placeholders.enabled | true | Flag to indicate that http URLs in generated wiremock stubs should be filtered to add or resolve a placeholder for a dynamic port. -|wiremock.reset-mappings-after-each-test | false | -|wiremock.rest-template-ssl-enabled | false | -|wiremock.server.files | [] | -|wiremock.server.https-port | -1 | -|wiremock.server.https-port-dynamic | false | -|wiremock.server.port | 8080 | -|wiremock.server.port-dynamic | false | -|wiremock.server.stubs | [] | +|wiremock.placeholders.enabled | `true` | Flag to indicate that http URLs in generated wiremock stubs should be filtered to add or resolve a placeholder for a dynamic port. +|wiremock.reset-mappings-after-each-test | `false` | +|wiremock.rest-template-ssl-enabled | `false` | +|wiremock.server.files | `[]` | +|wiremock.server.https-port | `-1` | +|wiremock.server.https-port-dynamic | `false` | +|wiremock.server.port | `8080` | +|wiremock.server.port-dynamic | `false` | +|wiremock.server.stubs | `[]` | |=== \ No newline at end of file diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index 40ad652b24..15eccfb38c 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,14 +11,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT + Hoxton.SR10 diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index 1596efd18c..5d390a2a8d 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT - 2.2.6.BUILD-SNAPSHOT + Hoxton.SR10 + 2.2.6.RELEASE diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index a2053a97b9..f716606403 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index d999c116a5..0b8feb9990 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT - 2.2.6.BUILD-SNAPSHOT + Hoxton.SR10 + 2.2.6.RELEASE diff --git a/guides/pom.xml b/guides/pom.xml index 0b1bc4aee4..4cc29ede55 100644 --- a/guides/pom.xml +++ b/guides/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-guides diff --git a/pom.xml b/pom.xml index c1312b595d..d9e4082d64 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.RELEASE spring-cloud-contract-parent pom - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE Spring Cloud Contract Spring Cloud Contract @@ -28,15 +28,15 @@ 2.17 3.6.14 0.0.9 - 2.3.1.RELEASE - 2.2.5.BUILD-SNAPSHOT - Horsham.SR9 + 2.3.2.RELEASE + 2.2.4.RELEASE + Horsham.SR11 3.0.4.RELEASE - 2.2.7.BUILD-SNAPSHOT - 2.2.6.BUILD-SNAPSHOT - 2.2.7.BUILD-SNAPSHOT - 3.0.11.RELEASE + 2.2.7.RELEASE + 2.2.6.RELEASE + 2.2.7.RELEASE + 3.0.13.RELEASE 5.0.4 3.2.9 1.3-groovy-2.5 diff --git a/samples/pom.xml b/samples/pom.xml index 7742684035..ac95e4238e 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-samples pom - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index b4831a4e2e..e2ba90ba93 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-samples-standalone pom - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE Spring Cloud Contract Standalone Test Samples Spring Cloud Contract Standalone Test Samples used for end to end tests diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index cff9c4eb98..83d025c028 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE UTF-8 1.8 - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index 434f994d24..bc9f2181b1 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE UTF-8 1.8 - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 37d146a8f1..2a28cc61cc 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE UTF-8 1.8 - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index 1bab5a461e..f9480d6c9e 100644 --- a/samples/wiremock-undertow-ssl/pom.xml +++ b/samples/wiremock-undertow-ssl/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow-ssl - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE UTF-8 1.8 - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 78f2542b58..d3dd8a6295 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE UTF-8 1.8 - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index b011f8ad82..4a2a49592e 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.8.RELEASE UTF-8 1.8 - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE diff --git a/specs/pom.xml b/specs/pom.xml index 1a87c9cb61..f9eb18818f 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-specs pom - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE Spring Cloud Contract Specs Spring Cloud Contract Specs diff --git a/specs/spring-cloud-contract-spec-groovy/pom.xml b/specs/spring-cloud-contract-spec-groovy/pom.xml index 81ab77c3a8..b8998bf4db 100644 --- a/specs/spring-cloud-contract-spec-groovy/pom.xml +++ b/specs/spring-cloud-contract-spec-groovy/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE ../.. spring-cloud-contract-spec-groovy diff --git a/specs/spring-cloud-contract-spec-java/pom.xml b/specs/spring-cloud-contract-spec-java/pom.xml index ba5df52c50..44acba4558 100644 --- a/specs/spring-cloud-contract-spec-java/pom.xml +++ b/specs/spring-cloud-contract-spec-java/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE ../.. spring-cloud-contract-spec-java diff --git a/specs/spring-cloud-contract-spec-kotlin/pom.xml b/specs/spring-cloud-contract-spec-kotlin/pom.xml index e345022924..75f52db57f 100644 --- a/specs/spring-cloud-contract-spec-kotlin/pom.xml +++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE ../.. spring-cloud-contract-spec-kotlin diff --git a/specs/spring-cloud-contract-spec/pom.xml b/specs/spring-cloud-contract-spec/pom.xml index 9d3160d6df..05f0d723d0 100644 --- a/specs/spring-cloud-contract-spec/pom.xml +++ b/specs/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE ../.. spring-cloud-contract-spec diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index e5ca4d5548..f0fee89d04 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.2.BUILD-SNAPSHOT + 2.3.2.RELEASE spring-cloud-contract-dependencies - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE pom spring-cloud-contract-dependencies Spring Cloud Contract Dependencies diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml index 225fa0b747..4a180ff9c1 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 971e3de538..0ebc8228e7 100644 --- a/spring-cloud-contract-starters/pom.xml +++ b/spring-cloud-contract-starters/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml index e7295d3708..469423d792 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-starters - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-starter-contract-stub-runner-jetty diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml index 1d05afb4d6..832c9dd2ba 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-contract-starters - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-starter-contract-stub-runner diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml index 92f0cb5f28..b597e3c105 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-starters - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-starter-contract-verifier diff --git a/spring-cloud-contract-stub-runner-boot/pom.xml b/spring-cloud-contract-stub-runner-boot/pom.xml index 1662527ede..94519d95f8 100644 --- a/spring-cloud-contract-stub-runner-boot/pom.xml +++ b/spring-cloud-contract-stub-runner-boot/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-boot diff --git a/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/pom.xml index 16cd79981f..b1b1bb1e63 100644 --- a/spring-cloud-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-stub-runner/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/kafka/StubRunnerKafkaRouter.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/kafka/StubRunnerKafkaRouter.java index 907085a5fe..4ba930dfb4 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/kafka/StubRunnerKafkaRouter.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/kafka/StubRunnerKafkaRouter.java @@ -68,13 +68,16 @@ class StubRunnerKafkaRouter implements MessageListener { } Message message = messageConverter.toMessage(data, null, null, null); Contract dsl = this.selector.matchingContract(message); - if (dsl != null && dsl.getOutputMessage() != null && dsl.getOutputMessage().getSentTo() != null) { + if (dsl != null && dsl.getOutputMessage() != null + && dsl.getOutputMessage().getSentTo() != null) { String destination = dsl.getOutputMessage().getSentTo().getClientValue(); if (log.isDebugEnabled()) { - log.debug("Found a matching contract with an output message. Will send it to the [" + destination - + "] destination"); + log.debug( + "Found a matching contract with an output message. Will send it to the [" + + destination + "] destination"); } - Message transform = new StubRunnerKafkaTransformer(this.contracts).transform(dsl); + Message transform = new StubRunnerKafkaTransformer(this.contracts) + .transform(dsl); String defaultTopic = kafkaTemplate().getDefaultTopic(); try { kafkaTemplate().setDefaultTopic(destination); @@ -87,7 +90,8 @@ class StubRunnerKafkaRouter implements MessageListener { } @Override - public void onMessage(ConsumerRecord data, Acknowledgment acknowledgment) { + public void onMessage(ConsumerRecord data, + Acknowledgment acknowledgment) { onMessage(data); } @@ -97,7 +101,8 @@ class StubRunnerKafkaRouter implements MessageListener { } @Override - public void onMessage(ConsumerRecord data, Acknowledgment acknowledgment, Consumer consumer) { + public void onMessage(ConsumerRecord data, + Acknowledgment acknowledgment, Consumer consumer) { onMessage(data); } diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 82a7ea4ce1..b94d5d8b26 100644 --- a/spring-cloud-contract-tools/pom.xml +++ b/spring-cloud-contract-tools/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml index 7f2a731fb7..940e7629e3 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-converters diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties index 1a7a16337a..ec5ac39617 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties @@ -15,7 +15,7 @@ # nexusUsername= nexusPassword= -verifierVersion=2.2.6.BUILD-SNAPSHOT +verifierVersion=2.2.6.RELEASE org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=2.3.1.RELEASE +springCloudBuildVersion=2.3.2.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml index 9165bb1c72..87ca64ccda 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties index 7ae9189547..1a1304f705 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.6.BUILD-SNAPSHOT +verifierVersion=2.2.6.RELEASE groovyVersion=2.5.10 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties index 2b6f1589c4..1ba4bf92cd 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties @@ -15,6 +15,6 @@ # wiremockVersion=2.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.6.BUILD-SNAPSHOT -bootVersion=2.3.5.RELEASE +verifierVersion=2.2.6.RELEASE +bootVersion=2.3.8.RELEASE groovyVersion=2.5.10 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index b92d0f43fa..2d3469ae7e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -15,6 +15,6 @@ # wiremockVersion=2.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.6.BUILD-SNAPSHOT -bootVersion=2.3.5.RELEASE +verifierVersion=2.2.6.RELEASE +bootVersion=2.3.8.RELEASE groovyVersion=2.5.10 \ No newline at end of file diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml index 998a8f791e..d0769aa88d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index a8120e416f..6c55ad9a27 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml index 0e6803043a..5cbfd42dcb 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index 486532b0aa..651924437f 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/ContractVerifierKafkaStubMessagesInitializer.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/ContractVerifierKafkaStubMessagesInitializer.java index 8c9f2988ee..0a2d2e7693 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/ContractVerifierKafkaStubMessagesInitializer.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/ContractVerifierKafkaStubMessagesInitializer.java @@ -29,12 +29,15 @@ import org.springframework.kafka.core.DefaultKafkaConsumerFactory; import org.springframework.kafka.test.EmbeddedKafkaBroker; import org.springframework.kafka.test.utils.KafkaTestUtils; -class ContractVerifierKafkaStubMessagesInitializer implements KafkaStubMessagesInitializer { +class ContractVerifierKafkaStubMessagesInitializer + implements KafkaStubMessagesInitializer { - private static final Log log = LogFactory.getLog(ContractVerifierKafkaStubMessagesInitializer.class); + private static final Log log = LogFactory + .getLog(ContractVerifierKafkaStubMessagesInitializer.class); @Override - public Map initialize(EmbeddedKafkaBroker broker, KafkaProperties kafkaProperties) { + public Map initialize(EmbeddedKafkaBroker broker, + KafkaProperties kafkaProperties) { Map map = new HashMap<>(); for (String topic : broker.getTopics()) { map.put(topic, prepareListener(broker, topic, kafkaProperties)); @@ -42,9 +45,10 @@ class ContractVerifierKafkaStubMessagesInitializer implements KafkaStubMessagesI return map; } - private Consumer prepareListener(EmbeddedKafkaBroker broker, String destination, KafkaProperties kafkaProperties) { - Map consumerProperties = KafkaTestUtils - .consumerProps(kafkaProperties.getConsumer().getGroupId(), "false", broker); + private Consumer prepareListener(EmbeddedKafkaBroker broker, String destination, + KafkaProperties kafkaProperties) { + Map consumerProperties = KafkaTestUtils.consumerProps( + kafkaProperties.getConsumer().getGroupId(), "false", broker); // Respect custom key/value deserializers and any additional props under // 'spring.kafka.consumer.properties' diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/KafkaStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/KafkaStubMessages.java index ec69ea4857..94a8ec5e8d 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/KafkaStubMessages.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/kafka/KafkaStubMessages.java @@ -49,10 +49,11 @@ class KafkaStubMessages implements MessageVerifier> { private final Receiver receiver; - KafkaStubMessages(KafkaTemplate kafkaTemplate, EmbeddedKafkaBroker broker, KafkaProperties kafkaProperties, - KafkaStubMessagesInitializer initializer) { + KafkaStubMessages(KafkaTemplate kafkaTemplate, EmbeddedKafkaBroker broker, + KafkaProperties kafkaProperties, KafkaStubMessagesInitializer initializer) { this.kafkaTemplate = kafkaTemplate; - Map topicToConsumer = initializer.initialize(broker, kafkaProperties); + Map topicToConsumer = initializer.initialize(broker, + kafkaProperties); this.receiver = new Receiver(topicToConsumer); } @@ -62,7 +63,8 @@ class KafkaStubMessages implements MessageVerifier> { try { this.kafkaTemplate.setDefaultTopic(destination); if (log.isDebugEnabled()) { - log.debug("Will send a message [" + message + "] to destination [" + destination + "]"); + log.debug("Will send a message [" + message + "] to destination [" + + destination + "]"); } this.kafkaTemplate.send(message).get(5, TimeUnit.SECONDS); this.kafkaTemplate.flush(); @@ -87,7 +89,8 @@ class KafkaStubMessages implements MessageVerifier> { @Override public void send(Object payload, Map headers, String destination) { - Message message = MessageBuilder.createMessage(payload, new MessageHeaders(headers)); + Message message = MessageBuilder.createMessage(payload, + new MessageHeaders(headers)); send(message, destination); } @@ -108,9 +111,11 @@ class Receiver { Message receive(String topic, long timeout, TimeUnit timeUnit) { Consumer consumer = this.consumers.get(topic); if (consumer == null) { - throw new IllegalStateException("No consumer set up for topic [" + topic + "]"); + throw new IllegalStateException( + "No consumer set up for topic [" + topic + "]"); } - ConsumerRecord record = KafkaTestUtils.getSingleRecord(consumer, topic, timeUnit.toMillis(timeout)); + ConsumerRecord record = KafkaTestUtils.getSingleRecord(consumer, topic, + timeUnit.toMillis(timeout)); if (log.isDebugEnabled()) { log.debug("Got a single record for destination [" + topic + "]"); } @@ -121,9 +126,10 @@ class Receiver { Map headersMap = toMap(record.headers()); // Leverage spring-kafka to add the headers - messagingMessageConverter.commonHeaders(null, consumer, headersMap, record.key(), record.topic(), - record.partition(), record.offset(), - record.timestampType() != null ? record.timestampType().name() : null, record.timestamp()); + messagingMessageConverter.commonHeaders(null, consumer, headersMap, record.key(), + record.topic(), record.partition(), record.offset(), + record.timestampType() != null ? record.timestampType().name() : null, + record.timestamp()); // commonHeaders() maps the record key under 'kafka_receivedMessageKey' - put // under 'kafka_messageKey' as well to satisfy both client/server usages as there // is not currently a way to set a header name based on client/server @@ -136,18 +142,21 @@ class Receiver { if (textPayload instanceof String && ((String) textPayload).contains("payload") && ((String) textPayload).contains("headers")) { try { - Object object = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE).parse((String) textPayload); + Object object = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE) + .parse((String) textPayload); JSONObject jo = (JSONObject) object; String payload = (String) jo.get("payload"); JSONObject headersInJson = (JSONObject) jo.get("headers"); headersMap.putAll(headersInJson); - return MessageBuilder.createMessage(unquoted(payload), new MessageHeaders(headersMap)); + return MessageBuilder.createMessage(unquoted(payload), + new MessageHeaders(headersMap)); } catch (ParseException ex) { throw new IllegalStateException(ex); } } - return MessageBuilder.createMessage(unquoted(textPayload), new MessageHeaders(headersMap)); + return MessageBuilder.createMessage(unquoted(textPayload), + new MessageHeaders(headersMap)); } private Map toMap(Headers headers) { @@ -159,9 +168,11 @@ class Receiver { } private Object unquoted(Object value) { - String textPayload = value instanceof byte[] ? new String((byte[]) value) : value.toString(); + String textPayload = value instanceof byte[] ? new String((byte[]) value) + : value.toString(); if (textPayload.startsWith("\"") && textPayload.endsWith("\"")) { - return textPayload.substring(1, textPayload.length() - 1).replace("\\\"", "\""); + return textPayload.substring(1, textPayload.length() - 1).replace("\\\"", + "\""); } return textPayload; } diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index b35333e0a1..92521a0c87 100644 --- a/spring-cloud-contract-wiremock/pom.xml +++ b/spring-cloud-contract-wiremock/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 27ad713a73..fa6380e49c 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index a747985e2b..82ae942738 100644 --- a/tests/samples-messaging-amqp/pom.xml +++ b/tests/samples-messaging-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-amqp/src/main/java/com/example/RabbitManager.java b/tests/samples-messaging-amqp/src/main/java/com/example/RabbitManager.java index 7b1012b927..8501334936 100644 --- a/tests/samples-messaging-amqp/src/main/java/com/example/RabbitManager.java +++ b/tests/samples-messaging-amqp/src/main/java/com/example/RabbitManager.java @@ -60,25 +60,29 @@ public class RabbitManager { this.rabbitTemplate = rabbitTemplate; } - @RabbitListener(bindings = @QueueBinding(value = @Queue, - exchange = @Exchange(value = "input", durable = "true", autoDelete = "false", type = "topic"), - key = "event")) + @RabbitListener( + bindings = @QueueBinding( + value = @Queue, exchange = @Exchange(value = "input", + durable = "true", autoDelete = "false", type = "topic"), + key = "event")) // Workaround for https://github.com/spring-projects/spring-amqp/issues/1285 // public void newBook(Book book, @Headers Map headers) { public void newBook(Book book, @Header("amqp_replyTo") String replyTo) { LOG.info("Received new book with bookname = " + book.getName()); -// LOG.info("Headers = " + headers); + // LOG.info("Headers = " + headers); this.service.sendBook(book, replyTo); } - @RabbitListener(bindings = @QueueBinding(value = @Queue, - exchange = @Exchange(value = "input", durable = "true", autoDelete = "false", type = "topic"), - key = "event2")) + @RabbitListener( + bindings = @QueueBinding( + value = @Queue, exchange = @Exchange(value = "input", + durable = "true", autoDelete = "false", type = "topic"), + key = "event2")) // Workaround for https://github.com/spring-projects/spring-amqp/issues/1285 // public void newBook2(Book book, @Headers Map headers) { public void newBook2(Book book, @Header("amqp_replyTo") String replyTo) { LOG.info("newBook2 Received new book with bookname = " + book.getName()); -// LOG.info("newBook2 Headers = " + headers); + // LOG.info("newBook2 Headers = " + headers); this.service.sendBook(book, replyTo); } diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 27f76e26e6..a8a58e10ea 100644 --- a/tests/samples-messaging-camel/pom.xml +++ b/tests/samples-messaging-camel/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index 948a72319d..8e4f897acd 100644 --- a/tests/samples-messaging-integration/pom.xml +++ b/tests/samples-messaging-integration/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-jms/pom.xml b/tests/samples-messaging-jms/pom.xml index 1be6734d7e..0c5e0a9d63 100644 --- a/tests/samples-messaging-jms/pom.xml +++ b/tests/samples-messaging-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-sample-jms diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index 1eecad531b..579ebc5b42 100644 --- a/tests/samples-messaging-stream/pom.xml +++ b/tests/samples-messaging-stream/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-sample-stream diff --git a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml index 404ff4b775..7b502387bd 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-amqp diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml index 0cfa5dfe81..1dd779154a 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-boot-eureka diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml index 0e1fc52d98..a283bff20c 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-boot-zookeeper diff --git a/tests/spring-cloud-contract-stub-runner-camel/pom.xml b/tests/spring-cloud-contract-stub-runner-camel/pom.xml index 2bb5655152..545b366462 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-camel/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-camel diff --git a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml index 41c2f9604b..66e0a94d85 100644 --- a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-context-path diff --git a/tests/spring-cloud-contract-stub-runner-integration/pom.xml b/tests/spring-cloud-contract-stub-runner-integration/pom.xml index b70589de3d..18857294c0 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-integration/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-jms/pom.xml b/tests/spring-cloud-contract-stub-runner-jms/pom.xml index bec1125864..db7c043c6f 100644 --- a/tests/spring-cloud-contract-stub-runner-jms/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-jms diff --git a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml index d0147cd2d1..d7a12b0f20 100644 --- a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-kafka diff --git a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml index 560bc7ddd6..0449e343be 100644 --- a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-moco-contract-jar diff --git a/tests/spring-cloud-contract-stub-runner-moco/pom.xml b/tests/spring-cloud-contract-stub-runner-moco/pom.xml index 631f65dee3..c2dc1a4535 100644 --- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-moco diff --git a/tests/spring-cloud-contract-stub-runner-stream/pom.xml b/tests/spring-cloud-contract-stub-runner-stream/pom.xml index b60c13801d..86ee9b8e7b 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-stream/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-contract-stub-runner-stream