Commit Graph

823 Commits

Author SHA1 Message Date
Marcin Grzejszczak
7123d25f61 Merge branch '2.0.x' 2018-11-08 17:21:34 +01:00
Marcin Grzejszczak
ba2e67275a Merge branch '1.2.x' into 2.0.x 2018-11-08 17:21:26 +01:00
Marcin Grzejszczak
182aa430b5 Added fixedDelayMilliseconds in yaml and docs; fixes gh-788 2018-11-08 17:18:20 +01:00
Marcin Grzejszczak
04a292775f Merge branch '2.0.x' 2018-11-08 17:07:05 +01:00
Marcin Grzejszczak
d5c4597193 Merge branch '1.2.x' into 2.0.x 2018-11-08 16:52:18 +01:00
Marcin Grzejszczak
e01af34151 Fixed the issue with round robin of stream / integration flows; fixes gh-787 2018-11-08 16:44:50 +01:00
Stefan Stus
5abf2d7c17 Added support for camel with Boot 2.0; gh-673 (#786)
fixes #673
2018-11-08 15:44:44 +01:00
Marcin Grzejszczak
8c77386816 Deprecated targetFramework in Gradle; fixes gh-725 2018-11-06 17:31:07 +01:00
Marcin Grzejszczak
96a60e75f6 Does not return a lowercase channel name; fixes gh-781 2018-11-06 16:12:48 +01:00
Marcin Grzejszczak
d3a4b1c611 Merge branch '1.2.x' into 2.0.x 2018-11-06 16:12:28 +01:00
Marcin Grzejszczak
8b869e0c7a Does not return a lowercase channel name; fixes gh-781 2018-11-06 16:12:11 +01:00
Marcin Grzejszczak
51e6c73938 Asserts that contracts are valid; fixes gh-769 2018-10-26 21:08:01 +02:00
Marcin Grzejszczak
a2e4dd1459 Fixed invalid cookie and URL YAML parsing; fixes gh-770 2018-10-26 19:48:15 +02:00
Marcin Grzejszczak
c05f19cdb7 Fixed invalid cookie and URL YAML parsing; fixes gh-770 2018-10-26 19:47:42 +02:00
Marcin Grzejszczak
4735b55a3e Merge branch '2.0.x' 2018-10-24 22:45:15 +02:00
Marcin Grzejszczak
921b0e155b Added URL matchers for YAML; fixes gh-767 2018-10-24 22:45:01 +02:00
Marcin Grzejszczak
c42b4a6fd9 Merge branch '2.0.x' 2018-10-24 22:31:35 +02:00
Marcin Grzejszczak
898dbcab98 Added query parameter matchers for YAML; fixes gh-766 2018-10-24 22:31:22 +02:00
Marcin Grzejszczak
254864b21c Merge branch '2.0.x' 2018-10-23 22:56:12 +02:00
Marcin Grzejszczak
2d5c2dd931 Fixes missing casting; fixes gh-764 2018-10-23 22:53:23 +02:00
Marcin Grzejszczak
45fd30262a Merge branch '2.0.x' 2018-10-23 22:16:48 +02:00
Marcin Grzejszczak
edb3d97f3f Fixed invalid cloning of a json; fixes gh-763 2018-10-23 22:13:41 +02:00
buildmaster
15344a159c Bumping versions to 2.0.3.BUILD-SNAPSHOT after release 2018-10-23 19:56:38 +00:00
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
fc12375b76 Merge branch '2.0.x' 2018-10-23 20:25:27 +02:00
Marcin Grzejszczak
38afb59076 Fixed conversion of GString to String; fixes gh-762 2018-10-23 20:21:44 +02:00
Olga Maciaszek-Sharma
cf21f18938 Webtestclient support (#757)
* Fix incorrect spring cloud dependencies versioning.
* Test fix and minor refactoring.
* Add docs.
* Fixes after code review.

fixes gh-422
2018-10-22 14:34:03 +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
32d0964d06 Merge branch '2.0.x'
# Conflicts:
#	samples/standalone/dsl/http-client/build.gradle
#	samples/standalone/dsl/http-server/build.gradle
#	samples/standalone/messaging/stream-sink/build.gradle
#	samples/standalone/messaging/stream-source/build.gradle
#	samples/standalone/pact/pact-http-client/build.gradle
#	samples/standalone/pact/pact-http-server/build.gradle
#	samples/standalone/restdocs/http-client/build.gradle
#	samples/standalone/restdocs/http-server/build.gradle
#	samples/standalone/webclient/http-client/build.gradle
#	samples/standalone/webclient/http-server/build.gradle
#	samples/standalone/yml/http-client/build.gradle
#	samples/standalone/yml/http-server/build.gradle
2018-10-15 17:41:27 +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
Marcin Grzejszczak
107ed195f1 Bumped to work with jdk11 2018-10-05 18:27:18 +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
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
Yuriy
ccd4e2f532 bump camel version (#733) 2018-09-19 17:55:09 +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
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
67170ae0de Revert 077e18aa25. 2018-09-12 12:39:14 +02:00