SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source 
# 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
This commit is contained in:
Olga Maciaszek-Sharma
2020-04-27 15:10:42 +02:00
parent 281a0c3209 802e64ff53
commit 8f88fb2e09
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/spring-cloud-contract-docker/Dockerfile
View File

@@ -1,6 +1,6 @@
FROM ubuntu:19.10
ARG SDKMAN_JAVA_INSTALLATION=8.0.242.hs-adpt
ARG SDKMAN_JAVA_INSTALLATION=8.0.252.hs-adpt
MAINTAINER Marcin Grzejszczak <mgrzejszczak@pivotal.io>