Commit Graph

124 Commits

Author SHA1 Message Date
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
5062ff5880 Bumped maven props 2017-10-03 14:25:02 +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
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
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
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
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
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
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
Marcin Grzejszczak
0b3233fd03 Bumped maven samples 2017-08-21 12:56:19 +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
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
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
7890e75328 Merge branch '1.1.x' 2017-06-28 15:04:18 +02:00
Marcin Grzejszczak
99deaad17e Contracts path cannot be overriden
without this change there's no way to change the default path of the path to the contracts when trying to execute the convert / generateTests task for another project
with this change we're setting properly the `spring.cloud.contract.verifier.contractsDirectory` for both tasks

fixes #338
2017-06-28 14:45:33 +02:00
Marcin Grzejszczak
7be2d8dad5 Bumped rest assured to 3.0
fixes #267
2017-06-26 18:15:39 +02:00
Marcin Grzejszczak
82fda14b61 Bumped versions 2017-06-20 15:10:16 +02:00
Marcin Grzejszczak
12ce468b6d Removing deprecations 2017-06-19 18:46:02 +02:00
Marcin Grzejszczak
0905469866 Shades aether (#326)
That way we do not interfere with whatever Maven brings on its classpath

without this change deployment might fail due to being unauthorized.
with this change we're shading aether and maven in stub runner. Due to this there is no classpath clash any more

fixes #325
2017-06-14 14:30:56 +02:00
Marcin Grzejszczak
464e886bb8 Added versions 2017-05-26 22:03:29 +02:00
Marcin Grzejszczak
76de9cec36 Bumped versions after release 2017-05-26 14:57:34 +02:00
Marcin Grzejszczak
e0ea1b27f0 Bumping versions to 1.1.2.BUILD-SNAPSHOT after release 2017-05-22 23:57:24 +02:00
Marcin Grzejszczak
82f68347fa Going back to snapshots 2017-05-22 23:57:23 +02:00
Marcin Grzejszczak
7a10b3bf34 Update SNAPSHOT to 1.1.1.RELEASE 2017-05-22 23:51:18 +02:00
Marcin Grzejszczak
15ef2cab35 Merge branch '1.0.x' 2017-05-05 11:41:39 +02:00
Marcin Grzejszczak
1e16934fce Bumped jsonassert to 0.4.9
without this change we analyze empty sets of jsonpath results improperly

fixes #289
2017-05-05 11:25:19 +02:00
Marcin Grzejszczak
c9538548fd Adds an option to use StubRunner from classpath (#284)
without this change there's no option to use Stub Runner to pick stubs from classpath
with this change we're adding that option. It's enough for the user not to provide neither the `repositoryRoot` nor `workOffline`. If that's the case then Classpath scanning will take place.

fixes #282
2017-04-27 17:13:15 +02:00
Marcin Grzejszczak
e9770c6ac2 Fixed the build 2017-04-24 15:05:43 +02:00
Marcin Grzejszczak
ef5020986f Bumping versions to 1.1.1.BUILD-SNAPSHOT after release 2017-04-11 11:26:11 +02:00
Marcin Grzejszczak
fe14d5c7d9 Going back to snapshots 2017-04-11 11:23:13 +02:00
Marcin Grzejszczak
c167df4fd6 Update SNAPSHOT to 1.1.0.RELEASE 2017-04-11 11:08:00 +02:00
Dave Syer
d9ff5667a7 Remove duplicate plugin 2017-03-22 12:06:55 +00:00
Marcin Grzejszczak
a6cd890b50 Going back to snapshots 2017-03-17 10:09:33 +01:00
Marcin Grzejszczak
47dc54cad4 Update SNAPSHOT to 1.1.0.RC1 2017-03-17 10:04:52 +01:00
Marcin Grzejszczak
169d1f11c1 Merge branch '1.0.x' 2017-03-10 16:25:25 +01:00
Marcin Grzejszczak
2473408a73 Updated maven docs 2017-03-10 16:24:08 +01:00
Marcin Grzejszczak
ef9c567d46 Going back to snapshots 2017-03-10 15:00:53 +01:00