From e36da23f7c3f8d1fd38fca1ff5eaf2cafd855755 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Sep 2019 17:55:17 +0200 Subject: [PATCH 01/11] Added password and username for sonatype --- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 ++ 1 file changed, 2 insertions(+) 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 c79b5d2171..42c62c96cf 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 @@ -222,6 +222,8 @@ build -PverifierVersion=${project.version} -Pcentral + -PsonatypeUsername=${env.SONATYPE_USER} + -PsonatypePassword=${env.SONATYPE_PASSWORD} publishPlugins From efac97ab5aa1e3868684c40255d3706325ddf08f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Sep 2019 18:16:56 +0200 Subject: [PATCH 02/11] Adding env vars --- .../spring-cloud-contract-gradle-plugin/gradle/release.gradle | 3 +++ .../spring-cloud-contract-gradle-plugin/pom.xml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle index 23ff0cdfda..d59f51309c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle @@ -54,6 +54,9 @@ ext { if (isReleaseToCentral) { signing { + def signingKey = findProperty("signingKey") + def signingPassword = findProperty("signingPassword") + useInMemoryPgpKeys(signingKey, signingPassword) sign configurations.archives } 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 42c62c96cf..0c6aaddc1a 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 @@ -224,6 +224,8 @@ -Pcentral -PsonatypeUsername=${env.SONATYPE_USER} -PsonatypePassword=${env.SONATYPE_PASSWORD} + -PsigningKey=${env.FOO_SEC} + -PsigningPassword=${env.FOO_PASSPHRASE} publishPlugins From b21e1e1028d294a6f6e0b27e80f8cc86f53619af Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Sep 2019 18:28:13 +0200 Subject: [PATCH 03/11] Trying to fix Gradle stuff --- .../gradle/release.gradle | 9 +++------ .../spring-cloud-contract-gradle-plugin/pom.xml | 4 ---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle index d59f51309c..0071d2ee56 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle @@ -1,5 +1,5 @@ apply plugin: 'maven' -apply plugin: 'signing' +//apply plugin: 'signing' uploadArchives.dependsOn { [check] } @@ -53,12 +53,9 @@ ext { } if (isReleaseToCentral) { - signing { - def signingKey = findProperty("signingKey") - def signingPassword = findProperty("signingPassword") - useInMemoryPgpKeys(signingKey, signingPassword) + /*signing { sign configurations.archives - } + }*/ apply plugin: 'com.gradle.plugin-publish' 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 0c6aaddc1a..c79b5d2171 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 @@ -222,10 +222,6 @@ build -PverifierVersion=${project.version} -Pcentral - -PsonatypeUsername=${env.SONATYPE_USER} - -PsonatypePassword=${env.SONATYPE_PASSWORD} - -PsigningKey=${env.FOO_SEC} - -PsigningPassword=${env.FOO_PASSPHRASE} publishPlugins From 0a1b9b9060ecaf5a7a5d22bd11ab2e5a4818c947 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Sep 2019 18:34:56 +0200 Subject: [PATCH 04/11] I love Gradle --- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 ++ 1 file changed, 2 insertions(+) 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 c79b5d2171..42c62c96cf 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 @@ -222,6 +222,8 @@ build -PverifierVersion=${project.version} -Pcentral + -PsonatypeUsername=${env.SONATYPE_USER} + -PsonatypePassword=${env.SONATYPE_PASSWORD} publishPlugins From 764c13b6bf027355b090480e3543b8eb63579fa8 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Sep 2019 18:59:24 +0200 Subject: [PATCH 05/11] I love Gradle --- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 ++ 1 file changed, 2 insertions(+) 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 42c62c96cf..79ba549f18 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 @@ -224,6 +224,8 @@ -Pcentral -PsonatypeUsername=${env.SONATYPE_USER} -PsonatypePassword=${env.SONATYPE_PASSWORD} + -Dgradle.publish.key=${env.GRADLE_PUBLISH_KEY} + -Dgradle.publish.secret=${env.GRADLE_PUBLISH_SECRET} publishPlugins From d2ff700f18f9b878a8962e6176c2b39184a46f1c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Sep 2019 19:57:15 +0200 Subject: [PATCH 06/11] Parametrizing gradle publishPlugins task in maven --- config/releaser.yml | 3 ++- .../spring-cloud-contract-gradle-plugin/pom.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/releaser.yml b/config/releaser.yml index 6d9c27b162..f99b986a29 100644 --- a/config/releaser.yml +++ b/config/releaser.yml @@ -1,4 +1,5 @@ releaser.maven.buildCommand: ./scripts/noIntegration.sh +releaser.maven.deployCommand: ./mvnw deploy -DskipTests -B -Pfast,deploy -Dgradle.publishPlugins.task="-Phello=world" {{systemProps}} releaser.gradle.gradlePropsSubstitution: verifierVersion: spring-cloud-contract - bootVersion: spring-boot \ No newline at end of file + bootVersion: spring-boot 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 79ba549f18..4e47b84fa2 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 @@ -19,6 +19,7 @@ UTF-8 UTF-8 + publishPlugins @@ -226,7 +227,7 @@ -PsonatypePassword=${env.SONATYPE_PASSWORD} -Dgradle.publish.key=${env.GRADLE_PUBLISH_KEY} -Dgradle.publish.secret=${env.GRADLE_PUBLISH_SECRET} - publishPlugins + ${gradle.publishPlugins.task} From 93c56799492c96952f0ec9d7bdf0cf44513b8540 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Sep 2019 20:26:18 +0200 Subject: [PATCH 07/11] Fixing the wrong task --- config/releaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/releaser.yml b/config/releaser.yml index f99b986a29..ce0569073b 100644 --- a/config/releaser.yml +++ b/config/releaser.yml @@ -1,5 +1,5 @@ releaser.maven.buildCommand: ./scripts/noIntegration.sh -releaser.maven.deployCommand: ./mvnw deploy -DskipTests -B -Pfast,deploy -Dgradle.publishPlugins.task="-Phello=world" {{systemProps}} +releaser.maven.deployCommand: ./mvnw deploy -DskipTests -B -Pfast,deploy -Dgradle.publishPlugins.task=-Phello=world {{systemProps}} releaser.gradle.gradlePropsSubstitution: verifierVersion: spring-cloud-contract bootVersion: spring-boot From 4750b4e60e908894f2b393ae30cdb8f5274f2309 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 10 Sep 2019 18:38:17 +0000 Subject: [PATCH 08/11] Update SNAPSHOT to 2.1.3.RELEASE --- README.adoc | 1 + docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 2 +- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- pom.xml | 17 ++++++++--------- 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 +++--- spring-cloud-contract-dependencies/pom.xml | 4 ++-- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-spec/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 +- spring-cloud-contract-tools/pom.xml | 2 +- .../spring-cloud-contract-converters/pom.xml | 2 +- .../gradle.properties | 4 ++-- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 +- .../functionalTest/bootSimple/gradle.properties | 2 +- .../sampleJerseyProject/gradle.properties | 4 ++-- .../sampleProject/gradle.properties | 4 ++-- .../scenarioProject/gradle.properties | 4 ++-- .../spring-cloud-contract-maven-plugin/pom.xml | 4 ++-- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- spring-cloud-contract-wiremock/pom.xml | 2 +- ...igureWireMockRandomPortApplicationTests.java | 1 - ...MockRandomPortInheretedApplicationTests.java | 3 ++- 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-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 +- 52 files changed, 82 insertions(+), 82 deletions(-) diff --git a/README.adoc b/README.adoc index e307964a1c..e287fa72b2 100644 --- a/README.adoc +++ b/README.adoc @@ -2193,6 +2193,7 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. +The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- diff --git a/docker/pom.xml b/docker/pom.xml index 48dbe5f429..7e0782e312 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-docker-parent pom - 2.1.3.BUILD-SNAPSHOT + 2.1.3.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 b8ed2468d8..124d790c55 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-docker pom - 2.1.3.BUILD-SNAPSHOT + 2.1.3.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 8ece57943d..b3505bfb83 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.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.3.RELEASE diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 7f8b89ad7f..800c99e90b 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-stub-runner-docker pom - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index a998cbfc3c..9948c7a67c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-docs diff --git a/pom.xml b/pom.xml index 7ef6dd5a75..5cdc9802f2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.1.7.BUILD-SNAPSHOT + 2.1.7.RELEASE spring-cloud-contract-parent pom - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE Spring Cloud Contract Spring Cloud Contract @@ -28,13 +28,12 @@ 2.17 3.5.13 0.0.9 - 2.1.7.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT - - Fishtown.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT + 2.1.7.RELEASE + 2.1.3.RELEASE + Fishtown.SR4 + 2.1.3.RELEASE + 2.1.3.RELEASE + 2.1.3.RELEASE 5.0.3 3.2.9 1.0-groovy-2.4 diff --git a/samples/pom.xml b/samples/pom.xml index bc1d01fecd..8e5c6eb13b 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-samples pom - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 463d2d0246..4588968c2c 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-samples-standalone pom - 2.1.3.BUILD-SNAPSHOT + 2.1.3.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 cd614faf50..a444a384a8 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index 83af687cc4..28594c75a8 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 11536abb39..ed9b1199cb 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index b4e723b871..4b0c9ac55a 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 64f7cc9e49..21dee8a8c8 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index e96d869988..783266219f 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 838ed07448..f5ed9bebaf 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.1.7.BUILD-SNAPSHOT + 2.1.7.RELEASE spring-cloud-contract-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.3.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 7b5dbe5199..06a0ad8c0f 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-spec/pom.xml b/spring-cloud-contract-spec/pom.xml index a6b50e00ff..4edaf3f53a 100644 --- a/spring-cloud-contract-spec/pom.xml +++ b/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-spec diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index fd5affa58c..991c811f51 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 93a196c04c..f77f5ab9bf 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 62d9b1cbb7..91182c3744 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 cb76134dcf..002a19cf52 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 cd96da876c..e959242ae9 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 fb0f700c91..95961b450a 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index e26fc92907..45f35298c7 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 966e52a3fa..8b8c829be7 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 51304b8658..3f6be272d1 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.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.3.RELEASE org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=2.1.3.BUILD-SNAPSHOT +springCloudBuildVersion=2.1.7.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 4e47b84fa2..30e7ef32d8 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 2681cc2dd5..39b1d61fd4 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.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.3.RELEASE groovyVersion=2.4.15 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties index 4cc2ee5258..e6abb08e8e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.BUILD-SNAPSHOT -bootVersion=2.1.6.RELEASE +verifierVersion=2.1.3.RELEASE +bootVersion=2.1.7.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties index 4cc2ee5258..e6abb08e8e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.BUILD-SNAPSHOT -bootVersion=2.1.6.RELEASE +verifierVersion=2.1.3.RELEASE +bootVersion=2.1.7.RELEASE 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 ea1b101b6f..a5172f9778 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.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.BUILD-SNAPSHOT -bootVersion=2.1.6.RELEASE +verifierVersion=2.1.3.RELEASE +bootVersion=2.1.7.RELEASE groovyVersion=2.4.15 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 73fcde37dd..07beec8622 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. @@ -47,7 +47,7 @@ 1.13.7 - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE 2016 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 3aaba6ef9c..83c3c220ef 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index d0b42a51cd..8829fb5499 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index d9a10bc735..bc9545d4d7 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-wiremock diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java index 3bb8b56ecc..1c3df111c6 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java @@ -53,7 +53,6 @@ public class AutoConfigureWireMockRandomPortApplicationTests { .withHeader("Content-Type", "text/plain").withBody("Hello World!"))); assertThat(this.service.go()).isEqualTo("Hello World!"); - wireMockServer.verify(1, RequestPatternBuilder.allRequests()); } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortInheretedApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortInheretedApplicationTests.java index 8076b0b4c6..a388466818 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortInheretedApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortInheretedApplicationTests.java @@ -16,6 +16,7 @@ package org.springframework.cloud.contract.wiremock; -public class AutoConfigureWireMockRandomPortInheretedApplicationTests extends AutoConfigureWireMockRandomPortApplicationTests { +public class AutoConfigureWireMockRandomPortInheretedApplicationTests + extends AutoConfigureWireMockRandomPortApplicationTests { } diff --git a/tests/pom.xml b/tests/pom.xml index 4bd1e6dc02..0f1a7d4ca7 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index 6600be1af3..13fd80e67b 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 587d2fcb70..8a7b1eb7fa 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index 9f51b5e811..2483744aa3 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index a2c6883b16..6ccf6d5bff 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 6e8ee6c7c7..29a672e255 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 b68d2f4365..e063b9c41a 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 5eab826df6..4df9c9cae3 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 efd34e6bdf..cc8c4c141e 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 031e4aec15..609e8852a8 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 bf3f3cd173..c8ffa1afc1 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-stub-runner-integration 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 1806122699..be4e4664cf 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 b0d977908d..600a2793fb 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.1.3.BUILD-SNAPSHOT + 2.1.3.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 373599d1e5..f847d85f40 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.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-contract-stub-runner-stream From 882cee887dc1aabaae202b4859791818df9da24a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 10 Sep 2019 18:47:35 +0000 Subject: [PATCH 09/11] Going back to snapshots --- README.adoc | 1 - docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 2 +- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- pom.xml | 17 +++++++++-------- 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 +++--- spring-cloud-contract-dependencies/pom.xml | 4 ++-- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-spec/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 +- spring-cloud-contract-tools/pom.xml | 2 +- .../spring-cloud-contract-converters/pom.xml | 2 +- .../gradle.properties | 4 ++-- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 +- .../functionalTest/bootSimple/gradle.properties | 2 +- .../sampleJerseyProject/gradle.properties | 4 ++-- .../sampleProject/gradle.properties | 4 ++-- .../scenarioProject/gradle.properties | 4 ++-- .../spring-cloud-contract-maven-plugin/pom.xml | 4 ++-- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- spring-cloud-contract-wiremock/pom.xml | 2 +- ...igureWireMockRandomPortApplicationTests.java | 1 + ...MockRandomPortInheretedApplicationTests.java | 3 +-- 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-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 +- 52 files changed, 82 insertions(+), 82 deletions(-) diff --git a/README.adoc b/README.adoc index e287fa72b2..e307964a1c 100644 --- a/README.adoc +++ b/README.adoc @@ -2193,7 +2193,6 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. -The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- diff --git a/docker/pom.xml b/docker/pom.xml index 7e0782e312..48dbe5f429 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-docker-parent pom - 2.1.3.RELEASE + 2.1.3.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 124d790c55..b8ed2468d8 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-docker pom - 2.1.3.RELEASE + 2.1.3.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 b3505bfb83..8ece57943d 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.1.3.RELEASE +verifierVersion=2.1.3.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 800c99e90b..7f8b89ad7f 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-docker pom - 2.1.3.RELEASE + 2.1.3.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 9948c7a67c..a998cbfc3c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-docs diff --git a/pom.xml b/pom.xml index 5cdc9802f2..7ef6dd5a75 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT spring-cloud-contract-parent pom - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT Spring Cloud Contract Spring Cloud Contract @@ -28,12 +28,13 @@ 2.17 3.5.13 0.0.9 - 2.1.7.RELEASE - 2.1.3.RELEASE - Fishtown.SR4 - 2.1.3.RELEASE - 2.1.3.RELEASE - 2.1.3.RELEASE + 2.1.7.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT + + Fishtown.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT 5.0.3 3.2.9 1.0-groovy-2.4 diff --git a/samples/pom.xml b/samples/pom.xml index 8e5c6eb13b..bc1d01fecd 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-samples pom - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 4588968c2c..463d2d0246 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-samples-standalone pom - 2.1.3.RELEASE + 2.1.3.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 a444a384a8..cd614faf50 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.6.RELEASE UTF-8 1.8 - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index 28594c75a8..83af687cc4 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.6.RELEASE UTF-8 1.8 - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index ed9b1199cb..11536abb39 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.6.RELEASE UTF-8 1.8 - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index 4b0c9ac55a..b4e723b871 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.6.RELEASE UTF-8 1.8 - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 21dee8a8c8..64f7cc9e49 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.6.RELEASE UTF-8 1.8 - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index 783266219f..e96d869988 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.6.RELEASE UTF-8 1.8 - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index f5ed9bebaf..838ed07448 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.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT spring-cloud-contract-dependencies - 2.1.3.RELEASE + 2.1.3.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 06a0ad8c0f..7b5dbe5199 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-spec/pom.xml b/spring-cloud-contract-spec/pom.xml index 4edaf3f53a..a6b50e00ff 100644 --- a/spring-cloud-contract-spec/pom.xml +++ b/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-spec diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 991c811f51..fd5affa58c 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.1.3.RELEASE + 2.1.3.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 f77f5ab9bf..93a196c04c 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.1.3.RELEASE + 2.1.3.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 91182c3744..62d9b1cbb7 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.1.3.RELEASE + 2.1.3.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 002a19cf52..cb76134dcf 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.1.3.RELEASE + 2.1.3.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 e959242ae9..cd96da876c 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.1.3.RELEASE + 2.1.3.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 95961b450a..fb0f700c91 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 45f35298c7..e26fc92907 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.1.3.RELEASE + 2.1.3.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 8b8c829be7..966e52a3fa 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.1.3.RELEASE + 2.1.3.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 3f6be272d1..51304b8658 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.1.3.RELEASE +verifierVersion=2.1.3.BUILD-SNAPSHOT org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=2.1.7.RELEASE +springCloudBuildVersion=2.1.3.BUILD-SNAPSHOT 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 30e7ef32d8..4e47b84fa2 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.1.3.RELEASE + 2.1.3.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 39b1d61fd4..2681cc2dd5 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.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.RELEASE +verifierVersion=2.1.3.BUILD-SNAPSHOT groovyVersion=2.4.15 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties index e6abb08e8e..4cc2ee5258 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.RELEASE -bootVersion=2.1.7.RELEASE +verifierVersion=2.1.3.BUILD-SNAPSHOT +bootVersion=2.1.6.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties index e6abb08e8e..4cc2ee5258 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.RELEASE -bootVersion=2.1.7.RELEASE +verifierVersion=2.1.3.BUILD-SNAPSHOT +bootVersion=2.1.6.RELEASE 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 a5172f9778..ea1b101b6f 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.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.RELEASE -bootVersion=2.1.7.RELEASE +verifierVersion=2.1.3.BUILD-SNAPSHOT +bootVersion=2.1.6.RELEASE groovyVersion=2.4.15 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 07beec8622..73fcde37dd 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. @@ -47,7 +47,7 @@ 1.13.7 - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT 2016 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 83c3c220ef..3aaba6ef9c 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index 8829fb5499..d0b42a51cd 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index bc9545d4d7..d9a10bc735 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-wiremock diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java index 1c3df111c6..3bb8b56ecc 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java @@ -53,6 +53,7 @@ public class AutoConfigureWireMockRandomPortApplicationTests { .withHeader("Content-Type", "text/plain").withBody("Hello World!"))); assertThat(this.service.go()).isEqualTo("Hello World!"); + wireMockServer.verify(1, RequestPatternBuilder.allRequests()); } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortInheretedApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortInheretedApplicationTests.java index a388466818..8076b0b4c6 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortInheretedApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortInheretedApplicationTests.java @@ -16,7 +16,6 @@ package org.springframework.cloud.contract.wiremock; -public class AutoConfigureWireMockRandomPortInheretedApplicationTests - extends AutoConfigureWireMockRandomPortApplicationTests { +public class AutoConfigureWireMockRandomPortInheretedApplicationTests extends AutoConfigureWireMockRandomPortApplicationTests { } diff --git a/tests/pom.xml b/tests/pom.xml index 0f1a7d4ca7..4bd1e6dc02 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index 13fd80e67b..6600be1af3 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 8a7b1eb7fa..587d2fcb70 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index 2483744aa3..9f51b5e811 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index 6ccf6d5bff..a2c6883b16 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.1.3.RELEASE + 2.1.3.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 29a672e255..6e8ee6c7c7 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.1.3.RELEASE + 2.1.3.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 e063b9c41a..b68d2f4365 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.1.3.RELEASE + 2.1.3.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 4df9c9cae3..5eab826df6 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.1.3.RELEASE + 2.1.3.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 cc8c4c141e..efd34e6bdf 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.1.3.RELEASE + 2.1.3.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 609e8852a8..031e4aec15 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.1.3.RELEASE + 2.1.3.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 c8ffa1afc1..bf3f3cd173 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-integration 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 be4e4664cf..1806122699 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.1.3.RELEASE + 2.1.3.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 600a2793fb..b0d977908d 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.1.3.RELEASE + 2.1.3.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 f847d85f40..373599d1e5 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.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-stream From de94a14a9a40654c5699cdee4619a8252ebccab5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 10 Sep 2019 18:47:36 +0000 Subject: [PATCH 10/11] Bumping versions to 2.1.4.BUILD-SNAPSHOT after release --- docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 2 +- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- pom.xml | 17 ++++++++--------- samples/pom.xml | 4 ++-- .../contracts/com/example/server/pom.xml | 4 ++-- samples/standalone/dsl/http-client/pom.xml | 2 +- .../dsl/http-server/gradle.properties | 2 +- samples/standalone/dsl/http-server/pom.xml | 4 ++-- samples/standalone/dsl/pom.xml | 4 ++-- samples/standalone/messaging/pom.xml | 4 ++-- .../messaging/stream-sink/gradle.properties | 2 +- .../standalone/messaging/stream-sink/pom.xml | 4 ++-- .../messaging/stream-source/gradle.properties | 2 +- .../standalone/messaging/stream-source/pom.xml | 4 ++-- .../standalone/pact/pact-http-client/pom.xml | 2 +- .../pact/pact-http-server/gradle.properties | 2 +- .../standalone/pact/pact-http-server/pom.xml | 4 ++-- samples/standalone/pact/pom.xml | 4 ++-- samples/standalone/pom.xml | 4 ++-- .../restdocs/http-client/gradle.properties | 2 +- samples/standalone/restdocs/http-client/pom.xml | 4 ++-- .../restdocs/http-server/gradle.properties | 2 +- samples/standalone/restdocs/http-server/pom.xml | 4 ++-- samples/standalone/restdocs/pom.xml | 4 ++-- .../webclient/http-client/gradle.properties | 2 +- .../standalone/webclient/http-client/pom.xml | 4 ++-- .../webclient/http-server/gradle.properties | 2 +- .../standalone/webclient/http-server/pom.xml | 4 ++-- samples/standalone/webclient/pom.xml | 4 ++-- samples/standalone/yml/http-client/pom.xml | 2 +- .../yml/http-server/gradle.properties | 2 +- samples/standalone/yml/http-server/pom.xml | 4 ++-- samples/standalone/yml/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 +++--- spring-cloud-contract-dependencies/pom.xml | 4 ++-- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-spec/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 +- spring-cloud-contract-tools/pom.xml | 2 +- .../spring-cloud-contract-converters/pom.xml | 2 +- .../gradle.properties | 4 ++-- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 +- .../functionalTest/bootSimple/gradle.properties | 2 +- .../sampleJerseyProject/gradle.properties | 4 ++-- .../sampleProject/gradle.properties | 4 ++-- .../scenarioProject/gradle.properties | 4 ++-- .../spring-cloud-contract-maven-plugin/pom.xml | 4 ++-- .../test/projects/complex-configuration/pom.xml | 2 +- .../module/pom.xml | 2 +- .../src/test/projects/plugin-extension/pom.xml | 2 +- .../test/projects/spring-boot-groovy/pom.xml | 2 +- .../src/test/projects/spring-boot-java/pom.xml | 2 +- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- 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-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 +- 82 files changed, 128 insertions(+), 129 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index 48dbe5f429..60c5660078 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-docker-parent pom - 2.1.3.BUILD-SNAPSHOT + 2.1.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 b8ed2468d8..25d949b5c2 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-docker pom - 2.1.3.BUILD-SNAPSHOT + 2.1.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 8ece57943d..bfc4bf523c 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.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.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 7f8b89ad7f..25552a62ad 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.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-docker pom - 2.1.3.BUILD-SNAPSHOT + 2.1.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 a998cbfc3c..c9836e38a3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-docs diff --git a/pom.xml b/pom.xml index 7ef6dd5a75..91dbeb328e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.1.7.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT spring-cloud-contract-parent pom - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT Spring Cloud Contract Spring Cloud Contract @@ -28,13 +28,12 @@ 2.17 3.5.13 0.0.9 - 2.1.7.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT - - Fishtown.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT + Fishtown.SR4 + 2.1.4.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT 5.0.3 3.2.9 1.0-groovy-2.4 diff --git a/samples/pom.xml b/samples/pom.xml index bc1d01fecd..6e5c0bdd04 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-samples pom - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml index e2511eae16..f1f4b8e4b5 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT Greenwich.BUILD-SNAPSHOT true diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index a07acc6acf..f6cc55415b 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index 337deb24f3..d9243d5405 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index c0246a4760..1273962685 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT Greenwich.BUILD-SNAPSHOT diff --git a/samples/standalone/dsl/pom.xml b/samples/standalone/dsl/pom.xml index f5a0a0c87f..3b0f2c47b3 100644 --- a/samples/standalone/dsl/pom.xml +++ b/samples/standalone/dsl/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/messaging/pom.xml b/samples/standalone/messaging/pom.xml index 81874a62c6..f603745ea5 100644 --- a/samples/standalone/messaging/pom.xml +++ b/samples/standalone/messaging/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/messaging/stream-sink/gradle.properties b/samples/standalone/messaging/stream-sink/gradle.properties index 337deb24f3..d9243d5405 100644 --- a/samples/standalone/messaging/stream-sink/gradle.properties +++ b/samples/standalone/messaging/stream-sink/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/messaging/stream-sink/pom.xml b/samples/standalone/messaging/stream-sink/pom.xml index 2120ade494..a304c4589f 100644 --- a/samples/standalone/messaging/stream-sink/pom.xml +++ b/samples/standalone/messaging/stream-sink/pom.xml @@ -15,14 +15,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/messaging/stream-source/gradle.properties b/samples/standalone/messaging/stream-source/gradle.properties index 337deb24f3..d9243d5405 100644 --- a/samples/standalone/messaging/stream-source/gradle.properties +++ b/samples/standalone/messaging/stream-source/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml index bf1d8ba9ef..47b4c2335e 100644 --- a/samples/standalone/messaging/stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -15,14 +15,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/pact/pact-http-client/pom.xml b/samples/standalone/pact/pact-http-client/pom.xml index 01e09f8c21..b4586bbc21 100644 --- a/samples/standalone/pact/pact-http-client/pom.xml +++ b/samples/standalone/pact/pact-http-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE diff --git a/samples/standalone/pact/pact-http-server/gradle.properties b/samples/standalone/pact/pact-http-server/gradle.properties index 337deb24f3..d9243d5405 100644 --- a/samples/standalone/pact/pact-http-server/gradle.properties +++ b/samples/standalone/pact/pact-http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/pact/pact-http-server/pom.xml b/samples/standalone/pact/pact-http-server/pom.xml index 7a49f1bfb2..f701ff229a 100644 --- a/samples/standalone/pact/pact-http-server/pom.xml +++ b/samples/standalone/pact/pact-http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT Greenwich.BUILD-SNAPSHOT diff --git a/samples/standalone/pact/pom.xml b/samples/standalone/pact/pom.xml index 6d82dfa027..160cfe96ad 100644 --- a/samples/standalone/pact/pom.xml +++ b/samples/standalone/pact/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. @@ -20,7 +20,7 @@ - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 463d2d0246..7b4ca4c6eb 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-samples-standalone pom - 2.1.3.BUILD-SNAPSHOT + 2.1.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/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties index 337deb24f3..d9243d5405 100644 --- a/samples/standalone/restdocs/http-client/gradle.properties +++ b/samples/standalone/restdocs/http-client/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index 5e9fd9ba6e..4d8f245059 100644 --- a/samples/standalone/restdocs/http-client/pom.xml +++ b/samples/standalone/restdocs/http-client/pom.xml @@ -31,14 +31,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index 337deb24f3..d9243d5405 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index beb9c57aef..49dfdea03c 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT true diff --git a/samples/standalone/restdocs/pom.xml b/samples/standalone/restdocs/pom.xml index 290d435f08..2091edd5df 100644 --- a/samples/standalone/restdocs/pom.xml +++ b/samples/standalone/restdocs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/webclient/http-client/gradle.properties b/samples/standalone/webclient/http-client/gradle.properties index 337deb24f3..d9243d5405 100644 --- a/samples/standalone/webclient/http-client/gradle.properties +++ b/samples/standalone/webclient/http-client/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml index 95a7222034..c5becf2706 100644 --- a/samples/standalone/webclient/http-client/pom.xml +++ b/samples/standalone/webclient/http-client/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/webclient/http-server/gradle.properties b/samples/standalone/webclient/http-server/gradle.properties index 337deb24f3..d9243d5405 100644 --- a/samples/standalone/webclient/http-server/gradle.properties +++ b/samples/standalone/webclient/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml index 04543218b0..64e4f64d10 100644 --- a/samples/standalone/webclient/http-server/pom.xml +++ b/samples/standalone/webclient/http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/webclient/pom.xml b/samples/standalone/webclient/pom.xml index c010d242b3..d7d3419b2e 100644 --- a/samples/standalone/webclient/pom.xml +++ b/samples/standalone/webclient/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/standalone/yml/http-client/pom.xml b/samples/standalone/yml/http-client/pom.xml index dc5df2891f..3f906ad68e 100644 --- a/samples/standalone/yml/http-client/pom.xml +++ b/samples/standalone/yml/http-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE diff --git a/samples/standalone/yml/http-server/gradle.properties b/samples/standalone/yml/http-server/gradle.properties index e0ba8cea78..c1ca20c6d1 100644 --- a/samples/standalone/yml/http-server/gradle.properties +++ b/samples/standalone/yml/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT BOM_VERSION=Greenwich.BUILD-SNAPSHOT diff --git a/samples/standalone/yml/http-server/pom.xml b/samples/standalone/yml/http-server/pom.xml index 5f1a2a72e9..7e4e43d636 100644 --- a/samples/standalone/yml/http-server/pom.xml +++ b/samples/standalone/yml/http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT Greenwich.BUILD-SNAPSHOT diff --git a/samples/standalone/yml/pom.xml b/samples/standalone/yml/pom.xml index b309b1b0ae..4ba2bdef38 100644 --- a/samples/standalone/yml/pom.xml +++ b/samples/standalone/yml/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index cd614faf50..0d93540f4e 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index 83af687cc4..f4d5aa4c1a 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 11536abb39..951e6de42f 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index b4e723b871..ae1a4e3551 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.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 64f7cc9e49..5918c4f697 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index e96d869988..d6b61a53be 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE UTF-8 1.8 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 838ed07448..28de46773d 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.1.7.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT spring-cloud-contract-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.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 7b5dbe5199..15297687d4 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-spec/pom.xml b/spring-cloud-contract-spec/pom.xml index a6b50e00ff..c925acc337 100644 --- a/spring-cloud-contract-spec/pom.xml +++ b/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-spec diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index fd5affa58c..74820d194e 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.1.3.BUILD-SNAPSHOT + 2.1.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 93a196c04c..1fb81cd262 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.1.3.BUILD-SNAPSHOT + 2.1.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 62d9b1cbb7..a890404b02 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.1.3.BUILD-SNAPSHOT + 2.1.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 cb76134dcf..43b00acbca 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.1.3.BUILD-SNAPSHOT + 2.1.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 cd96da876c..474003f122 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.1.3.BUILD-SNAPSHOT + 2.1.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 fb0f700c91..867a4ec372 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.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index e26fc92907..6bd5ab27a8 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.1.3.BUILD-SNAPSHOT + 2.1.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 966e52a3fa..bd86c431ef 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.1.3.BUILD-SNAPSHOT + 2.1.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 51304b8658..3802410f2f 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.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=2.1.3.BUILD-SNAPSHOT +springCloudBuildVersion=2.1.8.BUILD-SNAPSHOT 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 4e47b84fa2..d7d7422a1b 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.1.3.BUILD-SNAPSHOT + 2.1.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 2681cc2dd5..92a567feae 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.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.BUILD-SNAPSHOT +verifierVersion=2.1.4.BUILD-SNAPSHOT groovyVersion=2.4.15 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties index 4cc2ee5258..dea67b6321 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.BUILD-SNAPSHOT -bootVersion=2.1.6.RELEASE +verifierVersion=2.1.4.BUILD-SNAPSHOT +bootVersion=2.1.7.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties index 4cc2ee5258..dea67b6321 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.BUILD-SNAPSHOT -bootVersion=2.1.6.RELEASE +verifierVersion=2.1.4.BUILD-SNAPSHOT +bootVersion=2.1.7.RELEASE 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 ea1b101b6f..ccc6861579 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.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.3.BUILD-SNAPSHOT -bootVersion=2.1.6.RELEASE +verifierVersion=2.1.4.BUILD-SNAPSHOT +bootVersion=2.1.7.RELEASE groovyVersion=2.4.15 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 73fcde37dd..84405322f0 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.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. @@ -47,7 +47,7 @@ 1.13.7 - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT 2016 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml index b8cd33951e..d508e1c27a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml index bcf6040f93..0eec9da9b3 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml index 184dda4cb1..a7b09974ea 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml index 525e7b11bd..3ed2ce3826 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml index 184dda4cb1..a7b09974ea 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.6.RELEASE + 2.1.7.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 3aaba6ef9c..d311b57dc7 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.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index d0b42a51cd..60b4beb5c1 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index d9a10bc735..140bf94363 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.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 4bd1e6dc02..7e2dcc82e1 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index 6600be1af3..59f82a80e5 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.1.3.BUILD-SNAPSHOT + 2.1.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 587d2fcb70..606106c342 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.1.3.BUILD-SNAPSHOT + 2.1.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 9f51b5e811..3bf0b030b9 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.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index a2c6883b16..61dd191833 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.1.3.BUILD-SNAPSHOT + 2.1.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 6e8ee6c7c7..c7b2c27a17 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.1.3.BUILD-SNAPSHOT + 2.1.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 b68d2f4365..84688d78e7 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.1.3.BUILD-SNAPSHOT + 2.1.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 5eab826df6..69966d55b9 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.1.3.BUILD-SNAPSHOT + 2.1.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 efd34e6bdf..79feaa35e7 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.1.3.BUILD-SNAPSHOT + 2.1.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 031e4aec15..7b5515b7d6 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.1.3.BUILD-SNAPSHOT + 2.1.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 bf3f3cd173..42bb6abad1 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.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-integration 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 1806122699..edb707abf9 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.1.3.BUILD-SNAPSHOT + 2.1.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 b0d977908d..94a158cb55 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.1.3.BUILD-SNAPSHOT + 2.1.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 373599d1e5..4cf351e2a4 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.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-stream From 876be130ed68dcba2cf838224b03edfce7ecf858 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 17 Sep 2019 17:17:45 +0200 Subject: [PATCH 11/11] Added npe guard; fixes gh-1154 --- .../contract/verifier/messaging/camel/CamelStubMessages.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java index 77346e64aa..e89670b034 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java @@ -76,7 +76,7 @@ public class CamelStubMessages implements MessageVerifier { ConsumerTemplate consumerTemplate = this.context.createConsumerTemplate(); Exchange exchange = consumerTemplate.receive(destination, timeUnit.toMillis(timeout)); - return exchange.getIn(); + return exchange != null ? exchange.getIn() : null; } catch (Exception e) { log.error("Exception occurred while trying to read a message from "