Going back to snapshots

2021-02-11 15:06:29 +00:00
parent 16c738e94d
commit c251d06260
67 changed files with 163 additions and 219 deletions
--- a/README.adoc
+++ b/README.adoc
@@ -19,6 +19,7 @@ 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]
@@ -207,39 +208,6 @@ 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
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-docker-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<name>Spring Cloud Contract Docker Parent</name>
 	<description>Spring Cloud Contract Docker Parent</description>

--- a/docker/spring-cloud-contract-docker/pom.xml
+++ b/docker/spring-cloud-contract-docker/pom.xml
@@ -12,13 +12,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-docker-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-docker</artifactId>
 	<packaging>pom</packaging>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<name>Spring Cloud Contract Docker</name>
 	<description>Spring Cloud Contract Docker</description>

--- 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.RELEASE
+verifierVersion=2.2.6.BUILD-SNAPSHOT
--- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml
+++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-docker-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-stub-runner-docker</artifactId>
 	<packaging>pom</packaging>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<name>Spring Cloud Contract Stub Runner Docker</name>
 	<description>Spring Cloud Contract Stub Runner Docker</description>

--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-docs</artifactId>
--- 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 | [] | 

 |===
--- 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Hoxton.SR10</spring-cloud.version>
+		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
 	</properties>

 	<dependencies>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Hoxton.SR10</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.6.RELEASE</spring-cloud-contract.version>
+		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Hoxton.SR10</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.6.RELEASE</spring-cloud-contract.version>
+		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/guides/pom.xml
+++ b/guides/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-guides</artifactId>
--- a/pom.xml
+++ b/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.2.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>

 	<artifactId>spring-cloud-contract-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>

 	<name>Spring Cloud Contract</name>
 	<description>Spring Cloud Contract</description>
@@ -28,15 +28,15 @@
 		<checkstyle.version>2.17</checkstyle.version>
 		<pact.version>3.6.14</pact.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
-		<spring-cloud-build.version>2.3.2.RELEASE</spring-cloud-build.version>
-		<spring-cloud-zookeeper.version>2.2.4.RELEASE</spring-cloud-zookeeper.version>
-		<spring-cloud-stream.version>Horsham.SR11</spring-cloud-stream.version>
+		<spring-cloud-build.version>2.3.1.RELEASE</spring-cloud-build.version>
+		<spring-cloud-zookeeper.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
+		<spring-cloud-stream.version>Horsham.SR9</spring-cloud-stream.version>
 		<!-- Needs to come from a sc-stream-bom -->
 		<spring-cloud-stream-test-binder.version>3.0.4.RELEASE</spring-cloud-stream-test-binder.version>
-		<spring-cloud-netflix.version>2.2.7.RELEASE</spring-cloud-netflix.version>
-		<spring-cloud-consul.version>2.2.6.RELEASE</spring-cloud-consul.version>
-		<spring-cloud-commons.version>2.2.7.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-function.version>3.0.13.RELEASE</spring-cloud-function.version>
+		<spring-cloud-netflix.version>2.2.7.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-consul.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-consul.version>
+		<spring-cloud-commons.version>2.2.7.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-function.version>3.0.11.RELEASE</spring-cloud-function.version>
 		<jopt-simple.version>5.0.4</jopt-simple.version>
 		<cglib.version>3.2.9</cglib.version>
 		<spock-spring.version>1.3-groovy-2.5</spock-spring.version>
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-samples</artifactId>
 	<packaging>pom</packaging>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<name>Spring Cloud Contract Samples</name>
 	<description>Spring Cloud Contract Samples</description>

--- a/samples/standalone/pom.xml
+++ b/samples/standalone/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-samples-standalone</artifactId>
 	<packaging>pom</packaging>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<name>Spring Cloud Contract Standalone Test Samples</name>
 	<description>Spring Cloud Contract Standalone Test Samples used for end to end tests
 	</description>
--- a/samples/wiremock-jetty/pom.xml
+++ b/samples/wiremock-jetty/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>wiremock-jetty</artifactId>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>

 	<name>wiremock-jetty</name>
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>2.2.6.RELEASE</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/wiremock-native/pom.xml
+++ b/samples/wiremock-native/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>wiremock-native</artifactId>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>

 	<name>wiremock-native</name>
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>2.2.6.RELEASE</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/wiremock-tomcat/pom.xml
+++ b/samples/wiremock-tomcat/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>wiremock-tomcat</artifactId>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>

 	<name>wiremock-tomcat</name>
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>2.2.6.RELEASE</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/wiremock-undertow-ssl/pom.xml
+++ b/samples/wiremock-undertow-ssl/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>wiremock-undertow-ssl</artifactId>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>

 	<name>wiremock-undertow-ssl</name>
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>2.2.6.RELEASE</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/wiremock-undertow/pom.xml
+++ b/samples/wiremock-undertow/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>wiremock-undertow</artifactId>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>

 	<name>wiremock-undertow</name>
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>2.2.6.RELEASE</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/wiremock/pom.xml
+++ b/samples/wiremock/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>wiremock</artifactId>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>

 	<name>wiremock</name>
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.3.5.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>2.2.6.RELEASE</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.6.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/specs/pom.xml
+++ b/specs/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-specs</artifactId>
 	<packaging>pom</packaging>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<name>Spring Cloud Contract Specs</name>
 	<description>Spring Cloud Contract Specs</description>

--- a/specs/spring-cloud-contract-spec-groovy/pom.xml
+++ b/specs/spring-cloud-contract-spec-groovy/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-spec-groovy</artifactId>
--- a/specs/spring-cloud-contract-spec-java/pom.xml
+++ b/specs/spring-cloud-contract-spec-java/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-spec-java</artifactId>
--- a/specs/spring-cloud-contract-spec-kotlin/pom.xml
+++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-spec-kotlin</artifactId>
--- a/specs/spring-cloud-contract-spec/pom.xml
+++ b/specs/spring-cloud-contract-spec/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-spec</artifactId>
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.3.2.RELEASE</version>
+		<version>2.3.2.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-contract-dependencies</artifactId>
-	<version>2.2.6.RELEASE</version>
+	<version>2.2.6.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-contract-dependencies</name>
 	<description>Spring Cloud Contract Dependencies</description>
--- a/spring-cloud-contract-shade/pom.xml
+++ b/spring-cloud-contract-shade/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-shade</artifactId>
--- a/spring-cloud-contract-starters/pom.xml
+++ b/spring-cloud-contract-starters/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-starters</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-contract-stub-runner-jetty</artifactId>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-starters</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-starters</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-contract-verifier</artifactId>
--- a/spring-cloud-contract-stub-runner-boot/pom.xml
+++ b/spring-cloud-contract-stub-runner-boot/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>
--- a/spring-cloud-contract-stub-runner/pom.xml
+++ b/spring-cloud-contract-stub-runner/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner</artifactId>
--- 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,16 +68,13 @@ class StubRunnerKafkaRouter implements MessageListener<Object, Object> {
 		}
 		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);
@@ -90,8 +87,7 @@ class StubRunnerKafkaRouter implements MessageListener<Object, Object> {
 	}

 	@Override
-	public void onMessage(ConsumerRecord<Object, Object> data,
-			Acknowledgment acknowledgment) {
+	public void onMessage(ConsumerRecord<Object, Object> data, Acknowledgment acknowledgment) {
 		onMessage(data);
 	}

@@ -101,8 +97,7 @@ class StubRunnerKafkaRouter implements MessageListener<Object, Object> {
 	}

 	@Override
-	public void onMessage(ConsumerRecord<Object, Object> data,
-			Acknowledgment acknowledgment, Consumer<?, ?> consumer) {
+	public void onMessage(ConsumerRecord<Object, Object> data, Acknowledgment acknowledgment, Consumer<?, ?> consumer) {
 		onMessage(data);
 	}

--- a/spring-cloud-contract-tools/pom.xml
+++ b/spring-cloud-contract-tools/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-converters</artifactId>
--- 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.RELEASE
+verifierVersion=2.2.6.BUILD-SNAPSHOT
 org.gradle.daemon=false
 aetherVersion=1.1.0
-springCloudBuildVersion=2.3.2.RELEASE
+springCloudBuildVersion=2.3.1.RELEASE
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- 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.RELEASE
+verifierVersion=2.2.6.BUILD-SNAPSHOT
 groovyVersion=2.5.10
--- 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.RELEASE
-bootVersion=2.3.8.RELEASE
+verifierVersion=2.2.6.BUILD-SNAPSHOT
+bootVersion=2.3.5.RELEASE
 groovyVersion=2.5.10
--- 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.RELEASE
-bootVersion=2.3.8.RELEASE
+verifierVersion=2.2.6.BUILD-SNAPSHOT
+bootVersion=2.3.5.RELEASE
 groovyVersion=2.5.10
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-pact</artifactId>
--- a/spring-cloud-contract-verifier/pom.xml
+++ b/spring-cloud-contract-verifier/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-verifier</artifactId>
--- 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,15 +29,12 @@ 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<String, Consumer> initialize(EmbeddedKafkaBroker broker,
-			KafkaProperties kafkaProperties) {
+	public Map<String, Consumer> initialize(EmbeddedKafkaBroker broker, KafkaProperties kafkaProperties) {
 		Map<String, Consumer> map = new HashMap<>();
 		for (String topic : broker.getTopics()) {
 			map.put(topic, prepareListener(broker, topic, kafkaProperties));
@@ -45,10 +42,9 @@ class ContractVerifierKafkaStubMessagesInitializer
 		return map;
 	}

-	private Consumer prepareListener(EmbeddedKafkaBroker broker, String destination,
-			KafkaProperties kafkaProperties) {
-		Map<String, Object> consumerProperties = KafkaTestUtils.consumerProps(
-				kafkaProperties.getConsumer().getGroupId(), "false", broker);
+	private Consumer prepareListener(EmbeddedKafkaBroker broker, String destination, KafkaProperties kafkaProperties) {
+		Map<String, Object> consumerProperties = KafkaTestUtils
+				.consumerProps(kafkaProperties.getConsumer().getGroupId(), "false", broker);

 		// Respect custom key/value deserializers and any additional props under
 		// 'spring.kafka.consumer.properties'
--- 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,11 +49,10 @@ class KafkaStubMessages implements MessageVerifier<Message<?>> {

 	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<String, Consumer> topicToConsumer = initializer.initialize(broker,
-				kafkaProperties);
+		Map<String, Consumer> topicToConsumer = initializer.initialize(broker, kafkaProperties);
 		this.receiver = new Receiver(topicToConsumer);
 	}

@@ -63,8 +62,7 @@ class KafkaStubMessages implements MessageVerifier<Message<?>> {
 		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();
@@ -89,8 +87,7 @@ class KafkaStubMessages implements MessageVerifier<Message<?>> {

 	@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);
 	}

@@ -111,11 +108,9 @@ 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 + "]");
 		}
@@ -126,10 +121,9 @@ class Receiver {
 		Map<String, Object> 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
@@ -142,21 +136,18 @@ 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<String, Object> toMap(Headers headers) {
@@ -168,11 +159,9 @@ 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;
 	}
--- a/spring-cloud-contract-wiremock/pom.xml
+++ b/spring-cloud-contract-wiremock/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-wiremock</artifactId>
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/tests/samples-messaging-amqp/pom.xml
+++ b/tests/samples-messaging-amqp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-sample-amqp</artifactId>
--- 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,29 +60,25 @@ 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<String, String> 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<String, String> 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);
 	}

--- a/tests/samples-messaging-camel/pom.xml
+++ b/tests/samples-messaging-camel/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-sample-camel</artifactId>
--- a/tests/samples-messaging-integration/pom.xml
+++ b/tests/samples-messaging-integration/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-sample-integration</artifactId>
--- a/tests/samples-messaging-jms/pom.xml
+++ b/tests/samples-messaging-jms/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-sample-jms</artifactId>
--- a/tests/samples-messaging-stream/pom.xml
+++ b/tests/samples-messaging-stream/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-sample-stream</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-amqp</artifactId>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-boot-eureka</artifactId>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-boot-zookeeper</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-camel/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-camel/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-camel</artifactId>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-context-path</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-integration/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-integration/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-integration</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-jms/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-jms/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-jms</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-kafka</artifactId>
--- 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 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-moco-contract-jar</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-moco</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-stream/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-stream/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>2.2.6.RELEASE</version>
+		<version>2.2.6.BUILD-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-stream</artifactId>