Update SNAPSHOT to 3.1.1

This commit is contained in:
buildmaster
2022-02-17 18:03:35 +00:00
parent dc1f55300a
commit e8dfe7a8b1
56 changed files with 79 additions and 79 deletions

View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-docker-parent</artifactId>
<packaging>pom</packaging>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<name>Spring Cloud Contract Docker Parent</name>
<description>Spring Cloud Contract Docker Parent</description>

View File

@@ -12,13 +12,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-docker-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-docker</artifactId>
<packaging>pom</packaging>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<name>Spring Cloud Contract Docker</name>
<description>Spring Cloud Contract Docker</description>

View File

@@ -1,4 +1,4 @@
org.gradle.daemon=false
verifierVersion=3.1.1-SNAPSHOT
springBootVersion=2.6.1
verifierVersion=3.1.1
springBootVersion=2.6.3
camelVersion=3.11.0

View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-docker-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-docker</artifactId>
<packaging>pom</packaging>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<name>Spring Cloud Contract Stub Runner Docker</name>
<description>Spring Cloud Contract Stub Runner Docker</description>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-docs</artifactId>

View File

@@ -11,14 +11,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.1</version>
<version>2.6.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.1-SNAPSHOT</spring-cloud.version>
<spring-cloud.version>2021.0.1</spring-cloud.version>
</properties>
<dependencies>

View File

@@ -11,15 +11,15 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.1</version>
<version>2.6.3</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.1-SNAPSHOT</spring-cloud.version>
<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud.version>2021.0.1</spring-cloud.version>
<spring-cloud-contract.version>3.1.1</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.1</version>
<version>2.6.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

View File

@@ -11,15 +11,15 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.1</version>
<version>2.6.3</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud.version>2021.0.1-SNAPSHOT</spring-cloud.version>
<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud.version>2021.0.1</spring-cloud.version>
<spring-cloud-contract.version>3.1.1</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-guides</artifactId>

16
pom.xml
View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-contract-parent</artifactId>
<packaging>pom</packaging>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<name>Spring Cloud Contract</name>
<description>Spring Cloud Contract</description>
@@ -27,12 +27,12 @@
<camel.version>3.11.0</camel.version>
<pact.version>4.1.23</pact.version>
<jsch-agent.version>0.0.9</jsch-agent.version>
<spring-cloud-build.version>3.1.1-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-zookeeper.version>3.1.1-SNAPSHOT</spring-cloud-zookeeper.version>
<spring-cloud-stream.version>3.2.1</spring-cloud-stream.version>
<spring-cloud-netflix.version>3.1.1-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-consul.version>3.1.1-SNAPSHOT</spring-cloud-consul.version>
<spring-cloud-commons.version>3.1.1-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-build.version>3.1.1</spring-cloud-build.version>
<spring-cloud-zookeeper.version>3.1.1</spring-cloud-zookeeper.version>
<spring-cloud-stream.version>3.2.2</spring-cloud-stream.version>
<spring-cloud-netflix.version>3.1.1</spring-cloud-netflix.version>
<spring-cloud-consul.version>3.1.0</spring-cloud-consul.version>
<spring-cloud-commons.version>3.1.1</spring-cloud-commons.version>
<spring-cloud-functiondonotreplace.version>3.0.6.RELEASE</spring-cloud-functiondonotreplace.version>
<jopt-simple.version>5.0.4</jopt-simple.version>
<cglib.version>3.2.11</cglib.version>

View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-samples</artifactId>
<packaging>pom</packaging>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<name>Spring Cloud Contract Samples</name>
<description>Spring Cloud Contract Samples</description>

View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-samples</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-samples-standalone</artifactId>
<packaging>pom</packaging>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<name>Spring Cloud Contract Standalone Test Samples</name>
<description>Spring Cloud Contract Standalone Test Samples used for end to end tests
</description>

View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-specs</artifactId>
<packaging>pom</packaging>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<name>Spring Cloud Contract Specs</name>
<description>Spring Cloud Contract Specs</description>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>spring-cloud-contract-spec-groovy</artifactId>

View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>spring-cloud-contract-spec-java</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>spring-cloud-contract-spec-kotlin</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>spring-cloud-contract-spec</artifactId>

View File

@@ -6,11 +6,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>3.1.0</version>
<version>3.1.1</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-contract-dependencies</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<packaging>pom</packaging>
<name>spring-cloud-contract-dependencies</name>
<description>Spring Cloud Contract Dependencies</description>

View File

@@ -19,7 +19,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-shade</artifactId>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-starters</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-contract-stub-runner-jetty</artifactId>

View File

@@ -23,7 +23,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-starters</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-starters</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-contract-verifier</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner</artifactId>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tools</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-converters</artifactId>

View File

@@ -15,7 +15,7 @@
#
nexusUsername=
nexusPassword=
verifierVersion=3.1.1-SNAPSHOT
verifierVersion=3.1.1
org.gradle.daemon=false
aetherVersion=1.1.0
springCloudBuildVersion=3.1.1-SNAPSHOT
springCloudBuildVersion=3.1.1

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tools</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -15,5 +15,5 @@
#
wiremockVersion=2.30.1
jsonAssertVersion=0.6.1
verifierVersion=3.1.1-SNAPSHOT
verifierVersion=3.1.1
groovyVersion=2.4.17

View File

@@ -15,6 +15,6 @@
#
wiremockVersion=2.30.1
jsonAssertVersion=0.6.1
verifierVersion=3.1.1-SNAPSHOT
bootVersion=2.6.1
verifierVersion=3.1.1
bootVersion=2.6.3
groovyVersion=2.4.17

View File

@@ -15,6 +15,6 @@
#
wiremockVersion=2.30.1
jsonAssertVersion=0.6.1
verifierVersion=3.1.1-SNAPSHOT
bootVersion=2.6.1
verifierVersion=3.1.1
bootVersion=2.6.3
groovyVersion=2.4.17

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tools</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tools</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tools</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-pact</artifactId>

View File

@@ -90,4 +90,5 @@ public class PactMetaData implements SpringCloudContractMetadata {
}
}
}

View File

@@ -110,8 +110,7 @@ class RequestResponsePactCreator {
private PactDslRequestWithPath createPactDslRequestWithPath(Contract contract, PactDslResponse pactDslResponse) {
PactDslRequestWithPath pactDslRequest = getPactDslRequest(contract,
getPactDslWithStateFunction(pactDslResponse),
getPactDslRequestWithPathBiFunction(pactDslResponse));
getPactDslWithStateFunction(pactDslResponse), getPactDslRequestWithPathBiFunction(pactDslResponse));
Request request = contract.getRequest();
final PactDslRequestWithPath finalPactDslRequest = pactDslRequest;
if (request.getHeaders() != null) {

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-verifier</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-wiremock</artifactId>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-sample-amqp</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-sample-camel</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-sample-integration</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-sample-jms</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-amqp</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-boot-eureka</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-boot-zookeeper</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-camel</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-context-path</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-integration</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-jms</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-kafka</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-moco-contract-jar</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-moco</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>3.1.1-SNAPSHOT</version>
<version>3.1.1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-stream</artifactId>