From 2041d753d462ee23693882acf87aeebb9f653776 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 21:53:12 +0000 Subject: [PATCH] Update SNAPSHOT to 2.2.4.RELEASE --- README.adoc | 2 +- docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 2 +- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- .../complete/contract-rest-client/pom.xml | 4 ++-- .../complete/contract-rest-service/pom.xml | 6 +++--- .../initial/contract-rest-client/pom.xml | 2 +- .../initial/contract-rest-service/pom.xml | 6 +++--- guides/pom.xml | 2 +- pom.xml | 18 +++++++++--------- samples/pom.xml | 4 ++-- samples/standalone/pom.xml | 4 ++-- samples/wiremock-jetty/pom.xml | 6 +++--- samples/wiremock-native/pom.xml | 6 +++--- samples/wiremock-tomcat/pom.xml | 6 +++--- samples/wiremock-undertow-ssl/pom.xml | 6 +++--- samples/wiremock-undertow/pom.xml | 6 +++--- samples/wiremock/pom.xml | 6 +++--- specs/pom.xml | 4 ++-- .../spring-cloud-contract-spec-groovy/pom.xml | 2 +- specs/spring-cloud-contract-spec-java/pom.xml | 2 +- .../spring-cloud-contract-spec-kotlin/pom.xml | 2 +- specs/spring-cloud-contract-spec/pom.xml | 2 +- spring-cloud-contract-dependencies/pom.xml | 4 ++-- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-contract-stub-runner-boot/pom.xml | 2 +- spring-cloud-contract-stub-runner/pom.xml | 2 +- .../stubrunner/junit/StubRunnerExtension.java | 11 ++++++----- spring-cloud-contract-tools/pom.xml | 2 +- .../spring-cloud-contract-converters/pom.xml | 2 +- .../gradle.properties | 4 ++-- .../pom.xml | 2 +- .../bootSimple/gradle.properties | 2 +- .../scenarioProject/gradle.properties | 4 ++-- .../scenarioProjectKotlin/gradle.properties | 4 ++-- .../pom.xml | 2 +- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- .../XmlBodyVerificationBuilderTest.java | 9 ++++++--- spring-cloud-contract-wiremock/pom.xml | 2 +- tests/pom.xml | 2 +- tests/samples-messaging-amqp/pom.xml | 2 +- tests/samples-messaging-camel/pom.xml | 2 +- tests/samples-messaging-integration/pom.xml | 2 +- tests/samples-messaging-jms/pom.xml | 2 +- tests/samples-messaging-stream/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 64 files changed, 109 insertions(+), 105 deletions(-) diff --git a/README.adoc b/README.adoc index 4412bca9da..ff772e6a54 100644 --- a/README.adoc +++ b/README.adoc @@ -287,7 +287,7 @@ run the following command: ./scripts/parallelBuild.sh ``` -To use eight 8 cores, run the following command: +To use eight 8 cores, run thke following command: ``` CORES=8 ./scripts/parallelBuild.sh diff --git a/docker/pom.xml b/docker/pom.xml index 196c0e5b51..a2d1e96e78 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-docker-parent pom - 2.2.4.BUILD-SNAPSHOT + 2.2.4.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 e3a6433cf5..3e2c92a269 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-docker pom - 2.2.4.BUILD-SNAPSHOT + 2.2.4.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 347a930dad..97591bffba 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.BUILD-SNAPSHOT +verifierVersion=2.2.4.RELEASE diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 7548e4589e..fbee4b69eb 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-stub-runner-docker pom - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index 1c08008a64..960abf8e54 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. 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 00d2e6e36d..f8dde31198 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.0.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT + Hoxton.SR7 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 97de716399..02f917006d 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.0.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + Hoxton.SR7 + 2.2.4.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 9f83c63fb3..e1ec1d1b11 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.0.RELEASE + 2.3.2.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 3651c5fbb9..3a4ef69b55 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.0.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT + Hoxton.SR7 + 2.2.4.RELEASE diff --git a/guides/pom.xml b/guides/pom.xml index 059896d2cf..da8ce87a67 100644 --- a/guides/pom.xml +++ b/guides/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-guides diff --git a/pom.xml b/pom.xml index 8768320c5e..24cae022f1 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-contract-parent pom - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE Spring Cloud Contract Spring Cloud Contract @@ -28,15 +28,15 @@ 2.17 3.6.14 0.0.9 - 2.3.1.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - Horsham.SR5 + 2.3.1.RELEASE + 2.2.3.RELEASE + Horsham.SR7 3.0.4.RELEASE - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 2.2.4.BUILD-SNAPSHOT - 3.0.7.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 2.2.4.RELEASE + 3.0.9.RELEASE 5.0.4 3.2.9 1.3-groovy-2.5 diff --git a/samples/pom.xml b/samples/pom.xml index ff250ff39a..9cebb89d45 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-samples pom - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 896cc1b3fa..28404a5a57 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-samples-standalone pom - 2.2.4.BUILD-SNAPSHOT + 2.2.4.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 90d92907fd..860a17e431 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.BUILD-SNAPSHOT + 2.2.4.RELEASE jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index ecc0309879..a2ad2d140e 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.BUILD-SNAPSHOT + 2.2.4.RELEASE jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 6a5ed5303a..1f7adacc29 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.BUILD-SNAPSHOT + 2.2.4.RELEASE jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index 08164c8fdb..7e388faef6 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.BUILD-SNAPSHOT + 2.2.4.RELEASE jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 4b633ee2c0..de71bdc6a1 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.BUILD-SNAPSHOT + 2.2.4.RELEASE jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index 0fee689e4a..ab858a85c3 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE diff --git a/specs/pom.xml b/specs/pom.xml index e24db18f5b..4807bad8ff 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-specs pom - 2.2.4.BUILD-SNAPSHOT + 2.2.4.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 28fc547243..49c93b4ff0 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.BUILD-SNAPSHOT + 2.2.4.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 f1edb1db12..7f9755ec31 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.BUILD-SNAPSHOT + 2.2.4.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 0cdf2b6a5c..8b633e2944 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.BUILD-SNAPSHOT + 2.2.4.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 503550b860..c5c11250cd 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.BUILD-SNAPSHOT + 2.2.4.RELEASE ../.. spring-cloud-contract-spec diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 0c3a0efb6a..50cd64c929 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.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-contract-dependencies - 2.2.4.BUILD-SNAPSHOT + 2.2.4.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 5e042d19fd..9f9849a449 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 6e2ad82057..122992670a 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.BUILD-SNAPSHOT + 2.2.4.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 7d6403bbfd..f238a64713 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.BUILD-SNAPSHOT + 2.2.4.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 3f63eb9e1a..826068d370 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.BUILD-SNAPSHOT + 2.2.4.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 5d2633dec1..0ce6b7ee42 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.BUILD-SNAPSHOT + 2.2.4.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 b8ffaf2351..ed7770336c 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.BUILD-SNAPSHOT + 2.2.4.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 12e040b3a9..62c364086a 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. 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 5489cb56a0..d38b923d83 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,7 +84,8 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void afterAll(ExtensionContext extensionContext) { try { after(); - } finally { + } + finally { this.afterAllCalled.set(true); } } @@ -105,7 +106,8 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void beforeAll(ExtensionContext extensionContext) { try { before(); - } finally { + } + finally { this.beforeAllCalled.set(true); } } @@ -133,7 +135,6 @@ 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 eec80a4601..77f0a4ce01 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.BUILD-SNAPSHOT + 2.2.4.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 f047185c52..ab01c31be4 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.BUILD-SNAPSHOT + 2.2.4.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 a4b3b23afa..3430476765 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.BUILD-SNAPSHOT +verifierVersion=2.2.4.RELEASE org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=2.3.0.RELEASE +springCloudBuildVersion=2.3.1.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 d9666cf95a..33acf46d22 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.BUILD-SNAPSHOT + 2.2.4.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 b842e40ade..1a509c630f 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.BUILD-SNAPSHOT +verifierVersion=2.2.4.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 0b08c46d02..cfc5ae88d5 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.BUILD-SNAPSHOT -bootVersion=2.3.0.RELEASE +verifierVersion=2.2.4.RELEASE +bootVersion=2.3.2.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 858d93bdd4..3ae1bc865c 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.BUILD-SNAPSHOT -bootVersion=2.3.0.RELEASE +verifierVersion=2.2.4.RELEASE +bootVersion=2.3.2.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 f29a45d9e6..604beb6820 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.BUILD-SNAPSHOT + 2.2.4.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 f7ceafc9e0..e056dafd3c 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.BUILD-SNAPSHOT + 2.2.4.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 5d1ac5701e..4f3d6cd0ad 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index d444c9278d..eee21fbe14 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. 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 80f030da8d..0d054355f5 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,10 +24,13 @@ 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 428c2b4347..b6852b2ccd 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index b587fe86ac..e9a922fce1 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index 83875d0f58..088f1c2a8f 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 7ed0476141..52e9a65a39 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index 46ee4a362c..ffa5320942 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-jms/pom.xml b/tests/samples-messaging-jms/pom.xml index 48c776def0..e8bab80a18 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-sample-jms diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index 872c6545f0..a32d020ac4 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.BUILD-SNAPSHOT + 2.2.4.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 2d236409e5..2d09d5a90f 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.BUILD-SNAPSHOT + 2.2.4.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 4526162fbc..21a75b0540 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.BUILD-SNAPSHOT + 2.2.4.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 de354bd45c..7604373401 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.BUILD-SNAPSHOT + 2.2.4.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 b41fa64b4a..1aac097375 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.BUILD-SNAPSHOT + 2.2.4.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 740809fe56..2ebdbcf18e 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.BUILD-SNAPSHOT + 2.2.4.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 8230f4a29d..d19330ad48 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.BUILD-SNAPSHOT + 2.2.4.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 4f356ba628..5a69ecf691 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.BUILD-SNAPSHOT + 2.2.4.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 68ca51f1a4..43afede89e 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.BUILD-SNAPSHOT + 2.2.4.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 b6b37bf8be..8b762641fb 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.BUILD-SNAPSHOT + 2.2.4.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 c40dafa2c8..454ba92a9a 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.BUILD-SNAPSHOT + 2.2.4.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 69e46e429b..22dcdcea63 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.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-contract-stub-runner-stream