Olga Maciaszek-Sharma 8f88fb2e09 Merge branch '2.2.x' ...

# Conflicts:
#	samples/standalone/dsl/http-server/src/main/java/com/example/fraud/MyProcessorListener.java
#	spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonAutoConfiguration.java
#	spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonBeanPostProcessor.java
#	spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java
#	spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonServerList.java
#	spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/StreamMessageCollectorMessageReceiver.java
#	spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/stream/StreamStubMessagesSpec.groovy
#	tests/samples-messaging-stream/src/main/java/com/example/DeleteSink.java

2020-04-27 15:10:42 +02:00

..

src

Merge branch '2.2.x'

2020-04-27 15:10:42 +02:00

pom.xml

Bumping versions

2020-04-17 16:20:16 +00:00