Commit Graph

263 Commits

Author SHA1 Message Date
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
Marcin Grzejszczak
506470523b should fix log4j problems 2017-11-02 14:38:54 +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
b73ba74910 Merge branch 'master' into 2.0.x 2017-10-24 18:33:42 +02:00
Marcin Grzejszczak
d7bda71cf6 Merge branch '1.1.x' 2017-10-24 18:30:34 +02:00
Marcin Grzejszczak
2f8eccc582 Fixing the inheritance issue 2017-10-24 18:28:54 +02: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
8da33723a4 Merge branch 'master' into 2.0.x 2017-10-06 11:24:21 +02:00
Marcin Grzejszczak
3ec444e776 Fixed the invalid check of transformers array 2017-10-06 11:21:52 +02:00
Marcin Grzejszczak
5062ff5880 Bumped maven props 2017-10-03 14:25:02 +02:00
Marcin Grzejszczak
5e4eabee19 Bumped gradle props 2017-10-03 14:13:12 +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
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
d06af6544f Merge branch 'master' into 2.0.x 2017-09-05 14:19:30 +02:00
Marcin Grzejszczak
bd2f863fdf Merge branch '1.1.x' 2017-09-05 14:19:19 +02:00
Marcin Grzejszczak
e6b80d619e Fixed missing $.body element in pact matchers; fixes #414 2017-09-05 14:19:12 +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
Marcin Grzejszczak
de17fb7638 Merge branch 'master' into 2.0.x 2017-09-04 11:33:14 +02:00
Marcin Grzejszczak
343109af7e Removed escaping unicode chars; fixes #385 2017-09-04 11:27:05 +02:00
Marcin Grzejszczak
94703b0c0f Merge branch 'master' into 2.0.x 2017-09-01 17:22:36 +02:00
Marcin Grzejszczak
5f8fd5058c Added support for fromRequest.path
without this change you can't referrence path of the request in the response
with this change that functionality is added

also Removed lang3 dependency and changed it to commons-text

fixes #388
2017-09-01 17:22:28 +02:00
Marcin Grzejszczak
0759cb2d4a Fixing gradle project versions 2017-08-30 14:21:28 +02:00
Marcin Grzejszczak
de62368f8f Merge branch 'master' into 2.0.x 2017-08-30 13:40:20 +02:00
Marcin Grzejszczak
cd4555d4af Merge branch '1.1.x' 2017-08-30 13:40:08 +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
f6ffe29a4d Merge branch 'master' into 2.0.x 2017-08-28 15:01:46 +02:00
Marcin Grzejszczak
24f0b98152 Merge branch '1.1.x' 2017-08-28 15:01:38 +02:00
Marcin Grzejszczak
7b144df594 Cannot set fixed port in mvn stub runner (httpPort is ignored)
without this change the value of `spring.cloud.contract.verifier.http.port` gets executed via the `httpPort` method in options builder. The problem is that this method applies the port to the previously started stub. In this case we're not providing any stubs explicitly thus things don't work as they should.

with this change we reuse the min / max port mechanism to limit the range of port to the provided http port

fixes #384
2017-08-28 14:55:40 +02:00
Marcin Grzejszczak
edfb851f29 Merge branch '1.1.x' 2017-08-28 14:10:21 +02:00
Marcin Grzejszczak
e4806b7797 Fixed wrong docs 2017-08-28 14:08:03 +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
011f4b3e31 Merge branch 'master' into 2.0.x 2017-08-24 12:08:12 +02:00
Marcin Grzejszczak
3b88fea8bd basePackageForTests can be configured automatically
without this change we always set the default value of the package with generated tests, unless a value overrides it.
with this change the flow for setting the generated tests package name will look like this:

- pick basePackageForTests
- if basePackageForTests wasn't set pick the package from baseClassForTests
- if baseClassForTests wasn't set pick packageWithBaseClasses
- if nothing got set pick the default org.springframework.cloud.contract.verifier.tests

The rationale behind this change is such that often in the base class you would like to have package scoped methods and the fact that the tests are always generated in the default location requires to make these methods public or always override this property.

fixes #260
2017-08-24 12:08:02 +02:00