Commit Graph

2420 Commits

Author SHA1 Message Date
Marcin Grzejszczak
e9bbf44856 Please work 2018-10-05 18:31:31 +02:00
Marcin Grzejszczak
107ed195f1 Bumped to work with jdk11 2018-10-05 18:27:18 +02:00
Marcin Grzejszczak
2e23d6f26e Fixed jdk11 incompatible test method names 2018-10-05 11:11:23 +02:00
Marcin Grzejszczak
918199ee4c Fixing dots in test names 2018-10-05 10:57:19 +02:00
Marcin Grzejszczak
8da2e4ee57 Checkstyle and jdk11 fix with spock 2018-10-05 10:44:28 +02:00
Marcin Grzejszczak
27652ade37 Bumped Gradle and Boot 2018-10-03 14:48:09 +02:00
Marcin Grzejszczak
bfaf15ebd1 Bumped WireMock to 2.19.0; fixes gh-737 2018-10-03 13:14:15 +02:00
Marcin Grzejszczak
4b32c47127 Migrated to common checkstyle 2018-09-30 18:53:58 +02:00
Marcin Grzejszczak
47afbfcead Merge branch '2.0.x' 2018-09-28 11:01:20 -04:00
Olga Maciaszek-Sharma
1352283a62 Add info about the flow with contracts with producer and stubs in other
repo.
2018-09-28 10:55:34 -04:00
Marcin Grzejszczak
c3984f0c3a Fixed YAML Dsl conversion issues
fixes gh-738
2018-09-28 10:22:51 -04:00
Marcin Grzejszczak
aa6a515922 Fixed YAML Dsl conversion issues
fixes gh-738
2018-09-28 09:30:14 -04:00
buildmaster
1d275c346a Going back to snapshots 2018-09-21 23:48:07 +00:00
buildmaster
19fca03627 Update SNAPSHOT to Greenwich.M1 2018-09-21 23:41:27 +00:00
Marcin Grzejszczak
c99c9d5783 Merge branch '2.0.x' 2018-09-17 17:56:10 +02:00
Marcin Grzejszczak
c78e600c36 Fixed the contract to yml conversion; fixes gh-732 2018-09-17 17:56:09 +02:00
Marcin Grzejszczak
52a5ed6cec Fixed the contract to yml conversion; fixes gh-732 2018-09-17 17:54:55 +02:00
Olga Maciaszek-Sharma
99004f536e Merge pull request #730 from spring-cloud/boot-upgrade
Upgrade boot to 2.1.0.M3.
2018-09-13 17:30:56 +02:00
Olga Maciaszek-Sharma
034b38f565 Upgrade boot to 2.1.0.M3. 2018-09-13 16:57:49 +02:00
Olga Maciaszek-Sharma
c1ec96ce8f Merge remote-tracking branch 'origin/master' 2018-09-12 14:32:57 +02:00
Olga Maciaszek-Sharma
009872587b Merge branch '2.0.x' 2018-09-12 14:32:35 +02:00
Olga Maciaszek-Sharma
7b75c0345d Merge branch '1.2.x' into 2.0.x 2018-09-12 14:29:24 +02:00
Olga Maciaszek-Sharma
1b36df5caf Revert - resolve conflicts. 2018-09-12 14:14:09 +02:00
Olga Maciaszek-Sharma
35719ae2be Revert 077e18aa25. 2018-09-12 14:13:39 +02:00
Olga Maciaszek-Sharma
3befda64f4 Revert 077e18aa25.
(cherry picked from commit 67170ae0de)
2018-09-12 14:12:56 +02:00
Olga Maciaszek-Sharma
abddd0d355 Merge pull request #726 from spring-cloud/gh-704/add-spock-with-maven-setup-info
Add info on generating and running Spock contract tests with Maven.
2018-09-12 13:00:45 +02:00
Olga Maciaszek-Sharma
67170ae0de Revert 077e18aa25. 2018-09-12 12:39:14 +02:00
Marcin Grzejszczak
132c780de6 Ensures that the bean name is not overriding any other bean name 2018-09-12 09:28:32 +02:00
Olga Maciaszek-Sharma
0cb5776fc8 Add info on generating and running Spock contract tests with Maven. 2018-09-11 14:32:43 +02:00
Olga Maciaszek-Sharma
8d7f58dd55 Merge pull request #723 from OlgaMaciaszek/gh-304-add-discovery-clients-order-support
Gh 304 add discovery clients order support
2018-09-10 22:29:33 +02:00
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