Commit Graph

168 Commits

Author SHA1 Message Date
buildmaster
f5561d3f9b Going back to snapshots 2018-01-16 17:20:15 +00:00
buildmaster
19deb01269 Update SNAPSHOT to 1.2.2.RELEASE 2018-01-16 17:09:51 +00:00
Marcin Grzejszczak
6ed344e976 Added WireMockConfigurationCustomizer
with this change it's possible to customize the WireMockConfiguration set up by Spring Cloud Contract

fixes gh-502
2017-12-27 13:15:14 +01:00
Marcin Grzejszczak
3054b3e8a4 Merge branch '1.1.x' into 1.2.x 2017-12-20 17:12:35 +01:00
Marcin Grzejszczak
5ea48987ea Fixed lack of triple quotes in json paths for generated contracts from rest docs
fixes #494
2017-12-20 17:12:01 +01:00
Marcin Grzejszczak
822dd4b732 Revert "Merge branch 'master' into 2.0.x"
This reverts commit 63a1981f54, reversing
changes made to 0cca942e86.
2017-12-20 16:31:52 +01:00
buildmaster
2981b54b82 Going back to snapshots 2017-12-02 04:40:23 +00:00
buildmaster
9e5ac9020b Update SNAPSHOT to 2.0.0.M5 2017-12-02 04:37:52 +00:00
buildmaster
5b2cc6f258 Going back to snapshots 2017-11-16 18:20:37 +00:00
buildmaster
f9908cefd2 Update SNAPSHOT to 2.0.0.M4 2017-11-16 18:17:31 +00:00
Marcin Grzejszczak
c09f8ca730 Merge branch 'master' into 2.0.x 2017-11-13 10:18:37 +01:00
Marcin Grzejszczak
bd02624671 Merge branch '1.1.x' 2017-11-13 10:16:36 +01:00
Marcin Grzejszczak
0097b6db6e Filters headers from response for Groovy DSL creation from rest docs; fixes #455 2017-11-13 10:16:29 +01:00
buildmaster
4cdd7462cc Going back to snapshots 2017-10-28 07:25:37 +00:00
buildmaster
02d6c3e185 Update SNAPSHOT to 2.0.0.M3 2017-10-28 07:23:12 +00:00
buildmaster
2c78b99f5a Going back to snapshots 2017-10-24 16:48:01 +00:00
buildmaster
cdfddc91d6 Update SNAPSHOT to 1.2.0.RC1 2017-10-24 16:45:05 +00:00
Marcin Grzejszczak
a893c0c93f Merge branch 'master' into 2.0.x 2017-10-23 12:59:05 +02:00
Eddú Meléndez Gonzales
a90ec81258 Fix WireMockRestDocs javadoc (#442) 2017-10-22 14:20:54 +02:00
Marcin Grzejszczak
12d85f8e88 Added missing conditionals for rest docs 2017-10-17 09:48:05 +02:00
Eddú Meléndez Gonzales
4a9fb48056 Add support for restassured with restdocs (#431)
fixes gh-334
2017-10-16 10:02:40 +02:00
Marcin Grzejszczak
063cea4f5b Bumping versions to 1.1.5.BUILD-SNAPSHOT after release 2017-10-03 14:02:15 +02:00
Marcin Grzejszczak
67f4f11119 Going back to snapshots 2017-10-03 14:02:15 +02:00
Marcin Grzejszczak
e1b65dd672 Update SNAPSHOT to 1.1.4.RELEASE 2017-10-03 13:56:14 +02:00
Marcin Grzejszczak
ddbe2de516 Merge branch 'master' into 2.0.x 2017-09-19 23:23:49 +01:00
Marcin Grzejszczak
098eb620ca Merge branch '1.1.x' 2017-09-19 23:15:38 +01:00
Pei-Tang Huang
6c14e8b205 Added composite child support. (#405)
If specified subDirectoryName exists in more the one FileSource, return
another instance of ResourcesFileSource containing all matched FileSources.

* Fixed multiple files not being registered issue.
* Use default FileSource if no valid resource specified.
2017-09-19 23:14:04 +01:00
Marcin Grzejszczak
ba6d4a5bc6 Merge branch 'master' into 2.0.x 2017-09-01 11:17:41 +02:00
Marcin Grzejszczak
a6f22bc593 Merge branch '1.1.x' 2017-09-01 11:10:31 +02:00
Marcin Grzejszczak
6d321c697d Fixed classcast in sc-WireMock; fixes #399 2017-09-01 11:10:24 +02:00
Marcin Grzejszczak
5cbf1836f0 Fixed checkstyole 2017-08-30 13:26:40 +02:00
Dave Syer
258d624975 Merge branch 'master' into 2.0.x 2017-08-30 09:31:49 +01:00
Dave Syer
51a35ce6b7 Use wiremock-standalone instead of the ambient server
The standalone jar is in much better shape now, and relocates all the
dependencies, like guava and jetty, so it's safe to use in a Spring
Boot project with Tomcat or a different version of jetty.

Fixes gh-397
2017-08-30 08:29:29 +01:00
Marcin Grzejszczak
1bdbd046ad Going back to snapshots 2017-08-25 15:12:32 +02:00
Marcin Grzejszczak
1550f9fe0f Update SNAPSHOT to 2.0.0.M2 2017-08-25 15:10:01 +02:00
Marcin Grzejszczak
ccdeda1fe1 Going back to snapshots 2017-08-25 14:58:18 +02:00
Marcin Grzejszczak
9782ec10ea Update SNAPSHOT to 1.2.0.M1 2017-08-25 14:55:31 +02:00
Marcin Grzejszczak
040f6b5105 Merge branch 'master' into 2.0.x 2017-08-22 16:47:19 +02:00
Marcin Grzejszczak
5b4c677fad Merge branch '1.1.x' 2017-08-22 16:47:11 +02:00
Marcin Grzejszczak
8ba58d3ab8 Ensure that /tmp files get removed upon process termination
fixes #359
2017-08-22 16:16:25 +02:00
Marcin Grzejszczak
b99bf95ff9 Bumping versions to 1.1.4.BUILD-SNAPSHOT after release 2017-08-21 12:33:24 +02:00
Marcin Grzejszczak
237ee85dc3 Going back to snapshots 2017-08-21 12:33:24 +02:00
Marcin Grzejszczak
b81bb2a489 Update SNAPSHOT to 1.1.3.RELEASE 2017-08-21 12:28:10 +02:00
Marcin Grzejszczak
53a5fe7076 Merge branch 'master' into 2.0.x 2017-07-31 16:11:18 +02:00
Marcin Grzejszczak
b431f1b788 Bumped WireMock to 2.7.1 and added debug option for WireMock
fixes #374 #369
2017-07-31 16:09:35 +02:00
Marcin Grzejszczak
e4af835b8e Going back to snapshots 2017-07-21 14:30:45 +02:00
Marcin Grzejszczak
85f458e34c Update SNAPSHOT to 1.1.2.RELEASE 2017-07-21 14:06:43 +02:00
Marcin Grzejszczak
473a2b9197 Merge branch 'master' into 2.0.x 2017-07-18 17:30:48 +02:00
Marcin Grzejszczak
4de7d38a51 Added support for referencing file contents in the contract (#360)
without this change, large bodies can't be parsed by the compiler
with this change we allow those bodies to be read from files

fixes #357
2017-07-18 16:26:44 +02:00
Marcin Grzejszczak
959d8b958b Added missing cookies method 2017-07-03 13:07:55 +02:00