Merge branch '2.0.x'

2018-08-08 18:03:18 +02:00
parent 87a3b959a0 8bb61176ea
commit f8b142ddea
73 changed files with 343 additions and 113 deletions
--- a/samples/wiremock-native/src/test/java/com/example/WiremockServerApplicationTests.java
+++ b/samples/wiremock-native/src/test/java/com/example/WiremockServerApplicationTests.java
@@ -19,7 +19,6 @@ import com.github.tomakehurst.wiremock.junit.WireMockClassRule;

@RunWith(SpringRunner.class)
@SpringBootTest(properties="app.baseUrl=http://localhost:6063", webEnvironment=WebEnvironment.NONE)
-@DirtiesContext
 public class WiremockServerApplicationTests {

 	@ClassRule