From 4f6b6909a6709c3b5bf0e1538757777192c9d9e8 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 12 Feb 2020 16:30:38 +0100 Subject: [PATCH 1/2] Added additional resetting options; fixes gh-1322 --- .../cloud/contract/wiremock/WireMockConfiguration.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java index 63a07dbadb..4270356ffc 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java @@ -157,7 +157,11 @@ public class WireMockConfiguration implements SmartLifecycle { void resetMappings() { if (this.server.isRunning()) { this.server.resetAll(); + this.server.resetRequests(); + this.server.resetScenarios(); WireMock.reset(); + WireMock.resetAllRequests(); + WireMock.resetAllScenarios(); registerStubs(); logRegisteredMappings(); } From 9d7f64c9b558e6efccdf8a9bf4ad3597fed6b7c9 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 12 Feb 2020 17:34:07 +0100 Subject: [PATCH 2/2] IMproved latest version resolution; fixes gh-1305 --- .../contract/stubrunner/ProjectVersion.java | 36 +++++++----- .../stubrunner/ScmStubDownloaderBuilder.java | 5 +- .../stubrunner/GitStubDownloaderTests.java | 7 +++ .../shouldSendAcceptedVerification.groovy | 49 ++++++++++++++++ .../shouldSendRejectedVerification.groovy | 49 ++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.groovy | 54 ++++++++++++++++++ .../rest/shouldRejectABeerIfTooYoung.groovy | 54 ++++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.json | 28 +++++++++ .../rest/shouldRejectABeerIfTooYoung.json | 28 +++++++++ .../shouldSendAcceptedVerification.groovy | 49 ++++++++++++++++ .../shouldSendRejectedVerification.groovy | 49 ++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.groovy | 54 ++++++++++++++++++ .../rest/shouldRejectABeerIfTooYoung.groovy | 54 ++++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.json | 28 +++++++++ .../rest/shouldRejectABeerIfTooYoung.json | 28 +++++++++ .../shouldSendAcceptedVerification.groovy | 49 ++++++++++++++++ .../shouldSendRejectedVerification.groovy | 49 ++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.groovy | 54 ++++++++++++++++++ .../rest/shouldRejectABeerIfTooYoung.groovy | 54 ++++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.json | 28 +++++++++ .../rest/shouldRejectABeerIfTooYoung.json | 28 +++++++++ .../shouldSendAcceptedVerification.groovy | 49 ++++++++++++++++ .../shouldSendRejectedVerification.groovy | 49 ++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.groovy | 54 ++++++++++++++++++ .../rest/shouldRejectABeerIfTooYoung.groovy | 54 ++++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.json | 28 +++++++++ .../rest/shouldRejectABeerIfTooYoung.json | 28 +++++++++ .../shouldSendAcceptedVerification.groovy | 49 ++++++++++++++++ .../shouldSendRejectedVerification.groovy | 49 ++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.groovy | 54 ++++++++++++++++++ .../rest/shouldRejectABeerIfTooYoung.groovy | 54 ++++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.json | 28 +++++++++ .../rest/shouldRejectABeerIfTooYoung.json | 28 +++++++++ .../shouldSendAcceptedVerification.groovy | 49 ++++++++++++++++ .../shouldSendRejectedVerification.groovy | 49 ++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.groovy | 54 ++++++++++++++++++ .../rest/shouldRejectABeerIfTooYoung.groovy | 54 ++++++++++++++++++ .../rest/shouldGrantABeerIfOldEnough.json | 28 +++++++++ .../rest/shouldRejectABeerIfTooYoung.json | 28 +++++++++ .../contract-git/git/COMMIT_EDITMSG | 1 + .../git_samples/contract-git/git/index | Bin 8274 -> 17291 bytes .../git_samples/contract-git/git/logs/HEAD | 1 + .../contract-git/git/logs/refs/heads/master | 1 + .../04/f59ff38f1c76629d41d71f38dcb87afecdf9ab | Bin 0 -> 67 bytes .../0a/124cc494496bf3574617f02e505975e8d64e5c | Bin 0 -> 756 bytes .../0b/b008b1d235cb760e13408f10662dda01027d1d | Bin 0 -> 64 bytes .../0f/c31c163430ef5913e1a85b3a6c4e36bcbf32e1 | Bin 0 -> 759 bytes .../1e/bb28e0982e1e497fe57311c4f8f34bae6f382f | Bin 0 -> 79 bytes .../35/c8489a4e3d4761ae82a8606ea82e0e52b05376 | Bin 0 -> 66 bytes .../46/ea77fbb81bcd831368a980a2c296014be94bf8 | Bin 0 -> 517 bytes .../49/c8705a4409b1a4bd0f767665632c6ae11b5b90 | 2 + .../4d/48d4d56d4bf80700498dcb29d326c0ab35cb19 | Bin 0 -> 113 bytes .../4e/5ffb7085c01081f98321985b6663f64939cdb2 | Bin 0 -> 118 bytes .../57/4590052afef4af132f7b8c5b92682401635807 | Bin 0 -> 54 bytes .../5b/0ae7cddbd14fc6ced6f87f4b9587afd6b0bd18 | Bin 0 -> 127 bytes .../5f/25f6f934c0e7e5dcc18e1bd831dd288fa6ad8a | 4 ++ .../5f/8216428856a5d6240f82dda04f348ba8bb742c | Bin 0 -> 59 bytes .../61/9c03cba4276c76c43b9a307ed00f39dc44616e | Bin 0 -> 68 bytes .../61/fcad6942801c44ad275671c7d125efb564f799 | Bin 0 -> 83 bytes .../62/589edd12a37dd28b6b6fed1e2d728ac9f05c8d | Bin 0 -> 4447 bytes .../63/201c9f9cfbe294f3f314df8b9c94cfee88e622 | Bin 0 -> 56 bytes .../6e/06f676c9ba4459c1feb922de8ee603ea6bebce | Bin 0 -> 119 bytes .../78/3688df3e22c6b8e1d8f58167baf4f511d369c5 | Bin 0 -> 54 bytes .../90/126ac925d26698516838a646e286e037acd55e | Bin 0 -> 46 bytes .../95/f833faccac8775b5528e38f3c30b9036d5c538 | Bin 0 -> 53 bytes .../9a/4d31b7e5ca02bf207e3b04b2312ee9585ee560 | Bin 0 -> 306 bytes .../9e/5ec949f441e1828b21b7760ded76c1d42ea9bc | Bin 0 -> 121 bytes .../a1/84578130917b3bf6a6568f900f66c1ed0e72e1 | Bin 0 -> 88 bytes .../b0/cdfa5512c23af490d213948c7bdcd76d59a93e | Bin 0 -> 741 bytes .../c4/25167fb2a107afddca629fad83f8603fe2c215 | Bin 0 -> 59 bytes .../d2/5d733109a6de5ea294154f1612aaf5cb9ae06b | Bin 0 -> 168 bytes .../d2/ccedaea7b8739a11c17c91561cc2ace0a0a999 | Bin 0 -> 77 bytes .../d7/2fbbffa2d0b1ea0707df4b533f3adf69383eaa | Bin 0 -> 46 bytes .../d9/ab57c99263dac1e164883dcb7e06c542b89906 | 6 ++ .../fc/a3d789524348301d622344c8375d89b40f8b5d | Bin 0 -> 83 bytes .../fe/2d022c3d254c5c7a5a65783e6976fac499d9c6 | Bin 0 -> 46 bytes .../contract-git/git/refs/heads/master | 2 +- 77 files changed, 1619 insertions(+), 18 deletions(-) create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/COMMIT_EDITMSG create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/04/f59ff38f1c76629d41d71f38dcb87afecdf9ab create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0a/124cc494496bf3574617f02e505975e8d64e5c create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0b/b008b1d235cb760e13408f10662dda01027d1d create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0f/c31c163430ef5913e1a85b3a6c4e36bcbf32e1 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/1e/bb28e0982e1e497fe57311c4f8f34bae6f382f create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/35/c8489a4e3d4761ae82a8606ea82e0e52b05376 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/46/ea77fbb81bcd831368a980a2c296014be94bf8 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/49/c8705a4409b1a4bd0f767665632c6ae11b5b90 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4d/48d4d56d4bf80700498dcb29d326c0ab35cb19 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4e/5ffb7085c01081f98321985b6663f64939cdb2 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/57/4590052afef4af132f7b8c5b92682401635807 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5b/0ae7cddbd14fc6ced6f87f4b9587afd6b0bd18 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/25f6f934c0e7e5dcc18e1bd831dd288fa6ad8a create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/8216428856a5d6240f82dda04f348ba8bb742c create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/9c03cba4276c76c43b9a307ed00f39dc44616e create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/fcad6942801c44ad275671c7d125efb564f799 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/62/589edd12a37dd28b6b6fed1e2d728ac9f05c8d create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/63/201c9f9cfbe294f3f314df8b9c94cfee88e622 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/6e/06f676c9ba4459c1feb922de8ee603ea6bebce create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/78/3688df3e22c6b8e1d8f58167baf4f511d369c5 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/90/126ac925d26698516838a646e286e037acd55e create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/95/f833faccac8775b5528e38f3c30b9036d5c538 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9a/4d31b7e5ca02bf207e3b04b2312ee9585ee560 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9e/5ec949f441e1828b21b7760ded76c1d42ea9bc create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/a1/84578130917b3bf6a6568f900f66c1ed0e72e1 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/b0/cdfa5512c23af490d213948c7bdcd76d59a93e create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/c4/25167fb2a107afddca629fad83f8603fe2c215 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/5d733109a6de5ea294154f1612aaf5cb9ae06b create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/ccedaea7b8739a11c17c91561cc2ace0a0a999 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d7/2fbbffa2d0b1ea0707df4b533f3adf69383eaa create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d9/ab57c99263dac1e164883dcb7e06c542b89906 create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fc/a3d789524348301d622344c8375d89b40f8b5d create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fe/2d022c3d254c5c7a5a65783e6976fac499d9c6 diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java index 4cba0786b0..e7cbe87524 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java @@ -167,10 +167,7 @@ class ProjectVersion implements Comparable, Serializable { return ReleaseType.SNAPSHOT; } - /* - * E.g. 1.0.1.RELEASE is more mature than 1.0.2.RC2 - */ - boolean isMoreMature(ProjectVersion that) { + int isMoreMature(ProjectVersion that) { SplitVersion thisSplit = assertVersion(); SplitVersion thatSplit = that.assertVersion(); int releaseTypeComparison = this.releaseType.compareTo(that.releaseType); @@ -179,16 +176,30 @@ class ProjectVersion implements Comparable, Serializable { && that.isReleaseOrServiceRelease(); // 1.0.1.M2 vs 1.0.0.RELEASE (x) if (thisReleaseTypeHigher && !bothGa) { - return true; + return 1; } - int versionComparison = thisSplit.gav().compareTo(thatSplit.gav()); - if (versionComparison == 0) { - // 1.0.0.SR1 vs 1.0.1.RELEASE (x) - // Finchley.RELEASE vs Finchley.SR1 (x) - return thisReleaseTypeHigher; + int majorComparison = compare(thisSplit.major, thatSplit.major); + if (majorComparison != 0) { + return majorComparison; + } + int minorComparison = compare(thisSplit.minor, thatSplit.minor); + if (minorComparison != 0) { + return minorComparison; + } + int patchComparison = compare(thisSplit.patch, thatSplit.patch); + if (patchComparison != 0) { + return patchComparison; + } + return releaseTypeComparison; + } + + private int compare(String thisString, String thatString) { + try { + return Integer.valueOf(thisString).compareTo(Integer.valueOf(thatString)); + } + catch (NumberFormatException ex) { + return thisString.compareTo(thatString); } - // 1.0.0.SR1 vs 1.0.1.RELEASE (x) - return versionComparison > 0; } boolean isSameWithoutSuffix(ProjectVersion that) { @@ -223,7 +234,6 @@ class ProjectVersion implements Comparable, Serializable { @Override public int compareTo(ProjectVersion o) { - // very simple comparison return this.version.compareTo(o.version); } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java index f5b521ae47..7fc14216f2 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java @@ -403,8 +403,6 @@ class FileWalker extends SimpleFileVisitor { class DefaultArtifactVersionWrapper implements Comparable { - private static final String SNAPSHOT_SUBSTRING = "snapshot"; - final DefaultArtifactVersion version; final File file; @@ -427,8 +425,7 @@ class DefaultArtifactVersionWrapper implements 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 Wq?P=ttPhswg!!fn&pp|4t@;0Jx(#js literal 8274 zcmeI1c~BEq9LHC%N<*m@#1Taba#Vp_90JyAIRb<$kN^T=YzPZRlPqq6K#Fo!Q7Pb1 z6{prpD;+G9dQGRGRh(AA3iSY_o!Tm`TEJRQ)FNP)09kmvfC5SXVQ2COVRzs6`}@A% zCvV>KVskwa1koWr3!)eIxKjPRsL^&l_wDBxgi=pq+xn-3aQ`L5u z^VImRRr5zYr%dT`tQgrA$O?6*vV*+oLQFzKlLe9lF-ng?QJgAB5K$9wEH+U{{DCIR zQCunz(-|}djY;JNxd-!nIibW;QaLUV%4Os;#8 zW8H;9G(nEWhNHMBP9zk_MVOQpk7L+|ls-3V{a6Bi+Cn&1zF9dn>pIv5&3cI~Pa^%} zEwt{3i>^h5WAZ}<{D_yWuYSELS0et@cfoneJI80WSMAA1GBubFj>_cy(fHs3sodRz zh@BnB5y!HmSYrH|7t6&S@S(VyeXu02_{NpFc*$+f7KvZ!3|l>I`RI$I-$*EiMPiB4 z_>p{snezMk&+KEshgDEa(&p}GKi@W~xGnKNxj|sEmuilrjWZ94AR&S12w1y}8pm20 zCI$OlrQg~B(7&+ID(NB`c zZ2g%8uNX9sFm`~KhNwmG7v{$w@B`=7|Kn#wYN_!P1o(mTDo5k_jM^pxzb0yY1Oh(b zywa)70n}3du9JO2`UnPmz`3POAMiN(>813cun#;}0PrgW z@B!yn_So_WWKR4_i|7xS4=&&X&Mocv7?D-|>tBWawgwT9M=0O}&Z|_7pAfNQsW~6@B!zK7JZBcAT>Us03UGvY#iJCA1#lU0gxK~k$`?U ze>ATj-U)*Mq|{$&Y^dx9vX55+`r-UhjJ^Kj22d|NiA#NVgUVc9&H+5{U?G+YV->M{cs*>ML)d! z156_Hll$Rh{pmyXBb8Bmn(wuI7_P%^+ZAklp*Y3Fz_c5QR@FZa!)P%AoE{@k@KAh% zNQjQG_bpI(_V0Q#>4WAuPmtn^ipAKF9Y{6$Xn?-%ywlZ2NT+vsW^|O_FMDknZ>Ov> zM$W@P zCq3_ou4~%qb|f;dwjsKF=z#@sn*-&z;`nd*e95oLkH6EkZu1j+-rxOnpjZf#80z8@ z#gojZ4eZXhvW|#$o=@Yn9Oe;2sWMjHq@Qb(QhPRiDzn}ne>ihyS64UJyf=H|pA1Uc zUzPEVUv< zgXdQ4EkEd0*shz_Sv$W&HO3+DgLmt*1+}J6=1rYvez3PEPtSCol5P_GF5`jv*%j63m8-!GC-1qs?kP9|_`>26TWHC`d zPDH?i8e<`Ae>yWN)i3BOJzQF&DqwF`yJyVLD~jxKW^9}NPv_SwKVeXBdaFhqI3Q9+ z=JDuiYe}6iKQZpP8*XSNP4#HXS2}bcs+eW%?}hDNQ5D6@&N$Z^hL#yq(#R_IPOESD zzSR*ct{HsRb!v5^U2 1522062299 +0200 clone: from git@github.com:marcingrzejszczak/contract-git.git 0b36113e5fa9713025d50f046e8fd209fc8d9597 3bd42890d5105a30abd82d0205b63cbf20a59e83 Marcin Grzejszczak 1547107982 +0100 commit: Added more versions +3bd42890d5105a30abd82d0205b63cbf20a59e83 49c8705a4409b1a4bd0f767665632c6ae11b5b90 Marcin Grzejszczak 1581521766 +0100 commit: Issue 1305 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/refs/heads/master b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/refs/heads/master index abed8dd31c..ce0663ddbc 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/refs/heads/master +++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/refs/heads/master @@ -1,2 +1,3 @@ 0000000000000000000000000000000000000000 0b36113e5fa9713025d50f046e8fd209fc8d9597 Marcin Grzejszczak 1522062299 +0200 clone: from git@github.com:marcingrzejszczak/contract-git.git 0b36113e5fa9713025d50f046e8fd209fc8d9597 3bd42890d5105a30abd82d0205b63cbf20a59e83 Marcin Grzejszczak 1547107982 +0100 commit: Added more versions +3bd42890d5105a30abd82d0205b63cbf20a59e83 49c8705a4409b1a4bd0f767665632c6ae11b5b90 Marcin Grzejszczak 1581521766 +0100 commit: Issue 1305 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/04/f59ff38f1c76629d41d71f38dcb87afecdf9ab b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/04/f59ff38f1c76629d41d71f38dcb87afecdf9ab new file mode 100644 index 0000000000000000000000000000000000000000..b0dfc0b00fdbf5ff005c3573c54d867a84343346 GIT binary patch literal 67 zcmV-J0KETr0V^p=O;s>8W-u`T0)?d1)FR!)f=u0lqWqN7WFRNCq9nB_FENK|h7PT$t>GPK_9!(w#dQ6wL**aaV13i24^!XXSUQt*xSsZF3 zYm#kPTZi}l$!AE5nKxRo@mx}CN_Ht}+DL`mK5|MQ*?DaZJsb+8rsuJ*G&9VaT7=zQg+kSS{lXF>99_H`YI6#eeP@6B1l}9NNBcXSH~Ag zh8{G<&pL$0pHC)T*JUz6&aA5@^^TCA+~k+nv&HopVE1VsOwHbtQ8Hh`sM z0kE~~l0KDV#Da~mJEwy-)hT(q3Y~Nuv6k8gr;9c`P_1V};C_4ox=BOB>4NgbkS?Z+ zd~q6!e9D(^=O32zX?lA*oh|e01LDMeWrK$?CO*lnqfNpvvH9D z#;Bv7Tqf}r97R7&j8=%pci*tmE3H7yRIRL-D*J<-0V8VIZM2Vb^#E8#NVVSRAVWI( z>xQE#O@x5X_py+&COD~r&kAOjZGcL`X_XL|LFOBW=arKi?yS4dRBhWb+vgz6D!c3} zWE*+U^h*p%_R8rd_8$+2L$P2}0vk2fV+cQ(06nrv2x-?5Zd$X6WITk1^jyR6ahjN4 z#UaTM5ejj4cPA>8G3R2SAf16Pp=4bW8{1ZE5i21E-I6I79**lmDIIdgV8^4nCJ$r? z93VtP{|9GkD?sN&3?>u0kp-v9{%puTJ6@swxMamp{jyy3h=-NR}8m`L7kFE zQpKg>^4qZ>}tKcS$<|4EVP|$HAfd#dbW}sh0bB zU0x^2#wR1t`kh+;gTCL~zZiD$_sJ(|+z|^#j`i9N6sZ5J#U3Vv4?q=vmX=1x0(dB} mr&rkW@Za$e7w*L1_zNBegS}bKp>oSO`kLtc7JmRO;>voQfq4r6 literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0b/b008b1d235cb760e13408f10662dda01027d1d b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0b/b008b1d235cb760e13408f10662dda01027d1d new file mode 100644 index 0000000000000000000000000000000000000000..9fef1219069ed046b12997646012a2be9aca719e GIT binary patch literal 64 zcmV-G0Kflu0V^p=O;s>4XD~D{Ff%bxD9*?)%}EJPtn^6D$;sEtD$dVixD;D#$hquZ W+@dL>{$fI_zMh`-AR7SuG!*hvZ5_M- literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0f/c31c163430ef5913e1a85b3a6c4e36bcbf32e1 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0f/c31c163430ef5913e1a85b3a6c4e36bcbf32e1 new file mode 100644 index 0000000000000000000000000000000000000000..659754a79577cde194dcb5e8cee1f80c7226e162 GIT binary patch literal 759 zcmVH?#N3A8p16Mxg(MlzPP+qR8SRx|Y`Zc?A2iXfp6Lk(9(h3g6l?T*~~ z^dhM^fF}8DVr;|ZY}WUEt`g+j`Fhsu35D5Bado{|UOxuxA?>YgI0W+ir86Fs%N?l} zu(T=xwo!f3r}m6kbOO8gCK_9xQ*i6pE6;+pG9h|XcJU|G1~vrlrx&1`vNWDAsaTHb z<$PHz&!x!wV)f?s?TX&d@9yS{RdKzf+dI0tUA!t*#q9!buW7#cKz|pDSLejg4AbFn ztrrFuqY*v1O5!b9L_bc9)`-h{Xjz-J(V%AQPSs4c`^w&e5w+~MCdga^09FF2FYz(DrC@R68Crv{E z;1D>X5KsRGYU-MS(OEW{&FDsz+=%tIte`zC-fxWFZ-nb&+r?v54d;}gfhDdPhRsGz zN}hQB%o_Il_f(QeDsQY*0CO?GLGf&~KZeQz;WUJG1fA0^X)S;Oe;DXEI(C1#n@;wk z6=CHZHrCeDvk6#zPn~}OKkV)g2>bXy$th{z0tG|Ig6&5N(7%=9fD*b#fRdk;qsb}% p009o{N>?5KJ$}Z8I})6J#KUNGu*xN^RTCIzpAw(%+5e@E%Y=2fearv= literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/1e/bb28e0982e1e497fe57311c4f8f34bae6f382f b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/1e/bb28e0982e1e497fe57311c4f8f34bae6f382f new file mode 100644 index 0000000000000000000000000000000000000000..46cdecb6093d1a63531187e968ed0e50371fd6c3 GIT binary patch literal 79 zcmV-V0I>gf0V^p=O;s>6XD~4U0)^bv;^M^g%)E34UymzSbG?7CGkEr%*1W8CV72LK lNr;-F)Z!9`d2uH_zc@Z@>Q>xd#{0JH;1#`(Kr? z=MbPoO62q1eg3}hoKl$*u2rbwTkO1*0=35qdR?I#n=;D<^-h^3d`IV{(Qw69@H(Q-r_}t-#|UvUJ#_p8+63r5 z5{C3pOND?>0&M`PL72`e$+bWjWN628CX~no9wrP^22SOi8te&7eO?GWOr#+`Z3xzX zNYh~$7#}G!ukGJOQ^vOYoA&Dn5+7eTR+_-;g9U80M{`gKNh-9E>|Mp-f+~KR}d5!KiJ7 zWgR~v{7hzXR)i3jvkvJFSFrf9IV>pboq|Q$qEd#!mssm99Xs~TJSpit{SK>`dr5u) H-WLp>O&|F~ literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/49/c8705a4409b1a4bd0f767665632c6ae11b5b90 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/49/c8705a4409b1a4bd0f767665632c6ae11b5b90 new file mode 100644 index 0000000000..f684debe0e --- /dev/null +++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/49/c8705a4409b1a4bd0f767665632c6ae11b5b90 @@ -0,0 +1,2 @@ +x1N1ajbzhl^ t{a "Yp^Y[[8OedE$j E%gJGJ曻,K3 +Y$YtH9CY7kweåe_;]|m|^Rl "CCe̼mCz$)Tz \ No newline at end of file diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4d/48d4d56d4bf80700498dcb29d326c0ab35cb19 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4d/48d4d56d4bf80700498dcb29d326c0ab35cb19 new file mode 100644 index 0000000000000000000000000000000000000000..c1cbce1fd003cd6192c46bec0bd2219b14b624a8 GIT binary patch literal 113 zcmV-%0FM870V^p=O;s>7HefI`FfcPQQ7F#HFU?5_PR&bkOioTMC`nBTOD)Pw%S=uz z$;{8wOE1dLFRNtW67o4R#WVYJxSRL~y@1Hl7uWn^FboJv%}PziVF3SO88H)s_mRR6 TS43Oo_?hk5Z}boVi7qq%%O)@X literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4e/5ffb7085c01081f98321985b6663f64939cdb2 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4e/5ffb7085c01081f98321985b6663f64939cdb2 new file mode 100644 index 0000000000000000000000000000000000000000..e064506abc04e96e7390dd1fcd40b795572cbe77 GIT binary patch literal 118 zcmV-+0Ez#20V^p=O;s>7GGH(?FfcPQQ7F#HFU?7DFG|cSadb*eE%HqB&q;C3%P&pO z(90^$&tr&J{r1!3!1Jef4)#gkFubeLzie$6ir%2qtkh(f=8*jS$o$g0bco(rzJ}YM Yo?_asP-o4u$x!cQMBLK^08kb(@({W{YXATM literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/57/4590052afef4af132f7b8c5b92682401635807 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/57/4590052afef4af132f7b8c5b92682401635807 new file mode 100644 index 0000000000000000000000000000000000000000..5308a6f92effd7c536087700373cba866b5c9441 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s?qWH2!R0)?c+D(C#X;?msIB14Aj`n&%xy0GyTJNtd_V0)|k MnHF}d0EN*KM7Q%BNdN!< literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5b/0ae7cddbd14fc6ced6f87f4b9587afd6b0bd18 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5b/0ae7cddbd14fc6ced6f87f4b9587afd6b0bd18 new file mode 100644 index 0000000000000000000000000000000000000000..81af1360ef3167083f48c521fb4973cbf0034a97 GIT binary patch literal 127 zcmV-_0D%8^0V^p=O;s>7G-fa~FfcPQQSk9}cJ&K()hnqeVMvOYcUNd}?WOMQ{I_zt zMO`O9#PpgN0D*$9Ylx$+r=J@`9^1FFle=6Z5B}S!bg%Cj^Q-LF=b$D9xjMS|y6PpS h%Cn9zM(-@E9+!qq!Z{S$swnmIx70|2ceF-_T=KLh{( literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/25f6f934c0e7e5dcc18e1bd831dd288fa6ad8a b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/25f6f934c0e7e5dcc18e1bd831dd288fa6ad8a new file mode 100644 index 0000000000..b36fe165e7 --- /dev/null +++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/25f6f934c0e7e5dcc18e1bd831dd288fa6ad8a @@ -0,0 +1,4 @@ +xQN0ܯ,I@VjoIN2!PU+$󛷌BGWc4VK6ZO0)?d1)FR!)f=u1y{Ji4Q+|(ilx!oEMX6VUz);}#4 RJo4kS_qu!weE`7)6JHQu8=e3F literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/9c03cba4276c76c43b9a307ed00f39dc44616e b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/9c03cba4276c76c43b9a307ed00f39dc44616e new file mode 100644 index 0000000000000000000000000000000000000000..9b672595dbf948602d708f6983de10d85a371cb2 GIT binary patch literal 68 zcmV-K0K5Nq0V^p=O;s>8W-u`T0)?d1)FR!)f=u0lqWqN7WFRNCq9nB_FENMV(wVpG amhUK@C3vuAVwlXKH4hf7oCyG#1R0s>O&#O_ literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/fcad6942801c44ad275671c7d125efb564f799 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/fcad6942801c44ad275671c7d125efb564f799 new file mode 100644 index 0000000000000000000000000000000000000000..922f3ca3fcf1b263091416047fe313c5a133dc8d GIT binary patch literal 83 zcmV-Z0IdIb0V^p=O;s>AWH2!R0)^!Kypp2C|^S<;|^mv$&d?+pE{NH!t2?^6RNQ^zBBC_A4)veu7=t*{X@Ol z?nJRwyE}B{X4{)~-?+{|CA?Vn2V;kR+jix@rjm%=z!B>07h12s)orRl=Xd1D&aDV>gb$CSa1x!#<8^XyM}0LQg(PjGw`H1xhl@-YTT;?DUf z5h9naffH6GLU|-T({l{@yLOnEGaNF(zq-kJUK1z_`sBVW2FmKpt1LfM6ZZkymY#}0 z@4ECv0?o5f1d{A0skXprD>q?z)%lqc)XuG4*Wq>fD=Vu-S3%RUJgW13V1)(o(NJ)!UM?AQ2*<4Gj#HIgr#yBeB3Pm zi7Yu)-8P4yFv2lZQXlKCt&w)Ct!!?6)NV z2U@Bm1gl36K#6wl9;Jx-V-~|Tl2G{I;NdnTa{vkrb6!mj#};;^nt&GEnhllDsV7R|ubpexW7IF%v9!lO8u4R)WF@PP z;Cab`T5t;KqaIA3BZQM2E|iHxNwf+bRkTMod`$TMwW0i|_>)DK#biaI_69vF2(mn)IW8zi*vAuVfJP)#_K@dw|#+Q&R5grnyU zfWXeKq(|x#Axqf#0$X8Wh_SiTnIsWLl5xxe23xrmoehq=8qnIIo19n+UgA?skf}lM zRSVsR*shLkjaUa${H|OL?ch&e&h;RJG5ydAs$!4EIYqKJPbBgl7W3m1u%2#%e|GJ`R{i10x^wtc zg4o@+D*}0{h&bI;Vg4g>$7u_1pdkVI-6_(w>!`dG7|#yRTiMv$XkT!|35ls2&&tmu)M*@!Hyw`iS+Tn zQgoGbvkSIn(F0va;IIFaKNCNPTh+1Sa7?pvCeu;E17# zf-q%~(sS^Nr`p}F;<(v1NCT+>%!N_4Rb@+z_Tkwq^^oHtBm;*LHyc#1_qHpgI@cZ0 z2i6DtDdR|&-h?O4{5i(pwqdL1bAUfElEmr(Z)G=@S$IKfKqp)!B~U+*ykq6`h&@9Q z`}fSu*9O(8a>~YIFEI4U@(QTA2`bnP$dpGU0dgb+7&XtvhLyN=*Lwd%97Z!%?Lht% zJ|pthRCe!&vZtw)10!S;03V5+Ko!BO$58x9fMa`8#nIGd3LoX*Z-IQZSSx9+l}(5T zXK-m^&pzTO)FCRBUGda4phY{Hxq7cZHBrx|w@zBq)JQgDj=fpOE6iXh#_x%4hb>t&b z8H(&Vic?_-}mv**Fm0hzYpm_+r$yn%LD!o&v5 zNj<6NX`Hx`Jb_$`Q+AM`TQddJALzVv<}y1oEN;XnGTtEWGQTtWE88)JFg{>I2Xqe8 zV@wksPl!t?&1B)|&a!8Ei=5+=SJ}y(>rr4Nf%0@V!c%){^w7A>?&xfGu#oKlP;Ms^ zu<3z<~V?pxc7N-Q3MDuO?W^ph}DR*{Gaui@O zgMf!e2jv;c^a7d^vNIE<8bE>0*+OQ_G3k)OkGPef1UI-M6Qit6Ksy*BCSd+fjQFE| z&BQ$JVe!{P<0RP-o61>~8#+%WMoVn0RuCgJwC@EQ2pdLq9DO}{C^svMz~ix1yZOhX zq>nw4sdc=7GUa;28Me$#-0?n^J8hRIsh(yd*E8dmEA-}*?1PtBf4NOUATR+27)LMY ziYH7n><(n3$~ z9cK)8o3V(;wvmYu*pO;~9GTMLhD`P3>y>P)Ff-A?fWP6Wte{G8OaSJzA57~R7B@TV zk&6;;2HGmi`al4%5&7n0^Of4p*q>e*kxiun17@)) zNI;LY;fS7zA;gLYPlCw+#qC^b*&>fetB5#7k*7H z@zs?Y0BB&EAOmPhP#6ITR1b+4Ng;;8$8G^rhs$YWpj)6>NFm9-m@q*E#E&kUsUFvD zPq(Jq8)}2)Y#5n2^lxPN20jPX{D5|V-LT9Qp$xK+=s|&9gas+6X-rYO!Ne_zf6xk% zi40dZD@+Ix4yn%QkPcToUAR}`bd~#FuRy*96h;DqaNhAQQxgCvk2X%0Ae1}15u)Su zLM_l2HG-R3Y`PMo;nvG__uT1|;NT;?i1g;YtE_bsb&Mg5nKF*49d;@hA>{Um4c%k& z$qNR~me^wTEhHaA8+aMKV};~YXi=@grk1&z%7ZV*YKl07=*p0<&t)wjK+|7v|BS^M zXHRq*JoOg*6APR}DuSdc(o+Ul*^6+*8eu@9D8mcX)h*a`44BqFH|9D$;%cKXT6nCH=<5j;%V zG4%058_9=TCfrJ=;F-p4suJvL<<6% z%5AuhNcR@;NGQJQnX_OjM7fjt2iLTGJ`JADAoXdmB>KM5Fr z9N>2tW5*RJ9!Ei87zkGhzy#gt@gdj>!At1hmk``*{n%9|`3C2nRcl#9r z)%XQdsz>M$+{zSI^Rd_tJ3f;3;wc`HUkiB_r3d`5&;?4!UeqXU*)#Jqeg}g|h)1b9 zbeQxW%K;9n`goKRN+j5pr9q&r zveiYBki$vA)4%GQb@C0a12L|IH*jwqy5QL6;1?8NE%cMQ&yq}DR5eh}gZ%VFZ_9LZ z3{1w}1KFobRM36tlu(KdfhzZXzNcwQ9#$8%VR&$8I?*n=VyK=G3vY-RX!*0xoMAQfuGAAsi{bSoV8 ze*Az@erDd{#me)7Dm=~AAT}@&#knJ7SdljXR?=I+#6UBFMPcrXSF6w}v>W1@Xr-EX zzBmD=0K+V>0NdcFQkeLt_BhxEhl`qExur`yi~T75PAcwuQ2S}gVY}59yIE!Qm+3O` zw*&tB-TWqc169Yfuj4O5%^4p^zqvgBffgdjGO-f~!dRf| zbFRvG+k_CY<)9)6jf!1yZgVnBy;B+OQudMgo;W>-)QwAG^SR%gzQW@1dU5pxzhael zbWZ&QWg&z-PCoQUXEZg@Kg2PTwNXEqoj-sac$9+wkNn#x^A^7?(0dq?II|H6`B``k leq4v?quC6|IB){=1>w3m;{>|Xu92|&Q@dtg{0BJF@DN=;kJtbJ literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/63/201c9f9cfbe294f3f314df8b9c94cfee88e622 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/63/201c9f9cfbe294f3f314df8b9c94cfee88e622 new file mode 100644 index 0000000000000000000000000000000000000000..e5b6e05c8d97fa66aefe9590ea8b2dc37548d76a GIT binary patch literal 56 zcmb7G-5C@00M>N{9L`%ip1Q4oKyyuuk%0m%akR}b-XTbac4)> zzq3DABUEJ;7ni0Q8XK50B+g+zy+l2y?1=R&gSrd+mUmnd^C0Td^7HkQ5{nq7{xJS^ ZW=(tP)}TI%&xg4um|Z<;0RY?BFtL&5II#c# literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/78/3688df3e22c6b8e1d8f58167baf4f511d369c5 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/78/3688df3e22c6b8e1d8f58167baf4f511d369c5 new file mode 100644 index 0000000000000000000000000000000000000000..6123d79f37ddfc7fe252cb25660f4d455929144c GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s?qWH2!R0)?c+D(C#X;?msIB149Mx=cE@sy;DQQK=PnnPtC@ M%)EIF09>^ZGIFCAfB*mh literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/90/126ac925d26698516838a646e286e037acd55e b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/90/126ac925d26698516838a646e286e037acd55e new file mode 100644 index 0000000000000000000000000000000000000000..8f25538fb03cdb6d9fe5e4f3dbca2e8e04744e61 GIT binary patch literal 46 zcmb9XD~4U0)?c+s^HY3vdrXEhGYeq`E!0hn)3Ox$o=j)Q_jEZ Lc%}pZXtfiGcug7z literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9a/4d31b7e5ca02bf207e3b04b2312ee9585ee560 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9a/4d31b7e5ca02bf207e3b04b2312ee9585ee560 new file mode 100644 index 0000000000000000000000000000000000000000..e5a0b4f6688307acb2bb83d5419554964b613d90 GIT binary patch literal 306 zcmV-20nPq+0hLi(OT#b}_IbY|1YruscBLC`APT-IxPg6Zi=4KncG@PjNgu|jzul8| zHy;FjN#M(OJ10r05;mPp&bA}Q_&VbY#*?Y% zW%&($wx|t>tek+hDXoK(7MOnY90Dseh3cJG%a>q}76=(O`k*D^gOUcN5y7U$6P#Ws z2g*QMZ>Z~Xoq|~_>AY(td7sQ!*WaD(MS?_Sn-v&?jkFQrjx^Nl85J06sUOLLh=sL2 z5AQDSufs9C;W%cuU(5+zF^TDz$IfN^Gbtv^K8?1ZYbEuuGS>!7YjZu<2duNS&*u8g{!M{7_ODtm+aB4$~Z`Xxo4M{-_&$1H|H% ErQWHLi2wiq literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9e/5ec949f441e1828b21b7760ded76c1d42ea9bc b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9e/5ec949f441e1828b21b7760ded76c1d42ea9bc new file mode 100644 index 0000000000000000000000000000000000000000..f414071fef1f4d858c944466fe56aea490ed0056 GIT binary patch literal 121 zcmV-<0EYi~0V^p=O;s>7GGQ<@FfcPQQ7F#HFU?7DFG|cSadb*eE%HqB&q;C3%P&pO z&`U4M&o8TFxVbv~ElAYa$iG&CI&eZp~lt6)iKx=t62c^%0a52!X%{t literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/b0/cdfa5512c23af490d213948c7bdcd76d59a93e b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/b0/cdfa5512c23af490d213948c7bdcd76d59a93e new file mode 100644 index 0000000000000000000000000000000000000000..407c78baaada42090e24e41346b8f5bc20691eef GIT binary patch literal 741 zcmVFs%Z$6D>n%LX+!U6OY8sY==-y z{P*3t*-j3;V0=`5r^iXM0 zfoOecEXDnu%czViFO@{?Fo#y>XhYGg5t3^A%m}`qb;@Ws&JJO~s7aqnhVL0-XIiMm z4z%&mIwTC`V5=$we3aODP#UDEn@R~S5jy3|uuqS|OyIW1FdHvuxuAk(2WI!*PoWxYq*(RUCkEj`S}W#S8%#qoXyws<$|J*Fk9Th#e8u#0wm9?h{IycM$Pe>w(R%5&@*lxnLaNz+9u3WUNupw*-Z8nm@?+*d~gbEZ_OT6y8aqvvUO z(WOZolh5}IB#rh~Nbj-@qRohvk7KewbB!hVtrazP#@=VLGHssyUQTJ0*=b*#)#4uE zXB=@y2!U^-9G$ePVH$%ZN#ZMH&8R)`q#<>!lw`rSt-#Ub3abo{Nr9dlMN61Z92e>V z^)!wonWSj~U6@W&<$&6>MHzQx$dgN91dt|{568Zo%;Vw?)2f2Sat(zQgi@+H_!_n# zZbPD5BOR<9($CA)I;FU^6{Hh7Kk}Z#jmdWd`i~-VZ3+*fYH>hrxVA<+uvp;ZApLqc zKDwjJ$z3`eGARE_6m%e6@T3nQW#>rGc)e>d9YNZUFPk;_?u_OwpJM)!XANx=?2R0? zwRQAvIHY`_#Lf~aHav=weLk5&LSnxyFG7w$D79DlA2NGY(JM*;FM1{OUz)=aG}h#; Xd^X{=l4VK6ZO0)?d1)FR!)f=u1y{Ji4Q+|(k52|`&XRWGH@2+Xip R=Ju%Vf%%%NaR97j?_4vQY}?Ht`M~0X#-2=`jdS zr-t1GTHDOT&;U+0H=mAY8o~7=`^C;4ezr%2!N*x}o{;FGQ?nnfGvLzVlGA+oEi(kO WXoZk^3AujTL-^yFVl7_K&qHD>*;DcW literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/ccedaea7b8739a11c17c91561cc2ace0a0a999 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/ccedaea7b8739a11c17c91561cc2ace0a0a999 new file mode 100644 index 0000000000000000000000000000000000000000..0b1fea88e1fa84170f6a96e2752e732247994336 GIT binary patch literal 77 zcmV-T0J8sh0V^p=O;s>5v0yMU00IRAJp(;M1KnUh$ADlD{}6^hi?4SEIeQq$CMmm| jFpurr!rvW>q|%UBm8QfhG$U4_Ik5^Y@GArW?`~11`z0NW literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d7/2fbbffa2d0b1ea0707df4b533f3adf69383eaa b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d7/2fbbffa2d0b1ea0707df4b533f3adf69383eaa new file mode 100644 index 0000000000000000000000000000000000000000..3467337ffbe6cbc3ab79f9da26a4a205df20217e GIT binary patch literal 46 zcmV+}0MY+=0V^p=O;s>9WH2!R0)?W~;t~ea6CShtY~2&rHLXa~_*0P*4t EZh!w0bpQYW literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d9/ab57c99263dac1e164883dcb7e06c542b89906 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d9/ab57c99263dac1e164883dcb7e06c542b89906 new file mode 100644 index 0000000000..12e2653df7 --- /dev/null +++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d9/ab57c99263dac1e164883dcb7e06c542b89906 @@ -0,0 +1,6 @@ +xmQO0|S^Ң6´ +N !׹&sت6};;l7`fUE.'KCJ +DKci߹8RIshu6$M!)+Z\5Cؙjm<rU>Jl<( MexN_m_l˅ |/Sz߸ɤLəŤr|:>ZWX*K7; ɒbCb+>Eyò;NXdrުMֻrq +>NWՈןk^]M +W0[.rAO0]|q6$f|l,;6*yBc8]Rm$khEPAVH`Β*U+/|z /4c|υ +]AqL3X*LVͳ)2Y-~w*mV5,c$I|'Z) ѾV$zn-`5q\ԧq$ GĪP( 1WXS 'vVVPv@3&ECY#/:qk+H'tj=7& ?)<1pmv`Azw<>vwHt8+Q1tD?yz`:ߴh͏|KzL9jfpH y(E>BT#d(z%'Ԋ^YWp5y+ `)2 \ No newline at end of file diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fc/a3d789524348301d622344c8375d89b40f8b5d b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fc/a3d789524348301d622344c8375d89b40f8b5d new file mode 100644 index 0000000000000000000000000000000000000000..b5c4d4136d821adb619c9c106e9a0cef139ee535 GIT binary patch literal 83 zcmV-Z0IdIb0V^p=O;s>AWH2!R0)^!Kypp2C3zxkR_qe?G=!p<*ZieTI+-Ct| CX%O51 literal 0 HcmV?d00001 diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/refs/heads/master b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/refs/heads/master index 7bfe38929e..73fc07ed64 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/refs/heads/master +++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/refs/heads/master @@ -1 +1 @@ -3bd42890d5105a30abd82d0205b63cbf20a59e83 +49c8705a4409b1a4bd0f767665632c6ae11b5b90