Commit Graph

3290 Commits

Author SHA1 Message Date
Olga Maciaszek-Sharma
5923c9ad76 empty commit to retrigger build 2018-09-10 18:06:49 +02:00
Olga Maciaszek-Sharma
9b4a80f529 Merge remote-tracking branch 'upstream/master' into gh-304-add-discovery-clients-order-support 2018-09-07 16:51:33 +02:00
Marcin Grzejszczak
1f475384bf Merge branch '2.0.x' 2018-08-31 12:06:30 +02:00
Marcin Grzejszczak
d23684d1c4 Fixed backward compatibility of native WireMock helpers 2018-08-31 12:05:22 +02:00
Marcin Grzejszczak
b143d16f32 Chaned the helper's bounds 2018-08-30 12:21:14 +02:00
Marcin Grzejszczak
14498889f6 Fixed broken compilation 2018-08-29 16:23:56 +02:00
Marcin Grzejszczak
83e700cc97 Fixed broken compilation 2018-08-29 16:22:15 +02:00
Marcin Grzejszczak
d22b94ab83 Fixed broken compilation 2018-08-29 16:19:41 +02:00
Marcin Grzejszczak
8bd931cb4f Added compatibility with WireMock helpers
(cherry picked from commit 9fe36dc747)
2018-08-29 16:13:08 +02:00
Marcin Grzejszczak
452c83bdf1 Merge branch '2.0.x' 2018-08-29 16:03:57 +02:00
Marcin Grzejszczak
cfc9d6fbb5 Added NPE guard; fixes gh-717 2018-08-29 15:51:27 +02:00
Marcin Grzejszczak
9fe36dc747 Added compatibility with WireMock helpers 2018-08-29 15:50:24 +02:00
Marcin Grzejszczak
74b97648ee Polish 2018-08-29 15:37:09 +02:00
Marcin Grzejszczak
cac0ce3e27 Removed the web starter 2018-08-29 15:06:15 +02:00
Marcin Grzejszczak
9ef24e7240 Polish 2018-08-29 14:25:08 +02:00
Marcin Grzejszczak
096790e04d Upgraded to Greenwhich 2018-08-29 14:04:28 +02:00
Marcin Grzejszczak
da2989b053 Samples still failing 2018-08-28 16:28:55 +02:00
Marcin Grzejszczak
58f3f429eb Upgraded to Greenwhich 2018-08-27 18:33:10 +02:00
Marcin Grzejszczak
debea6edfd Migrated to default WireMock helper methods; fixes gh-540 2018-08-24 15:10:55 +02:00
Marcin Grzejszczak
a0bc2eb1c4 Deprecating skipSnapshotCheck and providing fake m2 for Aether
without this change Aether, when having both local and remote JARs, always picks the local one, even though we don't want it to. There seems to be no way to change it via an API. We had a check in Spring Cloud Contract to throw an exception when we wanted a remote JAR but the local one was fetched. You could have changed it by providing a system property or a plugin property called `skipSnapshotCheck` or `contractsSkipSnapshotCheck`

with this change we're deprecating that flag since we're moving this logic to the internals of how we integrate with Aether. If the problem was that there was both the local and the remote JAR, what we could do is get rid of the local JAR. Obviously we don't want to remove it so what we're doing is when someone provides the REMOTE stub mode, we're creating a temporary directory and we're temporarily pointing Aether to that directory as our local m2. Since it's empty, Aether will not assume that we have any stubs stored locally. Thus, we will never have conflicts of remote vs local jars.

fixes gh-643

additional links:
- http://maven.40175.n5.nabble.com/Resolving-an-Artifact-from-Remote-Repository-instead-of-Local-td5875134.html
- https://stackoverflow.com/questions/9123004/maven-is-it-possible-to-override-location-of-local-repository-via-the-use-of-co
2018-08-23 13:30:56 +02:00
Marcin Grzejszczak
9eeb40e213 Throws exception when contract can't be serialized
fixes gh-704
2018-08-22 16:35:45 +02:00
Marcin Grzejszczak
9ed08fb31b Updated branches 2018-08-22 16:17:00 +02:00
Marcin Grzejszczak
ae40e48c17 Merge branch '2.0.x' 2018-08-22 16:16:24 +02:00
Marcin Grzejszczak
814dd06cea Fixed broken links; fixes gh-710 2018-08-22 16:16:16 +02:00
Marcin Grzejszczak
3d42ab9d35 Bumped dependency management plugin 2018-08-21 11:58:18 +02:00
Marcin Grzejszczak
f9ff03f24d Updated Gradle to 4.9 2018-08-21 11:56:59 +02:00
Marcin Grzejszczak
b5351bd6c8 Updated the link to stub runner fat jar 2018-08-20 14:05:37 +02:00
Marcin Grzejszczak
b8adc57bf2 Merge branch '2.0.x' 2018-08-10 14:36:11 +02:00
Marcin Grzejszczak
6f1d88c9b4 Merge branch '1.2.x' into 2.0.x 2018-08-10 14:36:00 +02:00
Marcin Grzejszczak
d2f0f6322e Added comments related to the workaround with Java HTTP client; thanks to @tomakehurst 2018-08-10 14:35:52 +02:00
Marcin Grzejszczak
a1aae6bd6c Merge branch '2.0.x' 2018-08-09 15:51:52 +02:00
Marcin Grzejszczak
ff2621d78a Merge branch '1.2.x' into 2.0.x 2018-08-09 15:51:44 +02:00
Marcin Grzejszczak
c8a79d5154 Merge branch '1.2.x' 2018-08-09 15:51:35 +02:00
Marcin Grzejszczak
6d630482ea Using / for relative paths; should fix gh-697 2018-08-09 15:51:28 +02:00
Marcin Grzejszczak
80622b68a8 Merge branch '2.0.x' 2018-08-09 15:45:25 +02:00
Marcin Grzejszczak
8388757a40 Merge branch '1.2.x' into 2.0.x 2018-08-09 15:45:14 +02:00
Marcin Grzejszczak
e60eb56f2b Removed unnecessary file separator from classpath stub provider 2018-08-09 15:45:02 +02:00
Marcin Grzejszczak
4907afbcaf Merge branch '2.0.x' 2018-08-09 15:05:08 +02:00
Marcin Grzejszczak
0be329f6ac Merge branch '1.2.x' into 2.0.x 2018-08-09 15:04:54 +02:00
Marcin Grzejszczak
0b79a5b360 Moar debug 2018-08-09 15:04:46 +02:00
Marcin Grzejszczak
7956970eb1 Added debug info for stubs per consumer 2018-08-09 14:12:36 +02:00
Marcin Grzejszczak
1603627ed3 Added debug info for stubs per consumer 2018-08-09 14:12:25 +02:00
Marcin Grzejszczak
e0afcd523b Added debug info for stubs per consumer 2018-08-09 14:11:59 +02:00
Marcin Grzejszczak
87c18a5625 Merge branch '2.0.x' 2018-08-08 21:58:13 +02:00
Marcin Grzejszczak
cb31ca7bf1 Removed DirtiesContext 2018-08-08 21:58:04 +02:00
Marcin Grzejszczak
50e6344a0c Merge branch '2.0.x' 2018-08-08 18:10:37 +02:00
Marcin Grzejszczak
ac2b89d68c Fixed checkstyle issues 2018-08-08 18:10:30 +02:00
Marcin Grzejszczak
52ed19d194 Merge branch '1.2.x' into 2.0.x 2018-08-08 18:09:49 +02:00
Marcin Grzejszczak
e5b0a9dabc Added better exception for null collection elements; fixes gh-703 2018-08-08 18:09:27 +02:00
Marcin Grzejszczak
884a53fd2d Merge branch '2.0.x' 2018-08-08 18:04:38 +02:00