Commit Graph

319 Commits

Author SHA1 Message Date
buildmaster
19deb01269 Update SNAPSHOT to 1.2.2.RELEASE 2018-01-16 17:09:51 +00:00
Marcin Grzejszczak
80f0e66292 Revert "Revert "Merge branch 'master' into 2.0.x""
This reverts commit 822dd4b732.
2017-12-20 16:37:38 +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
Marcin Grzejszczak
8be95a0a2e bumping wiremock to 2.12.0
; fixes #477
2017-12-08 11:01:37 -08: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
1460606ba5 Bumped WireMock to 2.11.0; fixes #454 2017-11-13 10:18:24 +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
Marcin Grzejszczak
ffb146a65f Bumped versions 2017-10-24 18:53:52 +02: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
Marcin Grzejszczak
3930a0450a Bumped WireMock to 2.10.0; fixes #444 2017-10-23 12:58:57 +02:00
Marcin Grzejszczak
68de9d8d19 Merge branch 'master' into 2.0.x 2017-10-18 08:57:34 +02:00
Marcin Grzejszczak
d752092d2c Bumped WireMock to 2.9.0; fixes #439 2017-10-18 08:54:31 +02:00
Marcin Grzejszczak
f8401ccb38 Merge branch 'master' into 2.0.x 2017-09-30 19:15:14 +02:00
Marcin Grzejszczak
5e1b99777b Merge branch '1.1.x' 2017-09-28 14:40:46 +02:00
Marcin Grzejszczak
521f27b4a7 Bumps jsonassert to fix the issue with isEmpty
without this change when we're building a stub and it contains a non-empty array, we execute isEmpty to verify the array size. In jsonassert there's a bug cause isEmpty was the only method that didn't check if a flag to ignore exceptions was set

with this change we're bumping jsonassert where the exception got fixed

fixes #427
2017-09-28 14:37:03 +02:00
Marcin Grzejszczak
3d327e28d0 Merge branch 'master' into 2.0.x 2017-09-04 11:54:56 +02:00
Marcin Grzejszczak
ec6cd20467 Bumped WireMock to 2.8.0, fixes #410 2017-09-04 11:53:46 +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
93d66f9f2f Bumped libs' 2017-08-29 09:24:29 +02:00
Marcin Grzejszczak
a2dddff057 Bumped libs 2017-08-29 08:57:07 +02: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
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
735797cc39 Merge branch 'master' into 2.0.x 2017-07-31 10:09:42 +02:00
Marcin Grzejszczak
01dc8b9b1f Trying to make the build pass 2017-07-24 12:13:03 +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
2d7055560f Going back to snapshots 2017-06-29 08:34:29 +02:00
Marcin Grzejszczak
76e47bfdec Update SNAPSHOT to 2.0.0.M1 2017-06-29 08:24:17 +02:00
Marcin Grzejszczak
f37eb63a1a Merge branch 'master' into 2.0.x 2017-06-26 18:28:33 +02:00
Marcin Grzejszczak
7be2d8dad5 Bumped rest assured to 3.0
fixes #267
2017-06-26 18:15:39 +02:00
Marcin Grzejszczak
e8142b4b43 Merge branch 'master' into 2.0.x 2017-06-26 11:38:57 +02:00
Marcin Grzejszczak
a58461f1c0 Bumped libs
WireMock to 2.6.0
 Boot to 1.5.5.BUILD-SNAPSHOT
 jopt to 5.0.3
 spock global unroll to 0.5.1
 hoverfly to 0.2.2
 commons3 to 3.6

fixes #317
2017-06-26 11:01:55 +02:00
Marcin Grzejszczak
82fda14b61 Bumped versions 2017-06-20 15:10:16 +02:00
Marcin Grzejszczak
57fe9939ce Bumped libs 2017-06-19 19:49:33 +02:00
Marcin Grzejszczak
c1fca13f12 Initial commit 2017-06-15 14:56:18 +02:00