From 3842b4b57af6ce22e1b5f5c4a55e7cdad6854f80 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 19 Apr 2022 15:57:58 +0200 Subject: [PATCH 01/18] Updated wrong versions --- samples/standalone/contracts/com/example/server/pom.xml | 2 +- samples/standalone/dsl/http-client/gradle.properties | 4 ++-- samples/standalone/dsl/http-server/gradle.properties | 4 ++-- samples/standalone/dsl/http-server/pom.xml | 2 +- samples/standalone/restdocs/http-client/gradle.properties | 4 ++-- samples/standalone/restdocs/http-server/gradle.properties | 4 ++-- samples/standalone/webclient/http-client/gradle.properties | 4 ++-- samples/standalone/webclient/http-server/gradle.properties | 4 ++-- .../spring-cloud-contract-gradle-plugin/build.gradle | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml index aba1b2f1f7..3d58e5de6e 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2-SNAPSHOT - 2021.0.1-SNAPSHOT + 2021.0.2-SNAPSHOT true diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties index 7bf4b09fde..598f74ae65 100644 --- a/samples/standalone/dsl/http-client/gradle.properties +++ b/samples/standalone/dsl/http-client/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -BOM_VERSION=2021.0.1-SNAPSHOT -bootVersion=2.6.3 \ No newline at end of file +BOM_VERSION=2021.0.2-SNAPSHOT +bootVersion=2.6.3 diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index 0cae477ca7..67f2db7c29 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.1-SNAPSHOT -bootVersion=2.6.3 \ No newline at end of file +BOM_VERSION=2021.0.2-SNAPSHOT +bootVersion=2.6.3 diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index 65da259ce3..b9e73d7a3d 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2-SNAPSHOT - 2021.0.1-SNAPSHOT + 2021.0.2-SNAPSHOT diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties index 0cae477ca7..67f2db7c29 100644 --- a/samples/standalone/restdocs/http-client/gradle.properties +++ b/samples/standalone/restdocs/http-client/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.1-SNAPSHOT -bootVersion=2.6.3 \ No newline at end of file +BOM_VERSION=2021.0.2-SNAPSHOT +bootVersion=2.6.3 diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index 0cae477ca7..67f2db7c29 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.1-SNAPSHOT -bootVersion=2.6.3 \ No newline at end of file +BOM_VERSION=2021.0.2-SNAPSHOT +bootVersion=2.6.3 diff --git a/samples/standalone/webclient/http-client/gradle.properties b/samples/standalone/webclient/http-client/gradle.properties index 0cae477ca7..67f2db7c29 100644 --- a/samples/standalone/webclient/http-client/gradle.properties +++ b/samples/standalone/webclient/http-client/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.1-SNAPSHOT -bootVersion=2.6.3 \ No newline at end of file +BOM_VERSION=2021.0.2-SNAPSHOT +bootVersion=2.6.3 diff --git a/samples/standalone/webclient/http-server/gradle.properties b/samples/standalone/webclient/http-server/gradle.properties index 0cae477ca7..67f2db7c29 100644 --- a/samples/standalone/webclient/http-server/gradle.properties +++ b/samples/standalone/webclient/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.1-SNAPSHOT -bootVersion=2.6.3 \ No newline at end of file +BOM_VERSION=2021.0.2-SNAPSHOT +bootVersion=2.6.3 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle index a0edb58995..c10ecd6466 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle @@ -67,9 +67,9 @@ dependencies { implementation "com.jcraft:jsch.agentproxy.jsch:${jschVersion}" implementation "com.jcraft:jsch.agentproxy.sshagent:${jschVersion}" implementation "com.jcraft:jsch.agentproxy.usocket-jna:${jschVersion}" - implementation "com.fasterxml.jackson.core:jackson-databind:2.11.4" + implementation "com.fasterxml.jackson.core:jackson-databind:2.13.2.2" - implementation "org.springframework:spring-core:5.3.9" + implementation "org.springframework:spring-core:5.3.18" implementation("org.springframework.cloud:spring-cloud-contract-shade:${project.version}") api("org.springframework.cloud:spring-cloud-contract-stub-runner:${project.version}") { exclude(group: '*') From f433cf1d75a5ba3e3cdb0db352ce4c01c1ab49a2 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 25 Apr 2022 16:15:52 +0200 Subject: [PATCH 02/18] Fixed samples branch for docs --- docs/src/main/asciidoc/_attributes.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/_attributes.adoc b/docs/src/main/asciidoc/_attributes.adoc index bab7934a80..9722650197 100644 --- a/docs/src/main/asciidoc/_attributes.adoc +++ b/docs/src/main/asciidoc/_attributes.adoc @@ -30,9 +30,9 @@ :standalone_pact_path: {samples_path}/standalone/dsl :standalone_restdocs_path: {samples_path}/standalone/restdocs :tests_path: {core_path}/tests -:samples_branch: main +:samples_branch: 3.1.x :samples_url: https://raw.githubusercontent.com/spring-cloud-samples/spring-cloud-contract-samples/{samples_branch} :samples_code: https://github.com/spring-cloud-samples/spring-cloud-contract-samples/tree/{samples_branch}/ :doc_samples: {samples_code}/wiremock-jetty :wiremock_tests: {core_path}/spring-cloud-contract-wiremock -:introduction_url: {core_path} \ No newline at end of file +:introduction_url: {core_path} From 2834969d0b927fbc742d816b0c45fcf9d2520f52 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 00:23:07 +0000 Subject: [PATCH 03/18] Bumping versions --- docker/spring-cloud-contract-docker/project/gradle.properties | 2 +- guides/gs-contract-rest/complete/contract-rest-client/pom.xml | 2 +- guides/gs-contract-rest/complete/contract-rest-service/pom.xml | 2 +- guides/gs-contract-rest/initial/contract-rest-client/pom.xml | 2 +- guides/gs-contract-rest/initial/contract-rest-service/pom.xml | 2 +- .../resources/functionalTest/scenarioProject/gradle.properties | 2 +- .../functionalTest/scenarioProjectKotlin/gradle.properties | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/spring-cloud-contract-docker/project/gradle.properties b/docker/spring-cloud-contract-docker/project/gradle.properties index 3a250f5610..0b95fcc480 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.2-SNAPSHOT -springBootVersion=2.6.6 +springBootVersion=2.6.7 camelVersion=3.11.0 \ No newline at end of file diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index 685e37e987..71d4dbeca1 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index 945b2f1871..59e20765b1 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index 340a709578..238b04c7d3 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 060ea15ab9..69577867fd 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 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 b82cafeb6d..3fcb9a4d64 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 @@ -16,5 +16,5 @@ wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 verifierVersion=3.1.2-SNAPSHOT -bootVersion=2.6.6 +bootVersion=2.6.7 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index b82cafeb6d..3fcb9a4d64 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -16,5 +16,5 @@ wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 verifierVersion=3.1.2-SNAPSHOT -bootVersion=2.6.6 +bootVersion=2.6.7 groovyVersion=2.4.17 From 195f0d00cc90eb1e98e2dae50f3fb75c44b37eac Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 11:27:29 +0200 Subject: [PATCH 04/18] Revert "Bumping versions" This reverts commit 2834969d0b927fbc742d816b0c45fcf9d2520f52. --- docker/spring-cloud-contract-docker/project/gradle.properties | 2 +- guides/gs-contract-rest/complete/contract-rest-client/pom.xml | 2 +- guides/gs-contract-rest/complete/contract-rest-service/pom.xml | 2 +- guides/gs-contract-rest/initial/contract-rest-client/pom.xml | 2 +- guides/gs-contract-rest/initial/contract-rest-service/pom.xml | 2 +- .../resources/functionalTest/scenarioProject/gradle.properties | 2 +- .../functionalTest/scenarioProjectKotlin/gradle.properties | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/spring-cloud-contract-docker/project/gradle.properties b/docker/spring-cloud-contract-docker/project/gradle.properties index 0b95fcc480..3a250f5610 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.2-SNAPSHOT -springBootVersion=2.6.7 +springBootVersion=2.6.6 camelVersion=3.11.0 \ No newline at end of file diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index 71d4dbeca1..685e37e987 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index 59e20765b1..945b2f1871 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index 238b04c7d3..340a709578 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 69577867fd..060ea15ab9 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 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 3fcb9a4d64..b82cafeb6d 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 @@ -16,5 +16,5 @@ wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 verifierVersion=3.1.2-SNAPSHOT -bootVersion=2.6.7 +bootVersion=2.6.6 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index 3fcb9a4d64..b82cafeb6d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -16,5 +16,5 @@ wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 verifierVersion=3.1.2-SNAPSHOT -bootVersion=2.6.7 +bootVersion=2.6.6 groovyVersion=2.4.17 From 3773c2f50e263a5256d9e631fb103fea536e8e7c Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 27 Apr 2022 15:05:46 -0400 Subject: [PATCH 05/18] Adding spring-cloud-stream-dependencies --- .java-version | 1 + docker/spring-cloud-contract-stub-runner-docker/pom.xml | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 .java-version diff --git a/.java-version b/.java-version new file mode 100644 index 0000000000..98d9bcb75a --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +17 diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 697d0db9ff..64c52c33ef 100644 --- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml +++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml @@ -61,6 +61,13 @@ pom runtime + + org.springframework.cloud + spring-cloud-stream-dependencies + ${spring-cloud-stream.version} + pom + runtime + From 482bb9ea080667774507425e73ca31972d0896b1 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 27 Apr 2022 15:06:42 -0400 Subject: [PATCH 06/18] Removing java-version file --- .java-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .java-version diff --git a/.java-version b/.java-version deleted file mode 100644 index 98d9bcb75a..0000000000 --- a/.java-version +++ /dev/null @@ -1 +0,0 @@ -17 From 774230c2fda50f48ac47438b2574ffe1ebda260d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 19:34:59 +0000 Subject: [PATCH 07/18] Update SNAPSHOT to 3.1.2 --- docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 4 ++-- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- .../complete/contract-rest-client/pom.xml | 4 ++-- .../complete/contract-rest-service/pom.xml | 6 +++--- .../initial/contract-rest-client/pom.xml | 2 +- .../initial/contract-rest-service/pom.xml | 6 +++--- guides/pom.xml | 2 +- pom.xml | 16 ++++++++-------- samples/pom.xml | 4 ++-- samples/standalone/pom.xml | 4 ++-- specs/pom.xml | 4 ++-- specs/spring-cloud-contract-spec-groovy/pom.xml | 2 +- specs/spring-cloud-contract-spec-java/pom.xml | 2 +- specs/spring-cloud-contract-spec-kotlin/pom.xml | 2 +- specs/spring-cloud-contract-spec/pom.xml | 2 +- spring-cloud-contract-dependencies/pom.xml | 4 ++-- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-contract-stub-runner-boot/pom.xml | 2 +- spring-cloud-contract-stub-runner/pom.xml | 2 +- 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 +- .../scenarioProject/gradle.properties | 4 ++-- .../scenarioProjectKotlin/gradle.properties | 4 ++-- .../pom.xml | 2 +- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- spring-cloud-contract-wiremock/pom.xml | 2 +- tests/pom.xml | 2 +- tests/samples-messaging-amqp/pom.xml | 2 +- tests/samples-messaging-camel/pom.xml | 2 +- tests/samples-messaging-integration/pom.xml | 2 +- tests/samples-messaging-jms/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 54 files changed, 77 insertions(+), 77 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index d0a84849e2..9dd6e79581 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-docker-parent pom - 3.1.2-SNAPSHOT + 3.1.2 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 7efe4cc3d3..c430551305 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -12,13 +12,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-docker pom - 3.1.2-SNAPSHOT + 3.1.2 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 3a250f5610..c0bbef92f8 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=3.1.2-SNAPSHOT -springBootVersion=2.6.6 +verifierVersion=3.1.2 +springBootVersion=2.6.7 camelVersion=3.11.0 \ No newline at end of file diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 64c52c33ef..32027f193b 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-stub-runner-docker pom - 3.1.2-SNAPSHOT + 3.1.2 Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index 85c4d6d90b..33cc306d73 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-docs diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index 685e37e987..ab4d709101 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,14 +11,14 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 UTF-8 1.8 - 2021.0.2-SNAPSHOT + 2021.0.2 diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index 945b2f1871..d3d30e1a64 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 UTF-8 1.8 - 2021.0.2-SNAPSHOT - 3.1.2-SNAPSHOT + 2021.0.2 + 3.1.2 diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index 340a709578..238b04c7d3 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 060ea15ab9..7a5e4ac874 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 UTF-8 1.8 - 2021.0.2-SNAPSHOT - 3.1.2-SNAPSHOT + 2021.0.2 + 3.1.2 diff --git a/guides/pom.xml b/guides/pom.xml index dad6a3c4a9..f887f681da 100644 --- a/guides/pom.xml +++ b/guides/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-guides diff --git a/pom.xml b/pom.xml index b1dac995a3..dadd8a4641 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-contract-parent pom - 3.1.2-SNAPSHOT + 3.1.2 Spring Cloud Contract Spring Cloud Contract @@ -27,12 +27,12 @@ 3.11.0 4.1.23 0.0.9 - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT - 3.2.3-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.2 + 3.1.1 + 3.2.3 + 3.1.2 + 3.1.0 + 3.1.2 3.0.6.RELEASE 5.0.4 3.2.11 diff --git a/samples/pom.xml b/samples/pom.xml index 4ec862d46f..9dbb6d7994 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-samples pom - 3.1.2-SNAPSHOT + 3.1.2 Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 2d032a6d96..b4b4d6973a 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-samples-standalone pom - 3.1.2-SNAPSHOT + 3.1.2 Spring Cloud Contract Standalone Test Samples Spring Cloud Contract Standalone Test Samples used for end to end tests diff --git a/specs/pom.xml b/specs/pom.xml index 3ea339fa1d..0bac5c5e6d 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-specs pom - 3.1.2-SNAPSHOT + 3.1.2 Spring Cloud Contract Specs Spring Cloud Contract Specs diff --git a/specs/spring-cloud-contract-spec-groovy/pom.xml b/specs/spring-cloud-contract-spec-groovy/pom.xml index 045639c649..ba3befdf66 100644 --- a/specs/spring-cloud-contract-spec-groovy/pom.xml +++ b/specs/spring-cloud-contract-spec-groovy/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 ../.. spring-cloud-contract-spec-groovy diff --git a/specs/spring-cloud-contract-spec-java/pom.xml b/specs/spring-cloud-contract-spec-java/pom.xml index 772e0090ff..59ad01162a 100644 --- a/specs/spring-cloud-contract-spec-java/pom.xml +++ b/specs/spring-cloud-contract-spec-java/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 ../.. spring-cloud-contract-spec-java diff --git a/specs/spring-cloud-contract-spec-kotlin/pom.xml b/specs/spring-cloud-contract-spec-kotlin/pom.xml index 0c5ec283f6..7b4a506900 100644 --- a/specs/spring-cloud-contract-spec-kotlin/pom.xml +++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 ../.. spring-cloud-contract-spec-kotlin diff --git a/specs/spring-cloud-contract-spec/pom.xml b/specs/spring-cloud-contract-spec/pom.xml index a65549bd0e..a8ee30e816 100644 --- a/specs/spring-cloud-contract-spec/pom.xml +++ b/specs/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 ../.. spring-cloud-contract-spec diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 72736d94b5..7b807da3b1 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 - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-contract-dependencies - 3.1.2-SNAPSHOT + 3.1.2 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 ea46c5f43b..b5abbdf23d 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 55f238ad10..02bae9b039 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 f2b8476dd8..bbe74da6d8 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 095bc73ea6..beb61c636d 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 192d8c6107..1037024235 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 8e2fa30860..9ad22f87e7 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 2dca5068c3..afc6708333 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 9aeee6eb9e..3ad863d45c 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 df93c71b3b..a1269c65b8 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 24b1e2d761..c0db9ae809 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=3.1.2-SNAPSHOT +verifierVersion=3.1.2 org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=3.1.2-SNAPSHOT +springCloudBuildVersion=3.1.2 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 e93834aed0..b94af82dda 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 9223df7fb4..61ede15b0f 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.30.1 jsonAssertVersion=0.6.1 -verifierVersion=3.1.2-SNAPSHOT +verifierVersion=3.1.2 groovyVersion=2.4.17 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 b82cafeb6d..f4bd2f9f1f 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.30.1 jsonAssertVersion=0.6.1 -verifierVersion=3.1.2-SNAPSHOT -bootVersion=2.6.6 +verifierVersion=3.1.2 +bootVersion=2.6.7 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index b82cafeb6d..f4bd2f9f1f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -15,6 +15,6 @@ # wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 -verifierVersion=3.1.2-SNAPSHOT -bootVersion=2.6.6 +verifierVersion=3.1.2 +bootVersion=2.6.7 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml index d853e184de..5e20fe5404 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 3.1.2-SNAPSHOT + 3.1.2 .. 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 a009c93195..8021d18f49 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 a35d315a4f..6d01e58761 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index cd7f44be66..94a1daf6bb 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index a0e0c3040c..a696e69e2c 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 8b67ba4cf1..4fc08800f9 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index 421d173423..c16880d087 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 240ca3bb70..9204a962af 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index d41c3a45ed..928ead57f0 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-jms/pom.xml b/tests/samples-messaging-jms/pom.xml index 94b0292595..f64bacdda9 100644 --- a/tests/samples-messaging-jms/pom.xml +++ b/tests/samples-messaging-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-sample-jms diff --git a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml index f84121da53..824340c846 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 d9a2aa9298..998a031a26 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 41f2413620..83405d9804 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 14498f9fc3..a4bc7978e0 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 c8a763d8eb..b58702348f 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 b2e5788c86..a5cd9fc140 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-jms/pom.xml b/tests/spring-cloud-contract-stub-runner-jms/pom.xml index ee05e2830a..4a0e416f17 100644 --- a/tests/spring-cloud-contract-stub-runner-jms/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-stub-runner-jms diff --git a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml index 7355e5ae0b..6093f0716a 100644 --- a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-stub-runner-kafka diff --git a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml index c854d9b2fe..e6de1a8657 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 8c98a253f5..493fc9a75f 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 - 3.1.2-SNAPSHOT + 3.1.2 .. 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 0df7d496e9..642132beab 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 - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-contract-stub-runner-stream From 3737c8e2c914d4de4e3e478e21d87ba57cba94de Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 19:56:13 +0000 Subject: [PATCH 08/18] Going back to snapshots --- docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 4 ++-- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- .../complete/contract-rest-client/pom.xml | 4 ++-- .../complete/contract-rest-service/pom.xml | 6 +++--- .../initial/contract-rest-client/pom.xml | 2 +- .../initial/contract-rest-service/pom.xml | 6 +++--- guides/pom.xml | 2 +- pom.xml | 16 ++++++++-------- samples/pom.xml | 4 ++-- samples/standalone/pom.xml | 4 ++-- specs/pom.xml | 4 ++-- specs/spring-cloud-contract-spec-groovy/pom.xml | 2 +- specs/spring-cloud-contract-spec-java/pom.xml | 2 +- specs/spring-cloud-contract-spec-kotlin/pom.xml | 2 +- specs/spring-cloud-contract-spec/pom.xml | 2 +- spring-cloud-contract-dependencies/pom.xml | 4 ++-- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-contract-stub-runner-boot/pom.xml | 2 +- spring-cloud-contract-stub-runner/pom.xml | 2 +- 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 +- .../scenarioProject/gradle.properties | 4 ++-- .../scenarioProjectKotlin/gradle.properties | 4 ++-- .../pom.xml | 2 +- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- spring-cloud-contract-wiremock/pom.xml | 2 +- tests/pom.xml | 2 +- tests/samples-messaging-amqp/pom.xml | 2 +- tests/samples-messaging-camel/pom.xml | 2 +- tests/samples-messaging-integration/pom.xml | 2 +- tests/samples-messaging-jms/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 54 files changed, 77 insertions(+), 77 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index 9dd6e79581..d0a84849e2 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-docker-parent pom - 3.1.2 + 3.1.2-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 c430551305..7efe4cc3d3 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -12,13 +12,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-docker pom - 3.1.2 + 3.1.2-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 c0bbef92f8..3a250f5610 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=3.1.2 -springBootVersion=2.6.7 +verifierVersion=3.1.2-SNAPSHOT +springBootVersion=2.6.6 camelVersion=3.11.0 \ No newline at end of file diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 32027f193b..64c52c33ef 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-stub-runner-docker pom - 3.1.2 + 3.1.2-SNAPSHOT Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index 33cc306d73..85c4d6d90b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-docs diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index ab4d709101..685e37e987 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,14 +11,14 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 UTF-8 1.8 - 2021.0.2 + 2021.0.2-SNAPSHOT diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index d3d30e1a64..945b2f1871 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 UTF-8 1.8 - 2021.0.2 - 3.1.2 + 2021.0.2-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index 238b04c7d3..340a709578 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 7a5e4ac874..060ea15ab9 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.6.7 + 2.6.6 UTF-8 1.8 - 2021.0.2 - 3.1.2 + 2021.0.2-SNAPSHOT + 3.1.2-SNAPSHOT diff --git a/guides/pom.xml b/guides/pom.xml index f887f681da..dad6a3c4a9 100644 --- a/guides/pom.xml +++ b/guides/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-guides diff --git a/pom.xml b/pom.xml index dadd8a4641..b1dac995a3 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-contract-parent pom - 3.1.2 + 3.1.2-SNAPSHOT Spring Cloud Contract Spring Cloud Contract @@ -27,12 +27,12 @@ 3.11.0 4.1.23 0.0.9 - 3.1.2 - 3.1.1 - 3.2.3 - 3.1.2 - 3.1.0 - 3.1.2 + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT + 3.2.3-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT 3.0.6.RELEASE 5.0.4 3.2.11 diff --git a/samples/pom.xml b/samples/pom.xml index 9dbb6d7994..4ec862d46f 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-samples pom - 3.1.2 + 3.1.2-SNAPSHOT Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index b4b4d6973a..2d032a6d96 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-samples-standalone pom - 3.1.2 + 3.1.2-SNAPSHOT Spring Cloud Contract Standalone Test Samples Spring Cloud Contract Standalone Test Samples used for end to end tests diff --git a/specs/pom.xml b/specs/pom.xml index 0bac5c5e6d..3ea339fa1d 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-specs pom - 3.1.2 + 3.1.2-SNAPSHOT Spring Cloud Contract Specs Spring Cloud Contract Specs diff --git a/specs/spring-cloud-contract-spec-groovy/pom.xml b/specs/spring-cloud-contract-spec-groovy/pom.xml index ba3befdf66..045639c649 100644 --- a/specs/spring-cloud-contract-spec-groovy/pom.xml +++ b/specs/spring-cloud-contract-spec-groovy/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT ../.. spring-cloud-contract-spec-groovy diff --git a/specs/spring-cloud-contract-spec-java/pom.xml b/specs/spring-cloud-contract-spec-java/pom.xml index 59ad01162a..772e0090ff 100644 --- a/specs/spring-cloud-contract-spec-java/pom.xml +++ b/specs/spring-cloud-contract-spec-java/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT ../.. spring-cloud-contract-spec-java diff --git a/specs/spring-cloud-contract-spec-kotlin/pom.xml b/specs/spring-cloud-contract-spec-kotlin/pom.xml index 7b4a506900..0c5ec283f6 100644 --- a/specs/spring-cloud-contract-spec-kotlin/pom.xml +++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT ../.. spring-cloud-contract-spec-kotlin diff --git a/specs/spring-cloud-contract-spec/pom.xml b/specs/spring-cloud-contract-spec/pom.xml index a8ee30e816..a65549bd0e 100644 --- a/specs/spring-cloud-contract-spec/pom.xml +++ b/specs/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT ../.. spring-cloud-contract-spec diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 7b807da3b1..72736d94b5 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 - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-contract-dependencies - 3.1.2 + 3.1.2-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 b5abbdf23d..ea46c5f43b 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 02bae9b039..55f238ad10 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 - 3.1.2 + 3.1.2-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 bbe74da6d8..f2b8476dd8 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 - 3.1.2 + 3.1.2-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 beb61c636d..095bc73ea6 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 - 3.1.2 + 3.1.2-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 1037024235..192d8c6107 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 - 3.1.2 + 3.1.2-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 9ad22f87e7..8e2fa30860 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 - 3.1.2 + 3.1.2-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 afc6708333..2dca5068c3 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 3ad863d45c..9aeee6eb9e 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 - 3.1.2 + 3.1.2-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 a1269c65b8..df93c71b3b 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 - 3.1.2 + 3.1.2-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 c0db9ae809..24b1e2d761 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=3.1.2 +verifierVersion=3.1.2-SNAPSHOT org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=3.1.2 +springCloudBuildVersion=3.1.2-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 b94af82dda..e93834aed0 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 - 3.1.2 + 3.1.2-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 61ede15b0f..9223df7fb4 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.30.1 jsonAssertVersion=0.6.1 -verifierVersion=3.1.2 +verifierVersion=3.1.2-SNAPSHOT groovyVersion=2.4.17 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 f4bd2f9f1f..b82cafeb6d 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.30.1 jsonAssertVersion=0.6.1 -verifierVersion=3.1.2 -bootVersion=2.6.7 +verifierVersion=3.1.2-SNAPSHOT +bootVersion=2.6.6 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index f4bd2f9f1f..b82cafeb6d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -15,6 +15,6 @@ # wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 -verifierVersion=3.1.2 -bootVersion=2.6.7 +verifierVersion=3.1.2-SNAPSHOT +bootVersion=2.6.6 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml index 5e20fe5404..d853e184de 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index 8021d18f49..a009c93195 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 - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml index 6d01e58761..a35d315a4f 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index 94a1daf6bb..cd7f44be66 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index a696e69e2c..a0e0c3040c 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 4fc08800f9..8b67ba4cf1 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2 + 3.1.2-SNAPSHOT .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index c16880d087..421d173423 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 9204a962af..240ca3bb70 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index 928ead57f0..d41c3a45ed 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-jms/pom.xml b/tests/samples-messaging-jms/pom.xml index f64bacdda9..94b0292595 100644 --- a/tests/samples-messaging-jms/pom.xml +++ b/tests/samples-messaging-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-sample-jms diff --git a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml index 824340c846..f84121da53 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 - 3.1.2 + 3.1.2-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 998a031a26..d9a2aa9298 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 - 3.1.2 + 3.1.2-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 83405d9804..41f2413620 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 - 3.1.2 + 3.1.2-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 a4bc7978e0..14498f9fc3 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 - 3.1.2 + 3.1.2-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 b58702348f..c8a763d8eb 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 - 3.1.2 + 3.1.2-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 a5cd9fc140..b2e5788c86 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-jms/pom.xml b/tests/spring-cloud-contract-stub-runner-jms/pom.xml index 4a0e416f17..ee05e2830a 100644 --- a/tests/spring-cloud-contract-stub-runner-jms/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-stub-runner-jms diff --git a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml index 6093f0716a..7355e5ae0b 100644 --- a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-stub-runner-kafka diff --git a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml index e6de1a8657..c854d9b2fe 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 - 3.1.2 + 3.1.2-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 493fc9a75f..8c98a253f5 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 - 3.1.2 + 3.1.2-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 642132beab..0df7d496e9 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 - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-contract-stub-runner-stream From e08abcb423e66390fa080dbb06ccfc6c4602b28f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 19:56:14 +0000 Subject: [PATCH 09/18] Bumping versions to 3.1.3-SNAPSHOT after release --- docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 4 ++-- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- .../complete/contract-rest-client/pom.xml | 4 ++-- .../complete/contract-rest-service/pom.xml | 6 +++--- .../initial/contract-rest-client/pom.xml | 2 +- .../initial/contract-rest-service/pom.xml | 6 +++--- guides/pom.xml | 2 +- pom.xml | 16 ++++++++-------- samples/pom.xml | 4 ++-- .../contracts/com/example/server/pom.xml | 6 +++--- .../standalone/dsl/http-client/gradle.properties | 4 ++-- samples/standalone/dsl/http-client/pom.xml | 2 +- .../standalone/dsl/http-server/gradle.properties | 6 +++--- samples/standalone/dsl/http-server/pom.xml | 6 +++--- samples/standalone/dsl/pom.xml | 4 ++-- samples/standalone/pom.xml | 4 ++-- .../restdocs/http-client/gradle.properties | 6 +++--- samples/standalone/restdocs/http-client/pom.xml | 4 ++-- .../restdocs/http-server/gradle.properties | 6 +++--- samples/standalone/restdocs/http-server/pom.xml | 4 ++-- samples/standalone/restdocs/pom.xml | 4 ++-- .../webclient/http-client/gradle.properties | 6 +++--- samples/standalone/webclient/http-client/pom.xml | 4 ++-- .../webclient/http-server/gradle.properties | 6 +++--- samples/standalone/webclient/http-server/pom.xml | 4 ++-- samples/standalone/webclient/pom.xml | 4 ++-- specs/pom.xml | 4 ++-- specs/spring-cloud-contract-spec-groovy/pom.xml | 2 +- specs/spring-cloud-contract-spec-java/pom.xml | 2 +- specs/spring-cloud-contract-spec-kotlin/pom.xml | 2 +- specs/spring-cloud-contract-spec/pom.xml | 2 +- spring-cloud-contract-dependencies/pom.xml | 4 ++-- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-contract-stub-runner-boot/pom.xml | 2 +- spring-cloud-contract-stub-runner/pom.xml | 2 +- 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 +- .../scenarioProject/gradle.properties | 4 ++-- .../scenarioProjectKotlin/gradle.properties | 4 ++-- .../pom.xml | 2 +- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- .../test/projects/complex-configuration/pom.xml | 2 +- .../module/pom.xml | 2 +- .../src/test/projects/plugin-extension/pom.xml | 2 +- .../src/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-jms/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 75 files changed, 120 insertions(+), 120 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index d0a84849e2..2de424cab8 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-docker-parent pom - 3.1.2-SNAPSHOT + 3.1.3-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 7efe4cc3d3..9a040314b0 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -12,13 +12,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-docker pom - 3.1.2-SNAPSHOT + 3.1.3-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 3a250f5610..4a61174e6a 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=3.1.2-SNAPSHOT -springBootVersion=2.6.6 +verifierVersion=3.1.3-SNAPSHOT +springBootVersion=2.6.7 camelVersion=3.11.0 \ No newline at end of file diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 64c52c33ef..cb3efa4e54 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-stub-runner-docker pom - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index 85c4d6d90b..ea2d858880 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-docs diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index 685e37e987..6b763706d9 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,14 +11,14 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 UTF-8 1.8 - 2021.0.2-SNAPSHOT + 2021.0.2.SNAPSHOT diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index 945b2f1871..124a1cb798 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 UTF-8 1.8 - 2021.0.2-SNAPSHOT - 3.1.2-SNAPSHOT + 2021.0.2.SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index 340a709578..238b04c7d3 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 060ea15ab9..40dc63dc4b 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.6.7 UTF-8 1.8 - 2021.0.2-SNAPSHOT - 3.1.2-SNAPSHOT + 2021.0.2.SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/guides/pom.xml b/guides/pom.xml index dad6a3c4a9..2bdf2106a2 100644 --- a/guides/pom.xml +++ b/guides/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-guides diff --git a/pom.xml b/pom.xml index b1dac995a3..1461269190 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-contract-parent pom - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT Spring Cloud Contract Spring Cloud Contract @@ -27,12 +27,12 @@ 3.11.0 4.1.23 0.0.9 - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT - 3.2.3-SNAPSHOT - 3.1.2-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.2 + 3.1.1 + 3.2.4-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.0 + 3.1.3-SNAPSHOT 3.0.6.RELEASE 5.0.4 3.2.11 diff --git a/samples/pom.xml b/samples/pom.xml index 4ec862d46f..e156dcb573 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-samples pom - 3.1.2-SNAPSHOT + 3.1.3-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 3d58e5de6e..df1df4e88c 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -14,15 +14,15 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.7 UTF-8 1.8 - 3.1.2-SNAPSHOT - 2021.0.2-SNAPSHOT + 3.1.3-SNAPSHOT + 2021.0.2.SNAPSHOT true diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties index 598f74ae65..c266323428 100644 --- a/samples/standalone/dsl/http-client/gradle.properties +++ b/samples/standalone/dsl/http-client/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -BOM_VERSION=2021.0.2-SNAPSHOT -bootVersion=2.6.3 +BOM_VERSION=2021.0.2.SNAPSHOT +bootVersion=2.6.7 diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index 42e19e8524..287969dffd 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.6.3 + 2.6.7 diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index 67f2db7c29..2b27d6bed2 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.2-SNAPSHOT -bootVersion=2.6.3 +verifierVersion=3.1.3-SNAPSHOT +BOM_VERSION=2021.0.2.SNAPSHOT +bootVersion=2.6.7 diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index b9e73d7a3d..81eef3b760 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -14,15 +14,15 @@ org.springframework.boot spring-boot-starter-parent - 2.6.3 + 2.6.7 UTF-8 1.8 - 3.1.2-SNAPSHOT - 2021.0.2-SNAPSHOT + 3.1.3-SNAPSHOT + 2021.0.2.SNAPSHOT diff --git a/samples/standalone/dsl/pom.xml b/samples/standalone/dsl/pom.xml index 69cd3b3b1b..8f01369828 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. @@ -19,7 +19,7 @@ - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 2d032a6d96..51a120dd11 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-samples-standalone pom - 3.1.2-SNAPSHOT + 3.1.3-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 67f2db7c29..2b27d6bed2 100644 --- a/samples/standalone/restdocs/http-client/gradle.properties +++ b/samples/standalone/restdocs/http-client/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.2-SNAPSHOT -bootVersion=2.6.3 +verifierVersion=3.1.3-SNAPSHOT +BOM_VERSION=2021.0.2.SNAPSHOT +bootVersion=2.6.7 diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index 186ffba4ad..e95d4a9949 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.6.3 + 2.6.7 UTF-8 1.8 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index 67f2db7c29..2b27d6bed2 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.2-SNAPSHOT -bootVersion=2.6.3 +verifierVersion=3.1.3-SNAPSHOT +BOM_VERSION=2021.0.2.SNAPSHOT +bootVersion=2.6.7 diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index 58a6e0250c..f5e2139dab 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.6.3 + 2.6.7 UTF-8 1.8 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT true diff --git a/samples/standalone/restdocs/pom.xml b/samples/standalone/restdocs/pom.xml index e531729986..02dc0bdc19 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. @@ -19,7 +19,7 @@ - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/samples/standalone/webclient/http-client/gradle.properties b/samples/standalone/webclient/http-client/gradle.properties index 67f2db7c29..2b27d6bed2 100644 --- a/samples/standalone/webclient/http-client/gradle.properties +++ b/samples/standalone/webclient/http-client/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.2-SNAPSHOT -bootVersion=2.6.3 +verifierVersion=3.1.3-SNAPSHOT +BOM_VERSION=2021.0.2.SNAPSHOT +bootVersion=2.6.7 diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml index 406e92ba62..68c132f144 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.6.3 + 2.6.7 UTF-8 1.8 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/samples/standalone/webclient/http-server/gradle.properties b/samples/standalone/webclient/http-server/gradle.properties index 67f2db7c29..2b27d6bed2 100644 --- a/samples/standalone/webclient/http-server/gradle.properties +++ b/samples/standalone/webclient/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=3.1.2-SNAPSHOT -BOM_VERSION=2021.0.2-SNAPSHOT -bootVersion=2.6.3 +verifierVersion=3.1.3-SNAPSHOT +BOM_VERSION=2021.0.2.SNAPSHOT +bootVersion=2.6.7 diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml index bc82ed1104..35b89ee8db 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.6.3 + 2.6.7 UTF-8 1.8 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/samples/standalone/webclient/pom.xml b/samples/standalone/webclient/pom.xml index 732d882bf3..f8d45a5e04 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. @@ -19,7 +19,7 @@ - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT diff --git a/specs/pom.xml b/specs/pom.xml index 3ea339fa1d..8ffe3e2b72 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-specs pom - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT Spring Cloud Contract Specs Spring Cloud Contract Specs diff --git a/specs/spring-cloud-contract-spec-groovy/pom.xml b/specs/spring-cloud-contract-spec-groovy/pom.xml index 045639c649..61b94741fb 100644 --- a/specs/spring-cloud-contract-spec-groovy/pom.xml +++ b/specs/spring-cloud-contract-spec-groovy/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT ../.. spring-cloud-contract-spec-groovy diff --git a/specs/spring-cloud-contract-spec-java/pom.xml b/specs/spring-cloud-contract-spec-java/pom.xml index 772e0090ff..5cb19ce19e 100644 --- a/specs/spring-cloud-contract-spec-java/pom.xml +++ b/specs/spring-cloud-contract-spec-java/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT ../.. spring-cloud-contract-spec-java diff --git a/specs/spring-cloud-contract-spec-kotlin/pom.xml b/specs/spring-cloud-contract-spec-kotlin/pom.xml index 0c5ec283f6..0662579d75 100644 --- a/specs/spring-cloud-contract-spec-kotlin/pom.xml +++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT ../.. spring-cloud-contract-spec-kotlin diff --git a/specs/spring-cloud-contract-spec/pom.xml b/specs/spring-cloud-contract-spec/pom.xml index a65549bd0e..78f13a2551 100644 --- a/specs/spring-cloud-contract-spec/pom.xml +++ b/specs/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT ../.. spring-cloud-contract-spec diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 72736d94b5..5029f57fb9 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-contract-dependencies - 3.1.2-SNAPSHOT + 3.1.3-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 ea46c5f43b..4177ee120c 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 55f238ad10..f83b7f1f79 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 - 3.1.2-SNAPSHOT + 3.1.3-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 f2b8476dd8..9248fcea83 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 - 3.1.2-SNAPSHOT + 3.1.3-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 095bc73ea6..7be7715ff1 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 - 3.1.2-SNAPSHOT + 3.1.3-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 192d8c6107..80a6835727 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 - 3.1.2-SNAPSHOT + 3.1.3-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 8e2fa30860..a01f0cfb3f 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 - 3.1.2-SNAPSHOT + 3.1.3-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 2dca5068c3..fa6029d866 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 9aeee6eb9e..90952e3be9 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 - 3.1.2-SNAPSHOT + 3.1.3-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 df93c71b3b..6c5e87510e 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 - 3.1.2-SNAPSHOT + 3.1.3-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 24b1e2d761..6b1123a8b1 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=3.1.2-SNAPSHOT +verifierVersion=3.1.3-SNAPSHOT org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=3.1.2-SNAPSHOT +springCloudBuildVersion=3.1.2 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 e93834aed0..4c65a2e1cf 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 - 3.1.2-SNAPSHOT + 3.1.3-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 9223df7fb4..033366225f 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.30.1 jsonAssertVersion=0.6.1 -verifierVersion=3.1.2-SNAPSHOT +verifierVersion=3.1.3-SNAPSHOT groovyVersion=2.4.17 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 b82cafeb6d..5399b5199a 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.30.1 jsonAssertVersion=0.6.1 -verifierVersion=3.1.2-SNAPSHOT -bootVersion=2.6.6 +verifierVersion=3.1.3-SNAPSHOT +bootVersion=2.6.7 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index b82cafeb6d..5399b5199a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -15,6 +15,6 @@ # wiremockVersion=2.30.1 jsonAssertVersion=0.6.1 -verifierVersion=3.1.2-SNAPSHOT -bootVersion=2.6.6 +verifierVersion=3.1.3-SNAPSHOT +bootVersion=2.6.7 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml index d853e184de..e5ca9c685d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index a009c93195..e7768ff22d 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. 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 92ec1a63ce..32d705ae10 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.6.3 + 2.6.7 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 14384262fc..d792cabf50 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.6.3 + 2.6.7 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 e8f92f58f2..d05637a984 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.6.3 + 2.6.7 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 844420152b..0f25f77b19 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.6.3 + 2.6.7 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 e8f92f58f2..d05637a984 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.6.3 + 2.6.7 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 a35d315a4f..c263f953e1 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index cd7f44be66..c149f9a3f8 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index a0e0c3040c..9e04da8ac6 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 8b67ba4cf1..e584acf468 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index 421d173423..3159b37a90 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 240ca3bb70..d2d8d8a74a 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index d41c3a45ed..02a8d239b9 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-jms/pom.xml b/tests/samples-messaging-jms/pom.xml index 94b0292595..c938cf8313 100644 --- a/tests/samples-messaging-jms/pom.xml +++ b/tests/samples-messaging-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-sample-jms diff --git a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml index f84121da53..b176fb6004 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 - 3.1.2-SNAPSHOT + 3.1.3-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 d9a2aa9298..ec72b96ef8 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 - 3.1.2-SNAPSHOT + 3.1.3-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 41f2413620..30748571cd 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 - 3.1.2-SNAPSHOT + 3.1.3-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 14498f9fc3..5f18278f6c 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 - 3.1.2-SNAPSHOT + 3.1.3-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 c8a763d8eb..35a0aeaef9 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 - 3.1.2-SNAPSHOT + 3.1.3-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 b2e5788c86..779d620b86 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-jms/pom.xml b/tests/spring-cloud-contract-stub-runner-jms/pom.xml index ee05e2830a..d031538ee6 100644 --- a/tests/spring-cloud-contract-stub-runner-jms/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-stub-runner-jms diff --git a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml index 7355e5ae0b..f691f9a324 100644 --- a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-stub-runner-kafka diff --git a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml index c854d9b2fe..717f5e3112 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 - 3.1.2-SNAPSHOT + 3.1.3-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 8c98a253f5..adf17abdc1 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 - 3.1.2-SNAPSHOT + 3.1.3-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 0df7d496e9..ee59a5d003 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 - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-contract-stub-runner-stream From 3b33f2a9d13ba4fecdb1aade74d5cf037aa3d43e Mon Sep 17 00:00:00 2001 From: Renato Ivancic Date: Thu, 28 Apr 2022 16:26:48 +0200 Subject: [PATCH 10/18] Gradle plugin warning from GenerateClientStubsFromDslTask (#1773) (#1775) Co-authored-by: riva --- .../verifier/plugin/GenerateClientStubsFromDslTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateClientStubsFromDslTask.java b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateClientStubsFromDslTask.java index 92b00f6345..175c1a4503 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateClientStubsFromDslTask.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateClientStubsFromDslTask.java @@ -91,7 +91,7 @@ class GenerateClientStubsFromDslTask extends DefaultTask { } try { getProject().javaexec(exec -> { - exec.setMain("org.springframework.cloud.contract.verifier.converter.RecursiveFilesConverterApplication"); + exec.getMainClass().set("org.springframework.cloud.contract.verifier.converter.RecursiveFilesConverterApplication"); exec.classpath(classpath); exec.args(quoteAndEscape(output.getAbsolutePath()), quoteAndEscape(contractsDslDir.get().getAsFile().getAbsolutePath()), quoteAndEscape(StringUtils.collectionToCommaDelimitedString(excludedFiles.get())), quoteAndEscape(".*"), excludeBuildFolders.get()); From e29e594b12861f5c0650d30ec01d3098e086fd58 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 3 May 2022 00:23:12 +0000 Subject: [PATCH 11/18] Bumping versions --- pom.xml | 4 ++-- .../spring-cloud-contract-gradle-plugin/gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1461269190..b09f249efd 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.3-SNAPSHOT @@ -27,7 +27,7 @@ 3.11.0 4.1.23 0.0.9 - 3.1.2 + 3.1.3-SNAPSHOT 3.1.1 3.2.4-SNAPSHOT 3.1.3-SNAPSHOT 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 6b1123a8b1..22ac7c0a33 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 @@ -18,4 +18,4 @@ nexusPassword= verifierVersion=3.1.3-SNAPSHOT org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=3.1.2 +springCloudBuildVersion=3.1.3-SNAPSHOT From b23a71e3902033e466edb8e254883c7318900d6e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 5 May 2022 00:21:50 +0000 Subject: [PATCH 12/18] Bumping versions --- guides/gs-contract-rest/complete/contract-rest-client/pom.xml | 2 +- guides/gs-contract-rest/complete/contract-rest-service/pom.xml | 2 +- guides/gs-contract-rest/initial/contract-rest-service/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index 6b763706d9..237851db21 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -18,7 +18,7 @@ UTF-8 1.8 - 2021.0.2.SNAPSHOT + 2021.0.3-SNAPSHOT diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index 124a1cb798..5b6ea1139e 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -18,7 +18,7 @@ UTF-8 1.8 - 2021.0.2.SNAPSHOT + 2021.0.3-SNAPSHOT 3.1.3-SNAPSHOT diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 40dc63dc4b..e0e4273e9b 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -18,7 +18,7 @@ UTF-8 1.8 - 2021.0.2.SNAPSHOT + 2021.0.3-SNAPSHOT 3.1.3-SNAPSHOT From 1304ccab0b681e126d56c836c631467c7b20a1bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Zieli=C5=84ski?= Date: Thu, 5 May 2022 10:46:49 +0200 Subject: [PATCH 13/18] #1778 properly resole query parameters for url and urlPath property in YAML files (#1780) Co-authored-by: maciezie --- .../verifier/converter/YamlToContracts.java | 55 ++++++++----------- .../YamlContractConverterSpec.groovy | 28 +++++++--- 2 files changed, 44 insertions(+), 39 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/converter/YamlToContracts.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/converter/YamlToContracts.java index c3bbad2707..9800d93cdd 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/converter/YamlToContracts.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/converter/YamlToContracts.java @@ -54,6 +54,7 @@ import org.springframework.cloud.contract.spec.internal.OutputMessage; import org.springframework.cloud.contract.spec.internal.RegexPatterns; import org.springframework.cloud.contract.spec.internal.Request; import org.springframework.cloud.contract.spec.internal.Response; +import org.springframework.cloud.contract.spec.internal.Url; import org.springframework.cloud.contract.verifier.util.ContentType; import org.springframework.cloud.contract.verifier.util.NamesUtil; import org.springframework.util.StringUtils; @@ -169,7 +170,7 @@ class YamlToContracts { if (yamlContractRequest != null) { dslContract.request((dslContractRequest) -> { mapRequestMethod(yamlContractRequest, dslContractRequest); - mapRequestUrl(yamlContractRequest, dslContractRequest); + mapRequestUrl(yamlContract, dslContractRequest); mapRequestUrlPath(yamlContract, dslContractRequest); mapRequestHeaders(yamlContractRequest, dslContractRequest); mapRequestCookies(yamlContractRequest, dslContractRequest); @@ -186,24 +187,13 @@ class YamlToContracts { } } - private void mapRequestUrl(YamlContract.Request yamlContractRequest, Request dslContractRequest) { - String yamlContractRequestUrl = yamlContractRequest.url; + private void mapRequestUrl(YamlContract yamlContract, Request dslContractRequest) { + String yamlContractRequestUrl = yamlContract.request.url; if (yamlContractRequestUrl != null) { YamlContract.KeyValueMatcher yamlContractRequestMatchersUrl = Optional - .ofNullable(yamlContractRequest.matchers).map(matchers -> matchers.url).orElse(null); - dslContractRequest.url(urlValue(yamlContractRequestUrl, yamlContractRequestMatchersUrl), (url) -> { - if (yamlContractRequest.queryParameters != null) { - url.queryParameters( - (queryParameters -> yamlContractRequest.queryParameters.forEach((key, value) -> { - if (value instanceof List) { - ((List) value).forEach(v -> queryParameters.parameter(key, v)); - } - else { - queryParameters.parameter(key, value); - } - }))); - } - }); + .ofNullable(yamlContract.request.matchers).map(matchers -> matchers.url).orElse(null); + dslContractRequest.url(urlValue(yamlContractRequestUrl, yamlContractRequestMatchersUrl), + url -> handleQueryParameters(yamlContract, url)); } } @@ -212,20 +202,23 @@ class YamlToContracts { if (yamlContractRequestUrlPath != null) { YamlContract.KeyValueMatcher yamlContractRequestMatchersUrl = Optional .ofNullable(yamlContract.request.matchers).map(matchers -> matchers.url).orElse(null); - dslContractRequest.urlPath(urlValue(yamlContractRequestUrlPath, yamlContractRequestMatchersUrl), (url) -> { - if (yamlContract.request.queryParameters != null) { - url.queryParameters( - (queryParameters -> yamlContract.request.queryParameters.forEach((key, value) -> { - if (value instanceof List) { - ((List) value).forEach( - v -> queryParameters.parameter(key, queryParamValue(yamlContract, key, v))); - } - else { - queryParameters.parameter(key, queryParamValue(yamlContract, key, value)); - } - }))); - } - }); + dslContractRequest.urlPath(urlValue(yamlContractRequestUrlPath, yamlContractRequestMatchersUrl), + urlPath -> handleQueryParameters(yamlContract, urlPath)); + } + } + + private void handleQueryParameters(YamlContract yamlContract, Url url) { + if (yamlContract.request.queryParameters != null) { + url.queryParameters( + (queryParameters -> yamlContract.request.queryParameters.forEach((key, value) -> { + if (value instanceof List) { + ((List) value).forEach( + v -> queryParameters.parameter(key, queryParamValue(yamlContract, key, v))); + } + else { + queryParameters.parameter(key, queryParamValue(yamlContract, key, value)); + } + }))); } } diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy index 2b4f8bc1f8..d59b7e8ed1 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy @@ -22,6 +22,7 @@ import groovy.json.JsonSlurper import spock.lang.Issue import spock.lang.Shared import spock.lang.Specification +import spock.lang.Unroll import org.springframework.cloud.contract.spec.Contract import org.springframework.cloud.contract.spec.internal.ExecutionProperty @@ -72,8 +73,6 @@ class YamlContractConverterSpec extends Specification { File ymlBody = new File(ymlBodyFile.toURI()) URL ymlReferenceFile = YamlContractConverterSpec.getResource("/yml/contract_reference_request.yml") File ymlReference = new File(ymlReferenceFile.toURI()) - URL ymlMatchersFile = YamlContractConverterSpec.getResource("/yml/contract_matchers.yml") - File ymlMatchers = new File(ymlMatchersFile.toURI()) URL ymlMultipleFile = YamlContractConverterSpec.getResource("/yml/multiple_contracts.yml") File ymlMultiple = new File(ymlMultipleFile.toURI()) URL ymlMessagingMatchersFile = YamlContractConverterSpec.getResource("/yml/contract_message_matchers.yml") @@ -259,9 +258,18 @@ class YamlContractConverterSpec extends Specification { } } - def "should convert YAML with REST matchers to DSL"() { + @Issue('#1778') + @Unroll + def 'should convert YAML with REST matchers and path property #urlPropertyName to DSL'() { given: - assert converter.isAccepted(ymlMatchers) + File ymlMatchers = File.createTempFile('contract_matchers', '.yml').with { + write YamlContractConverterSpec.getResource('/yml/contract_matchers.yml') + .text + .replace('\n urlPath:', "\n $urlPropertyName:") + it + } + expect: + converter.isAccepted(ymlMatchers) when: Collection contracts = converter.convertFrom(ymlMatchers) then: @@ -271,10 +279,11 @@ class YamlContractConverterSpec extends Specification { it.name == "Content-Type" && ((Pattern) it.clientValue).pattern() == "application/json.*" && it.serverValue == "application/json" } - ((Pattern) contract.request.urlPath.clientValue).pattern() == "/get/[0-9]" - contract.request.urlPath.serverValue == "/get/1" - contract.request.urlPath.queryParameters.parameters.size() == 8 - QueryParameters queryParameters = contract.request.urlPath.queryParameters + def url = contract.request."$urlPropertyName" + ((Pattern) url.clientValue).pattern() == "/get/[0-9]" + url.serverValue == "/get/1" + url.queryParameters.parameters.size() == 8 + QueryParameters queryParameters = url.queryParameters assertQueryParam(queryParameters, "limit", 10, MatchingStrategy.Type.EQUAL_TO, 20) assertQueryParam(queryParameters, "offset", 20, @@ -378,6 +387,9 @@ class YamlContractConverterSpec extends Specification { contract.response.bodyMatchers.matchers[15].path() == '$.duck' contract.response.bodyMatchers.matchers[15].matchingType() == COMMAND contract.response.bodyMatchers.matchers[15].value() == new ExecutionProperty('assertThatValueIsANumber($it)') + + where: + urlPropertyName << ['url', 'urlPath'] } protected Object assertQueryParam(QueryParameters queryParameters, String queryParamName, Object serverValue, From fee389c57a6b7bdc9e9e3cd1bcf861e1431baffd Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 5 May 2022 11:15:56 +0200 Subject: [PATCH 14/18] Fixed invalid poms --- samples/standalone/contracts/com/example/server/pom.xml | 2 +- samples/standalone/dsl/http-client/gradle.properties | 2 +- samples/standalone/dsl/http-server/gradle.properties | 2 +- samples/standalone/dsl/http-server/pom.xml | 2 +- samples/standalone/restdocs/http-client/gradle.properties | 2 +- samples/standalone/restdocs/http-server/gradle.properties | 2 +- samples/standalone/webclient/http-client/gradle.properties | 2 +- samples/standalone/webclient/http-server/gradle.properties | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml index df1df4e88c..2d408197d7 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.3-SNAPSHOT - 2021.0.2.SNAPSHOT + 2021.0.3-SNAPSHOT true diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties index c266323428..217c14f514 100644 --- a/samples/standalone/dsl/http-client/gradle.properties +++ b/samples/standalone/dsl/http-client/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -BOM_VERSION=2021.0.2.SNAPSHOT +BOM_VERSION=2021.0.3-SNAPSHOT bootVersion=2.6.7 diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index 2b27d6bed2..51e46aabdb 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.3-SNAPSHOT -BOM_VERSION=2021.0.2.SNAPSHOT +BOM_VERSION=2021.0.3-SNAPSHOT bootVersion=2.6.7 diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index 81eef3b760..caaf8bc126 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.3-SNAPSHOT - 2021.0.2.SNAPSHOT + 2021.0.3-SNAPSHOT diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties index 2b27d6bed2..51e46aabdb 100644 --- a/samples/standalone/restdocs/http-client/gradle.properties +++ b/samples/standalone/restdocs/http-client/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.3-SNAPSHOT -BOM_VERSION=2021.0.2.SNAPSHOT +BOM_VERSION=2021.0.3-SNAPSHOT bootVersion=2.6.7 diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index 2b27d6bed2..51e46aabdb 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.3-SNAPSHOT -BOM_VERSION=2021.0.2.SNAPSHOT +BOM_VERSION=2021.0.3-SNAPSHOT bootVersion=2.6.7 diff --git a/samples/standalone/webclient/http-client/gradle.properties b/samples/standalone/webclient/http-client/gradle.properties index 2b27d6bed2..51e46aabdb 100644 --- a/samples/standalone/webclient/http-client/gradle.properties +++ b/samples/standalone/webclient/http-client/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.3-SNAPSHOT -BOM_VERSION=2021.0.2.SNAPSHOT +BOM_VERSION=2021.0.3-SNAPSHOT bootVersion=2.6.7 diff --git a/samples/standalone/webclient/http-server/gradle.properties b/samples/standalone/webclient/http-server/gradle.properties index 2b27d6bed2..51e46aabdb 100644 --- a/samples/standalone/webclient/http-server/gradle.properties +++ b/samples/standalone/webclient/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.1.3-SNAPSHOT -BOM_VERSION=2021.0.2.SNAPSHOT +BOM_VERSION=2021.0.3-SNAPSHOT bootVersion=2.6.7 From b77ae2ca3e9bf6621a83fdb4dda51a276a0e3ca0 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 6 May 2022 00:23:05 +0000 Subject: [PATCH 15/18] Bumping versions --- .../verifier/converter/YamlToContracts.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/converter/YamlToContracts.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/converter/YamlToContracts.java index 9800d93cdd..e76a61c855 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/converter/YamlToContracts.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/converter/YamlToContracts.java @@ -209,16 +209,15 @@ class YamlToContracts { private void handleQueryParameters(YamlContract yamlContract, Url url) { if (yamlContract.request.queryParameters != null) { - url.queryParameters( - (queryParameters -> yamlContract.request.queryParameters.forEach((key, value) -> { - if (value instanceof List) { - ((List) value).forEach( - v -> queryParameters.parameter(key, queryParamValue(yamlContract, key, v))); - } - else { - queryParameters.parameter(key, queryParamValue(yamlContract, key, value)); - } - }))); + url.queryParameters((queryParameters -> yamlContract.request.queryParameters.forEach((key, value) -> { + if (value instanceof List) { + ((List) value) + .forEach(v -> queryParameters.parameter(key, queryParamValue(yamlContract, key, v))); + } + else { + queryParameters.parameter(key, queryParamValue(yamlContract, key, value)); + } + }))); } } From e59725326a126d1ba295610e8a5c43aec11344d6 Mon Sep 17 00:00:00 2001 From: devdufutur <76944391+devdufutur@users.noreply.github.com> Date: Wed, 18 May 2022 09:37:58 +0200 Subject: [PATCH 16/18] Fixed relative URL computation in wIthoutBaseUrl (#1785) * Fixed relative URL computation in wIthoutBaseUrl Current behaviour : * base URL = http://foo.bar * url = http://foo.bar/my/api gives => my/api Fixed behaviour : * base URL = http://foo.bar * url = http://foo.bar/my/api gives => /my/api * Fixed & Added urlPathMatching related tests Fixed false positive test getWithUrlPathMatching() (now fails without commit f9c9527f89e36ba5b4f5b00fc5895c8df78062e2 and pass after), and added 2 tests to ensure leading slash in urlPathPattern or trailing slash in base URL works fine. Co-authored-by: Rudy Nappee --- .../wiremock/WireMockRestServiceServer.java | 2 +- .../WiremockMockServerApplicationTests.java | 18 ++++++++++++++++++ .../resources/mappings/url-path-pattern.json | 2 +- ...simple-path-pattern-with-leading-slash.json | 10 ++++++++++ ...ple-path-pattern-without-leading-slash.json | 10 ++++++++++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 spring-cloud-contract-wiremock/src/test/resources/mappings/url-simple-path-pattern-with-leading-slash.json create mode 100644 spring-cloud-contract-wiremock/src/test/resources/mappings/url-simple-path-pattern-without-leading-slash.json diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestServiceServer.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestServiceServer.java index 5a7ab3219c..e56cfb481f 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestServiceServer.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockRestServiceServer.java @@ -277,7 +277,7 @@ public final class WireMockRestServiceServer { if (indexOfBaseUrl == -1) { return url; } - return url.substring(indexOfBaseUrl + this.baseUrl.length() + 1); + return url.substring(indexOfBaseUrl + this.baseUrl.length()); } private Matcher requestMatcher(RequestPattern request) { diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java index 19902f659b..0acb663193 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java @@ -411,6 +411,24 @@ public class WiremockMockServerApplicationTests { server.verify(); } + @Test + public void getWithSimpleUrlPathMatchingWithTrailingSlashInBaseUrl() throws Exception { + MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate).baseUrl("https://example.org/") + .stubs("classpath:/mappings/url-simple-path-pattern-without-leading-slash.json").build(); + assertThat(this.restTemplate.getForObject("https://example.org/my/api", String.class)) + .isEqualTo("Hello Url Path Matcher"); + server.verify(); + } + + @Test + public void getWithSimpleUrlPathMatchingWithLeadingSlashInPattern() throws Exception { + MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate).baseUrl("https://example.org") + .stubs("classpath:/mappings/url-simple-path-pattern-with-leading-slash.json").build(); + assertThat(this.restTemplate.getForObject("https://example.org/my/api", String.class)) + .isEqualTo("Hello Url Path Matcher"); + server.verify(); + } + @Test public void getWithUrlMatching() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // diff --git a/spring-cloud-contract-wiremock/src/test/resources/mappings/url-path-pattern.json b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-path-pattern.json index 58f58debed..26fccb5a45 100644 --- a/spring-cloud-contract-wiremock/src/test/resources/mappings/url-path-pattern.json +++ b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-path-pattern.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "urlPathPattern": "([a-zA-Z0-9/-]*)/url-path-pattern/" + "urlPathPattern": "/([0-9]+)/url-path-pattern/" }, "response": { "status": 200, diff --git a/spring-cloud-contract-wiremock/src/test/resources/mappings/url-simple-path-pattern-with-leading-slash.json b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-simple-path-pattern-with-leading-slash.json new file mode 100644 index 0000000000..ce37ae8b9f --- /dev/null +++ b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-simple-path-pattern-with-leading-slash.json @@ -0,0 +1,10 @@ +{ + "request": { + "method": "GET", + "urlPathPattern": "/my/api" + }, + "response": { + "status": 200, + "body": "Hello Url Path Matcher" + } +} diff --git a/spring-cloud-contract-wiremock/src/test/resources/mappings/url-simple-path-pattern-without-leading-slash.json b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-simple-path-pattern-without-leading-slash.json new file mode 100644 index 0000000000..db22373c33 --- /dev/null +++ b/spring-cloud-contract-wiremock/src/test/resources/mappings/url-simple-path-pattern-without-leading-slash.json @@ -0,0 +1,10 @@ +{ + "request": { + "method": "GET", + "urlPathPattern": "my/api" + }, + "response": { + "status": 200, + "body": "Hello Url Path Matcher" + } +} From e591e4139026cdb393891778dce3c7d34e1456fd Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 23 May 2022 11:55:12 +0200 Subject: [PATCH 17/18] Bump JsonAssert to 0.6.2; fixes gh-1787 --- spring-cloud-contract-dependencies/pom.xml | 2 +- .../test/resources/functionalTest/bootSimple/gradle.properties | 2 +- .../resources/functionalTest/scenarioProject/gradle.properties | 2 +- .../functionalTest/scenarioProjectKotlin/gradle.properties | 2 +- .../src/test/projects/complex-configuration/pom.xml | 2 +- .../test/projects/different-module-configuration/module/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 5029f57fb9..349d84de92 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -16,7 +16,7 @@ Spring Cloud Contract Dependencies 2.33.0 - 0.6.1 + 0.6.2 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 033366225f..f88c2b5bcf 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 @@ -14,6 +14,6 @@ # limitations under the License. # wiremockVersion=2.30.1 -jsonAssertVersion=0.6.1 +jsonAssertVersion=0.6.2 verifierVersion=3.1.3-SNAPSHOT groovyVersion=2.4.17 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 5399b5199a..e4745eec96 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 @@ -14,7 +14,7 @@ # limitations under the License. # wiremockVersion=2.30.1 -jsonAssertVersion=0.6.1 +jsonAssertVersion=0.6.2 verifierVersion=3.1.3-SNAPSHOT bootVersion=2.6.7 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index 5399b5199a..e4745eec96 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -14,7 +14,7 @@ # limitations under the License. # wiremockVersion=2.30.1 -jsonAssertVersion=0.6.1 +jsonAssertVersion=0.6.2 verifierVersion=3.1.3-SNAPSHOT bootVersion=2.6.7 groovyVersion=2.4.17 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 32d705ae10..3626ae3753 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 @@ -64,7 +64,7 @@ com.toomuchcoding.jsonassert jsonassert - 0.6.1 + 0.6.2 test 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 d792cabf50..baa8fd447c 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 @@ -63,7 +63,7 @@ com.toomuchcoding.jsonassert jsonassert - 0.6.1 + 0.6.2 test From d0e59af6000d49a30e214ab372c63bb393884b53 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 23 May 2022 11:56:14 +0200 Subject: [PATCH 18/18] Updated Github workflows --- .github/dependabot.yml | 6 +++++ .github/workflows/codeql.yaml | 44 +++++++++++++++++++++++++++++++++++ .github/workflows/maven.yml | 4 ++-- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/codeql.yaml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..203f3c889b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: +- package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml new file mode 100644 index 0000000000..4e33500e74 --- /dev/null +++ b/.github/workflows/codeql.yaml @@ -0,0 +1,44 @@ +name: "Code Scanning - Action" + +on: + pull_request: + push: + +jobs: + CodeQL-Build: + # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest + runs-on: ubuntu-latest + + permissions: + # required for all workflows + security-events: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + # Override language selection by uncommenting this and choosing your languages + # with: + # languages: go, javascript, csharp, python, cpp, java + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below). + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following + # three lines and modify them (or add more) to build your code if your + # project uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 91468652bc..a92accf091 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -17,11 +17,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 1.8 - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}