diff --git a/README.adoc b/README.adoc index ff772e6a54..4412bca9da 100644 --- a/README.adoc +++ b/README.adoc @@ -287,7 +287,7 @@ run the following command: ./scripts/parallelBuild.sh ``` -To use eight 8 cores, run thke following command: +To use eight 8 cores, run the following command: ``` CORES=8 ./scripts/parallelBuild.sh diff --git a/docker/pom.xml b/docker/pom.xml index a2d1e96e78..196c0e5b51 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-docker-parent pom - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT 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 3e2c92a269..e3a6433cf5 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -11,13 +11,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-docker pom - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT 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 97591bffba..347a930dad 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.4.RELEASE +verifierVersion=2.2.4.BUILD-SNAPSHOT diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index fbee4b69eb..7548e4589e 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-docker pom - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index 960abf8e54..1c08008a64 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-docs 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 f8dde31198..00d2e6e36d 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.2.RELEASE + 2.3.0.RELEASE UTF-8 1.8 - Hoxton.SR7 + Hoxton.BUILD-SNAPSHOT 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 02f917006d..97de716399 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.2.RELEASE + 2.3.0.RELEASE UTF-8 1.8 - Hoxton.SR7 - 2.2.4.RELEASE + Hoxton.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT 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 e1ec1d1b11..9f83c63fb3 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.2.RELEASE + 2.3.0.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 3a4ef69b55..3651c5fbb9 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.2.RELEASE + 2.3.0.RELEASE UTF-8 1.8 - Hoxton.SR7 - 2.2.4.RELEASE + Hoxton.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT diff --git a/guides/pom.xml b/guides/pom.xml index da8ce87a67..059896d2cf 100644 --- a/guides/pom.xml +++ b/guides/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-guides diff --git a/pom.xml b/pom.xml index 24cae022f1..8768320c5e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-contract-parent pom - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT Spring Cloud Contract Spring Cloud Contract @@ -28,15 +28,15 @@ 2.17 3.6.14 0.0.9 - 2.3.1.RELEASE - 2.2.3.RELEASE - Horsham.SR7 + 2.3.1.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + Horsham.SR5 3.0.4.RELEASE - 2.2.4.RELEASE - 2.2.4.RELEASE - 2.2.4.RELEASE - 3.0.9.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 3.0.7.RELEASE 5.0.4 3.2.9 1.3-groovy-2.5 diff --git a/samples/pom.xml b/samples/pom.xml index 9cebb89d45..ff250ff39a 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-samples pom - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 28404a5a57..896cc1b3fa 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-samples-standalone pom - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT 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 860a17e431..90d92907fd 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.0.RELEASE UTF-8 1.8 - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index a2ad2d140e..ecc0309879 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.0.RELEASE UTF-8 1.8 - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 1f7adacc29..6a5ed5303a 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.0.RELEASE UTF-8 1.8 - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index 7e388faef6..08164c8fdb 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.0.RELEASE UTF-8 1.8 - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index de71bdc6a1..4b633ee2c0 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.0.RELEASE UTF-8 1.8 - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index ab858a85c3..0fee689e4a 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.0.RELEASE UTF-8 1.8 - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT diff --git a/specs/pom.xml b/specs/pom.xml index 4807bad8ff..e24db18f5b 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-specs pom - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT 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 49c93b4ff0..28fc547243 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT ../.. 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 7f9755ec31..f1edb1db12 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT ../.. 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 8b633e2944..0cdf2b6a5c 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec-kotlin diff --git a/specs/spring-cloud-contract-spec/pom.xml b/specs/spring-cloud-contract-spec/pom.xml index c5c11250cd..503550b860 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 50cd64c929..0c3a0efb6a 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.1.RELEASE + 2.3.1.BUILD-SNAPSHOT spring-cloud-contract-dependencies - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT 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 9f9849a449..5e042d19fd 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 122992670a..6e2ad82057 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 f238a64713..7d6403bbfd 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 826068d370..3f63eb9e1a 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 0ce6b7ee42..5d2633dec1 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 ed7770336c..b8ffaf2351 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 62c364086a..12e040b3a9 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java index d38b923d83..5489cb56a0 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java @@ -51,8 +51,8 @@ import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; * @author Olga Maciaszek-Sharma * @since 2.1.0 */ -public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, - BeforeEachCallback, AfterEachCallback, StubFinder, StubRunnerExtensionOptions { +public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback, + StubFinder, StubRunnerExtensionOptions { private static final String DELIMITER = ":"; @@ -84,8 +84,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void afterAll(ExtensionContext extensionContext) { try { after(); - } - finally { + } finally { this.afterAllCalled.set(true); } } @@ -106,8 +105,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void beforeAll(ExtensionContext extensionContext) { try { before(); - } - finally { + } finally { this.beforeAllCalled.set(true); } } @@ -135,6 +133,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, } } + @Override public URL findStubUrl(String groupId, String artifactId) throws StubNotFoundException { diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 77f0a4ce01..eec80a4601 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 ab01c31be4..f047185c52 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 3430476765..a4b3b23afa 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.4.RELEASE +verifierVersion=2.2.4.BUILD-SNAPSHOT org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=2.3.1.RELEASE +springCloudBuildVersion=2.3.0.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 33acf46d22..d9666cf95a 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 1a509c630f..b842e40ade 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.4.RELEASE +verifierVersion=2.2.4.BUILD-SNAPSHOT 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 cfc5ae88d5..0b08c46d02 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.4.RELEASE -bootVersion=2.3.2.RELEASE +verifierVersion=2.2.4.BUILD-SNAPSHOT +bootVersion=2.3.0.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 3ae1bc865c..858d93bdd4 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.4.RELEASE -bootVersion=2.3.2.RELEASE +verifierVersion=2.2.4.BUILD-SNAPSHOT +bootVersion=2.3.0.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 604beb6820..f29a45d9e6 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 e056dafd3c..f7ceafc9e0 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 4f3d6cd0ad..5d1ac5701e 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index eee21fbe14..d444c9278d 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java index 0d054355f5..80f030da8d 100644 --- a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java +++ b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java @@ -24,13 +24,10 @@ public class XmlBodyVerificationBuilderTest { builder.addXmlResponseBodyCheck(blockBuilder, xml, matchers, xml, true); // Then String test = blockBuilder.toString(); - assertThat(test).contains( - "DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();") + assertThat(test).contains("DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();") .contains("builderFactory.setNamespaceAware(true);") - .contains( - "DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();") - .contains( - "Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(") + .contains("DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();") + .contains("Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(") .contains(xml); } diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index b6852b2ccd..428c2b4347 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index e9a922fce1..b587fe86ac 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index 088f1c2a8f..83875d0f58 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 52e9a65a39..7ed0476141 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index ffa5320942..46ee4a362c 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-jms/pom.xml b/tests/samples-messaging-jms/pom.xml index e8bab80a18..48c776def0 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-sample-jms diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index a32d020ac4..872c6545f0 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 2d09d5a90f..2d236409e5 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 21a75b0540..4526162fbc 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 7604373401..de354bd45c 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 1aac097375..b41fa64b4a 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 2ebdbcf18e..740809fe56 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 d19330ad48..8230f4a29d 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 5a69ecf691..4f356ba628 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 43afede89e..68ca51f1a4 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 8b762641fb..b6b37bf8be 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 454ba92a9a..c40dafa2c8 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. 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 22dcdcea63..69e46e429b 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-stream