Merge branch 'master' into 2.0.x

This commit is contained in:
Marcin Grzejszczak
2017-10-23 12:59:05 +02:00
6 changed files with 6 additions and 6 deletions

View File

@@ -14,7 +14,7 @@
<name>spring-cloud-contract-dependencies</name>
<description>Spring Cloud Contract Dependencies</description>
<properties>
<wiremock.version>2.9.0</wiremock.version>
<wiremock.version>2.10.0</wiremock.version>
<jsonassert.version>0.4.10</jsonassert.version>
<aether.version>1.0.2.v20150114</aether.version>
</properties>

View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.9.0
wiremockVersion=2.10.0
jsonAssertVersion=0.4.10
verifierVersion=2.0.0.BUILD-SNAPSHOT

View File

@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.9.0
wiremockVersion=2.10.0
jsonAssertVersion=0.4.10
verifierVersion=2.0.0.BUILD-SNAPSHOT

View File

@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.9.0
wiremockVersion=2.10.0
jsonAssertVersion=0.4.10
verifierVersion=2.0.0.BUILD-SNAPSHOT

View File

@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
wiremockVersion=2.9.0
wiremockVersion=2.10.0
jsonAssertVersion=0.4.10
verifierVersion=2.0.0.BUILD-SNAPSHOT

View File

@@ -33,7 +33,7 @@ package org.springframework.cloud.contract.wiremock.restdocs;
* public void contextLoads() throws Exception {
* mockMvc.perform(get("/resource"))
* .andExpect(content().string("Hello World"))
* .andDo(verify().contract("resource"));
* .andDo(verify().stub("resource"));
* }
* </pre>
*