Commit Graph

210 Commits

Author SHA1 Message Date
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
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
e3c978d700 Bumped Gradle 2017-07-31 11:16:31 +02:00
Marcin Grzejszczak
735797cc39 Merge branch 'master' into 2.0.x 2017-07-31 10:09:42 +02:00
Marcin Grzejszczak
7e97c8a690 Merge branch '1.1.x' 2017-07-31 10:09:13 +02:00
Rocks360
1727041400 Support for generic top level domain .online in the email regular expression (#371)
* Refactor email regular expression to support email addresses ending with .online

fixes #367
2017-07-31 10:03:49 +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
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
0ea6d366aa Merge branch 'master' into 2.0.x 2017-07-13 19:14:04 +02:00
Marcin Grzejszczak
ff03b25cb3 Merge branch '1.1.x' 2017-07-13 19:13:04 +02:00
Marcin Grzejszczak
28abd6fdce Added username and password for Gradle contract downloading
without this change you can't generate tests when working with Gradle that is to download contracts from an external repo

fixes #333
2017-07-13 18:59:20 +02:00
Marcin Grzejszczak
935171c13a Merge branch 'master' into 2.0.x 2017-07-03 13:03:45 +02:00
Marcin Grzejszczak
476baa1c63 Merge branch '1.1.x' 2017-07-03 13:03:31 +02:00
Marcin Grzejszczak
8c96a21abf Fixed caching of downloaded contracts in Gradle
without this change when using a daemon, for snapshot versions of downloaded contracts allways the same folder is returned
with this change we cache only non snapshot artifacts; also there's a switch you can set to disable caching at all

fixes #343
2017-07-03 12:52:48 +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
6816b08e0c Merge branch 'master' into 2.0.x 2017-06-28 15:04:28 +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
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
4e9d132417 Updated groovy 2017-06-22 09:20:49 +02:00
Marcin Grzejszczak
dda3f89ad9 Updated maven plugin plugin 2017-06-22 08:21:03 +02:00
Marcin Grzejszczak
d3a67c7470 Merge branch 'master' into 2.0.x 2017-06-20 23:38:34 +02:00
Marcin Grzejszczak
3e5de6d209 Merge branch '1.1.x' 2017-06-20 21:52:03 +02:00
Marcin Grzejszczak
97380129a4 Fixed wrong contract pattern scanning
e.g. this worked

com/example/foo/...

this didn't

/contract/com/example/foo/...

fixes #335
2017-06-20 21:46:22 +02:00
Marcin Grzejszczak
82fda14b61 Bumped versions 2017-06-20 15:10:16 +02:00
Marcin Grzejszczak
282190ca47 Gradle done 2017-06-20 13:00:38 +02:00
Marcin Grzejszczak
571530e611 maven plugin operational 2017-06-20 12:27:31 +02:00
Marcin Grzejszczak
7dca840cfb Trying to make stub runner work 2017-06-20 10:29:44 +02:00
Marcin Grzejszczak
57fe9939ce Bumped libs 2017-06-19 19:49:33 +02:00
Marcin Grzejszczak
dde0360f6c Merge branch 'master' into 2.0.x 2017-06-19 18:56:59 +02:00
Marcin Grzejszczak
12ce468b6d Removing deprecations 2017-06-19 18:46:02 +02:00
Marcin Grzejszczak
c1fca13f12 Initial commit 2017-06-15 14:56:18 +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
6e61b5b8f3 Fixed broken test 2017-06-14 13:50:40 +02:00
Marcin Grzejszczak
69d1be515d Added helper methods for contract extension
without these methods to use  and  fields you need to prepend the  word - otherwise you're setting it on the project

fixes #328
2017-06-14 12:46:58 +02:00
Marcin Grzejszczak
88c959beea Fixed wrong classifier setting
without this change the classifier is picked from the `classifier` field in the extension and not from the parsed string notation

fixes #327
2017-06-14 12:36:10 +02:00
Dave Syer
186886029b Switch to Boot 1.5.4.RELEASE for samples in Gradle 2017-06-13 14:52:43 +01:00
Marcin Grzejszczak
84b0cc6478 Checking if the root project has .idea folder
fixes #286
2017-05-30 13:23:03 +02:00
Marcin Grzejszczak
4dc8ea4b9b -x test disables test generation
fixes #306
2017-05-30 12:37:44 +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