Going back to snapshots

This commit is contained in:
buildmaster
2018-01-16 17:20:15 +00:00
parent 19deb01269
commit f5561d3f9b
45 changed files with 61 additions and 79 deletions

View File

@@ -1149,23 +1149,6 @@ Spring Boot embedded servers, and Wiremock itself has "native" support for a par
version of Jetty (currently 9.2). To use the native Jetty, you need to add the native
Wiremock dependencies and exclude the Spring Boot container (if there is one).
=== Customization of WireMock configuration
You can register a bean of `org.springframework.cloud.contract.wiremock.WireMockConfigurationCustomizer` type
in order to customize the WireMock configuration (e.g. add custom transformers).
Example:
[source,java,indent=0]
----
@Bean WireMockConfigurationCustomizer optionsCustomizer() {
return new WireMockConfigurationCustomizer() {
@Override public void customize(WireMockConfiguration options) {
// perform your customization here
}
};
}
----
=== Generating Stubs using REST Docs
https://projects.spring.io/spring-restdocs[Spring REST Docs] can be used to generate
@@ -1317,13 +1300,12 @@ Consider the following test:
.accept(MediaType.APPLICATION_PDF)
.accept(MediaType.APPLICATION_JSON)
.contentType(MediaType.APPLICATION_JSON)
.content("{\"foo\": 23, \"bar\" : \"baz\" }"))
.content("{\"foo\": 23 }"))
.andExpect(status().isOk())
.andExpect(content().string("bar"))
// first WireMock
.andDo(WireMockRestDocs.verify()
.jsonPath("$[?(@.foo >= 20)]")
.jsonPath("$[?(@.bar in ['baz','bazz','bazzz'])]")
.contentType(MediaType.valueOf("application/json"))
.stub("shouldGrantABeerIfOldEnough"))
// then Contract DSL documentation

View File

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

16
pom.xml
View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.3.7.RELEASE</version>
<version>1.3.7.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-contract-parent</artifactId>
<packaging>pom</packaging>
<version>1.2.2.RELEASE</version>
<version>1.2.2.BUILD-SNAPSHOT</version>
<name>Spring Cloud Contract</name>
<description>Spring Cloud Contract</description>
@@ -26,12 +26,12 @@
<activemq.version>5.12.1</activemq.version>
<camel.version>2.18.3</camel.version>
<checkstyle.version>2.17</checkstyle.version>
<spring-cloud-build.version>1.3.7.RELEASE</spring-cloud-build.version>
<spring-cloud-zookeeper.version>1.2.0.RELEASE</spring-cloud-zookeeper.version>
<spring-cloud-stream.version>Ditmars.SR3</spring-cloud-stream.version>
<spring-cloud-netflix.version>1.4.2.RELEASE</spring-cloud-netflix.version>
<spring-cloud-consul.version>1.3.1.RELEASE</spring-cloud-consul.version>
<spring-cloud-commons.version>1.3.1.RELEASE</spring-cloud-commons.version>
<spring-cloud-build.version>1.3.7.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-zookeeper.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
<spring-cloud-stream.version>Ditmars.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-netflix.version>1.4.2.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-consul.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-consul.version>
<spring-cloud-commons.version>1.3.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
</properties>
<modules>

View File

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

View File

@@ -6,13 +6,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-samples</artifactId>
<version>1.2.2.RELEASE</version>
<version>1.2.2.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-samples-standalone</artifactId>
<packaging>pom</packaging>
<version>1.2.2.RELEASE</version>
<version>1.2.2.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>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-jetty</artifactId>
<version>1.2.2.RELEASE</version>
<version>0.0.1</version>
<packaging>jar</packaging>
<name>wiremock-jetty</name>
@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.2.2.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-native</artifactId>
<version>1.2.2.RELEASE</version>
<version>0.0.1</version>
<packaging>jar</packaging>
<name>wiremock-native</name>
@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.2.2.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-tomcat</artifactId>
<version>1.2.2.RELEASE</version>
<version>0.0.1</version>
<packaging>jar</packaging>
<name>wiremock-tomcat</name>
@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.2.2.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-undertow-ssl</artifactId>
<version>1.2.2.RELEASE</version>
<version>0.0.1</version>
<packaging>jar</packaging>
<name>wiremock-undertow-ssl</name>
@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.2.2.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wiremock-undertow</artifactId>
<version>1.2.2.RELEASE</version>
<version>0.0.1</version>
<packaging>jar</packaging>
<name>wiremock-undertow</name>
@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.2.2.RELEASE</spring-cloud-contract.version>
<spring-cloud-contract.version>1.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -5,11 +5,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.3.7.RELEASE</version>
<version>1.3.6.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-contract-dependencies</artifactId>
<version>1.2.2.RELEASE</version>
<version>1.2.2.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>spring-cloud-contract-dependencies</name>
<description>Spring Cloud Contract Dependencies</description>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.2.2.RELEASE</version>
<version>1.2.2.BUILD-SNAPSHOT</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>1.2.2.RELEASE</version>
<version>1.2.2.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

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

View File

@@ -16,6 +16,6 @@
nexusUsername =
nexusPassword =
verifierVersion=1.2.2.RELEASE
verifierVersion=1.2.2.BUILD-SNAPSHOT
org.gradle.daemon=false
aetherVersion=1.0.2.v20150114

View File

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

View File

@@ -15,5 +15,5 @@
#
wiremockVersion=2.12.0
jsonAssertVersion=0.4.10
verifierVersion=1.2.2.RELEASE
verifierVersion=1.2.2.BUILD-SNAPSHOT

View File

@@ -15,4 +15,4 @@
#
wiremockVersion=2.12.0
jsonAssertVersion=0.4.10
verifierVersion=1.2.2.RELEASE
verifierVersion=1.2.2.BUILD-SNAPSHOT

View File

@@ -15,4 +15,4 @@
#
wiremockVersion=2.12.0
jsonAssertVersion=0.4.10
verifierVersion=1.2.2.RELEASE
verifierVersion=1.2.2.BUILD-SNAPSHOT

View File

@@ -15,5 +15,5 @@
#
wiremockVersion=2.12.0
jsonAssertVersion=0.4.10
verifierVersion=1.2.2.RELEASE
verifierVersion=1.2.2.BUILD-SNAPSHOT

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tools</artifactId>
<version>1.2.2.RELEASE</version>
<version>1.2.2.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -33,7 +33,7 @@
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<version>1.2.2.RELEASE</version>
<version>1.2.2.BUILD-SNAPSHOT</version>
<inceptionYear>2016</inceptionYear>
<build>

View File

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

View File

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

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.2.2.RELEASE</version>
<version>1.2.2.BUILD-SNAPSHOT</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>1.2.2.RELEASE</version>
<version>1.2.2.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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