SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Going back to snapshots

Browse Source
This commit is contained in:
buildmaster
2020-11-09 11:40:10 +00:00
parent 1ea1ea7113
commit 81d2e7b3e9
64 changed files with 103 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.adoc
View File

@@ -287,7 +287,7 @@ run the following command:
./scripts/parallelBuild.sh
```
To use eight 8 cores, run thke following command:
To use eight 8 cores, run the following command:
```
CORES=8 ./scripts/parallelBuild.sh

4
docker/pom.xml
View File

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

4
docker/spring-cloud-contract-docker/pom.xml
View File

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

2
docker/spring-cloud-contract-docker/project/gradle.properties
View File

@@ -1,2 +1,2 @@
org.gradle.daemon=false
verifierVersion=2.2.5.RELEASE
verifierVersion=2.2.5.BUILD-SNAPSHOT

4
docker/spring-cloud-contract-stub-runner-docker/pom.xml
View File

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

2
docs/pom.xml
View File

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

4
guides/gs-contract-rest/complete/contract-rest-client/pom.xml
View File

@@ -11,14 +11,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.3.2.RELEASE</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>Hoxton.SR9</spring-cloud.version>
<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
</properties>
<dependencies>

6
guides/gs-contract-rest/complete/contract-rest-service/pom.xml
View File

@@ -11,15 +11,15 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.3.2.RELEASE</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>Hoxton.SR9</spring-cloud.version>
<spring-cloud-contract.version>2.2.5.RELEASE</spring-cloud-contract.version>
<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
<spring-cloud-contract.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

2
guides/gs-contract-rest/initial/contract-rest-client/pom.xml
View File

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

6
guides/gs-contract-rest/initial/contract-rest-service/pom.xml
View File

@@ -11,15 +11,15 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.3.2.RELEASE</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>Hoxton.SR9</spring-cloud.version>
<spring-cloud-contract.version>2.2.5.RELEASE</spring-cloud-contract.version>
<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
<spring-cloud-contract.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

2
guides/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>2.2.5.RELEASE</version>
<version>2.2.5.BUILD-SNAPSHOT</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>2.3.1.RELEASE</version>
<version>2.3.2.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-contract-parent</artifactId>
<packaging>pom</packaging>
<version>2.2.5.RELEASE</version>
<version>2.2.5.BUILD-SNAPSHOT</version>
<name>Spring Cloud Contract</name>
<description>Spring Cloud Contract</description>
@@ -29,14 +29,14 @@
<pact.version>3.6.14</pact.version>
<jsch-agent.version>0.0.9</jsch-agent.version>
<spring-cloud-build.version>2.3.1.RELEASE</spring-cloud-build.version>
<spring-cloud-zookeeper.version>2.2.4.RELEASE</spring-cloud-zookeeper.version>
<spring-cloud-stream.version>Horsham.SR9</spring-cloud-stream.version>
<spring-cloud-zookeeper.version>2.2.4.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
<spring-cloud-stream.version>Horsham.SR7</spring-cloud-stream.version>
<!-- Needs to come from a sc-stream-bom -->
<spring-cloud-stream-test-binder.version>3.0.4.RELEASE</spring-cloud-stream-test-binder.version>
<spring-cloud-netflix.version>2.2.6.RELEASE</spring-cloud-netflix.version>
<spring-cloud-consul.version>2.2.5.RELEASE</spring-cloud-consul.version>
<spring-cloud-commons.version>2.2.6.RELEASE</spring-cloud-commons.version>
<spring-cloud-function.version>3.0.11.RELEASE</spring-cloud-function.version>
<spring-cloud-netflix.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-consul.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-consul.version>
<spring-cloud-commons.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-function.version>3.0.9.RELEASE</spring-cloud-function.version>
<jopt-simple.version>5.0.4</jopt-simple.version>
<cglib.version>3.2.9</cglib.version>
<spock-spring.version>1.3-groovy-2.5</spock-spring.version>

4
samples/pom.xml
View File

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

4
samples/standalone/pom.xml
View File

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

6
samples/wiremock-jetty/pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-jetty</artifactId>
<version>2.2.5.RELEASE</version>
<version>2.2.5.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>wiremock-jetty</name>
@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.3.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>2.2.5.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

6
samples/wiremock-native/pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-native</artifactId>
<version>2.2.5.RELEASE</version>
<version>2.2.5.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>wiremock-native</name>
@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.3.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>2.2.5.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

6
samples/wiremock-tomcat/pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-tomcat</artifactId>
<version>2.2.5.RELEASE</version>
<version>2.2.5.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>wiremock-tomcat</name>
@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.3.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>2.2.5.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

6
samples/wiremock-undertow-ssl/pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-undertow-ssl</artifactId>
<version>2.2.5.RELEASE</version>
<version>2.2.5.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>wiremock-undertow-ssl</name>
@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.3.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>2.2.5.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

6
samples/wiremock-undertow/pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-undertow</artifactId>
<version>2.2.5.RELEASE</version>
<version>2.2.5.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>wiremock-undertow</name>
@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.3.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>2.2.5.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

6
samples/wiremock/pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock</artifactId>
<version>2.2.5.RELEASE</version>
<version>2.2.5.BUILD-SNAPSHOT</version>
<packaging>jar</packaging>
<name>wiremock</name>
@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.3.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>2.2.5.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>2.2.5.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

4
specs/pom.xml
View File

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

2
specs/spring-cloud-contract-spec-groovy/pom.xml
View File

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

2
specs/spring-cloud-contract-spec-java/pom.xml
View File

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

2
specs/spring-cloud-contract-spec-kotlin/pom.xml
View File

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

2
specs/spring-cloud-contract-spec/pom.xml
View File

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

4
spring-cloud-contract-dependencies/pom.xml
View File

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

2
spring-cloud-contract-shade/pom.xml
View File

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

2
spring-cloud-contract-starters/pom.xml
View File

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

2
spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml
View File

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

2
spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml
View File

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

2
spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
View File

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

2
spring-cloud-contract-stub-runner-boot/pom.xml
View File

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

2
spring-cloud-contract-stub-runner/pom.xml
View File

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

11
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java
View File

@@ -51,8 +51,8 @@ import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;
* @author Olga Maciaszek-Sharma
* @since 2.1.0
*/
public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback,
BeforeEachCallback, AfterEachCallback, StubFinder, StubRunnerExtensionOptions {
public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback,
StubFinder, StubRunnerExtensionOptions {
private static final String DELIMITER = ":";
@@ -84,8 +84,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback,
public void afterAll(ExtensionContext extensionContext) {
try {
after();
}
finally {
} finally {
this.afterAllCalled.set(true);
}
}
@@ -106,8 +105,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback,
public void beforeAll(ExtensionContext extensionContext) {
try {
before();
}
finally {
} finally {
this.beforeAllCalled.set(true);
}
}
@@ -135,6 +133,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback,
}
}
@Override
public URL findStubUrl(String groupId, String artifactId)
throws StubNotFoundException {

2
spring-cloud-contract-tools/pom.xml
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties
View File

@@ -15,5 +15,5 @@
#
wiremockVersion=2.26.2
jsonAssertVersion=0.4.13
verifierVersion=2.2.5.RELEASE
verifierVersion=2.2.5.BUILD-SNAPSHOT
groovyVersion=2.5.10

4
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
View File

@@ -15,6 +15,6 @@
#
wiremockVersion=2.26.2
jsonAssertVersion=0.4.13
verifierVersion=2.2.5.RELEASE
bootVersion=2.3.5.RELEASE
verifierVersion=2.2.5.BUILD-SNAPSHOT
bootVersion=2.3.2.RELEASE
groovyVersion=2.5.10

4
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
View File

@@ -15,6 +15,6 @@
#
wiremockVersion=2.26.2
jsonAssertVersion=0.4.13
verifierVersion=2.2.5.RELEASE
bootVersion=2.3.5.RELEASE
verifierVersion=2.2.5.BUILD-SNAPSHOT
bootVersion=2.3.2.RELEASE
groovyVersion=2.5.10

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml
View File

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

2
spring-cloud-contract-verifier/pom.xml
View File

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

9
spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java
View File

@@ -24,13 +24,10 @@ public class XmlBodyVerificationBuilderTest {
builder.addXmlResponseBodyCheck(blockBuilder, xml, matchers, xml, true);
// Then
String test = blockBuilder.toString();
assertThat(test).contains(
"DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();")
assertThat(test).contains("DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();")
.contains("builderFactory.setNamespaceAware(true);")
.contains(
"DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();")
.contains(
"Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(")
.contains("DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();")
.contains("Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(")
.contains(xml);
}

2
spring-cloud-contract-wiremock/pom.xml
View File

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

2
tests/pom.xml
View File

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

2
tests/samples-messaging-amqp/pom.xml
View File

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

2
tests/samples-messaging-camel/pom.xml
View File

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

2
tests/samples-messaging-integration/pom.xml
View File

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

2
tests/samples-messaging-jms/pom.xml
View File

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

2
tests/samples-messaging-stream/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>2.2.5.RELEASE</version>
<version>2.2.5.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-sample-stream</artifactId>

2
tests/spring-cloud-contract-stub-runner-amqp/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-camel/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-context-path/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-integration/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-jms/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-kafka/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-moco/pom.xml
View File

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

2
tests/spring-cloud-contract-stub-runner-stream/pom.xml
View File

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