Merge branch 'master' into 2.0.x

This commit is contained in:
Marcin Grzejszczak
2017-11-14 18:55:18 +01:00
2 changed files with 1 additions and 2 deletions

View File

@@ -1026,7 +1026,7 @@ effect on the stubs loaded explicitly from the `stubs` attribute.
For a more conventional WireMock experience, you can use JUnit `@Rules` to start and stop
the server. To do so, use the `WireMockSpring` convenience class to obtain an `Options`
instance, as shown in the followin example:
instance, as shown in the following example:
[source,java,indent=0]
----

View File

@@ -23,7 +23,6 @@
<inceptionYear>2016</inceptionYear>
<properties>
<spring-boot.version>2.0.0.BUILD-SNAPSHOT</spring-boot.version>
<checkstyle.version>2.17</checkstyle.version>
<spring-cloud-build.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-zookeeper.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>