Commit Graph

2363 Commits

Author SHA1 Message Date
buildmaster
55be026c4a Going back to snapshots 2018-10-23 19:56:36 +00:00
buildmaster
02d5a01025 Update SNAPSHOT to 2.0.2.RELEASE 2018-10-23 19:42:37 +00:00
Marcin Grzejszczak
38afb59076 Fixed conversion of GString to String; fixes gh-762 2018-10-23 20:21:44 +02:00
Marcin Grzejszczak
78048826a3 Merge branch '1.2.x' into 2.0.x 2018-10-19 16:14:40 +02:00
Marcin Grzejszczak
34c2ed0330 Migrated to Ubuntu:18.10 and Java installation via SDKMan. Fixes gh-754 2018-10-19 16:14:12 +02:00
Marcin Grzejszczak
6254f9e933 Merge branch '1.2.x' into 2.0.x 2018-10-16 14:53:47 +02:00
Marcin Grzejszczak
1ccb884cf8 Fixed the build 2018-10-16 14:52:26 +02:00
Olga Maciaszek-Sharma
099911e056 Fix incorrect spring cloud dependencies versioning. 2018-10-16 14:10:52 +02:00
buildmaster
c20ecc91ed Bumping versions to 1.2.7.BUILD-SNAPSHOT after release 2018-10-16 00:27:32 +00:00
buildmaster
697b5ac37f Going back to snapshots 2018-10-16 00:27:30 +00:00
buildmaster
621c99fba8 Update SNAPSHOT to Edgware.SR5 2018-10-16 00:08:01 +00:00
Olga Maciaszek-Sharma
eaf244e892 Merge branch '1.2.x' into 2.0.x.
Upgrade boot version in samples.

# Conflicts:
#	pom.xml
#	spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java
#	spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java
2018-10-15 17:31:13 +02:00
Olga Maciaszek-Sharma
d976c18c3e Merge branch '1.2.x' into 2.0.x
# Conflicts:
#	pom.xml
#	spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/CamelStubMessages.java
#	spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java
2018-10-15 16:45:08 +02:00
Olga Maciaszek-Sharma
8b50edb340 Merge pull request #750 from spring-cloud/gh-667
Remove duplicated backslashes. Fixes gh-667
2018-10-15 16:38:51 +02:00
Olga Maciaszek-Sharma
1413704cfb Remove duplicated backslashes. Fixes gh-667 2018-10-15 16:04:53 +02: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
Yuriy
ccd4e2f532 bump camel version (#733) 2018-09-19 17:55: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
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
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
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
814dd06cea Fixed broken links; fixes gh-710 2018-08-22 16:16:16 +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
ff2621d78a Merge branch '1.2.x' into 2.0.x 2018-08-09 15:51:44 +02:00
Marcin Grzejszczak
6d630482ea Using / for relative paths; should fix gh-697 2018-08-09 15:51:28 +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
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
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
cb31ca7bf1 Removed DirtiesContext 2018-08-08 21:58:04 +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
951443552f Merge branch '1.2.x' into 2.0.x 2018-08-08 18:04:28 +02:00
Marcin Grzejszczak
6d1cb05a77 Removed missing DirtiesContext 2018-08-08 18:04:20 +02:00
Marcin Grzejszczak
8bb61176ea Removed dirties context on any tests 2018-08-08 18:00:58 +02:00