Olga Maciaszek-Sharma
954ddfb3d5
Merge branch '2.1.x'
# Conflicts:
# docker/pom.xml
# docker/spring-cloud-contract-docker/pom.xml
# docker/spring-cloud-contract-docker/project/gradle.properties
# docker/spring-cloud-contract-stub-runner-docker/pom.xml
# docs/pom.xml
# pom.xml
# samples/pom.xml
# samples/standalone/contracts/com/example/server/pom.xml
# samples/standalone/dsl/http-client/pom.xml
# samples/standalone/dsl/http-server/gradle.properties
# samples/standalone/dsl/http-server/pom.xml
# samples/standalone/dsl/pom.xml
# samples/standalone/messaging/pom.xml
# samples/standalone/messaging/stream-sink/gradle.properties
# samples/standalone/messaging/stream-sink/pom.xml
# samples/standalone/messaging/stream-source/gradle.properties
# samples/standalone/messaging/stream-source/pom.xml
# samples/standalone/pact/pact-http-client/pom.xml
# samples/standalone/pact/pact-http-server/gradle.properties
# samples/standalone/pact/pact-http-server/pom.xml
# samples/standalone/pact/pom.xml
# samples/standalone/pom.xml
# samples/standalone/restdocs/http-client/gradle.properties
# samples/standalone/restdocs/http-client/pom.xml
# samples/standalone/restdocs/http-server/gradle.properties
# samples/standalone/restdocs/http-server/pom.xml
# samples/standalone/restdocs/pom.xml
# samples/standalone/webclient/http-client/gradle.properties
# samples/standalone/webclient/http-client/pom.xml
# samples/standalone/webclient/http-server/gradle.properties
# samples/standalone/webclient/http-server/pom.xml
# samples/standalone/webclient/pom.xml
# samples/standalone/yml/http-client/pom.xml
# samples/standalone/yml/http-server/gradle.properties
# samples/standalone/yml/http-server/pom.xml
# samples/standalone/yml/pom.xml
# samples/wiremock-jetty/pom.xml
# samples/wiremock-native/pom.xml
# samples/wiremock-tomcat/pom.xml
# samples/wiremock-undertow-ssl/pom.xml
# samples/wiremock-undertow/pom.xml
# samples/wiremock/pom.xml
# spring-cloud-contract-dependencies/pom.xml
# spring-cloud-contract-shade/pom.xml
# spring-cloud-contract-spec/pom.xml
# spring-cloud-contract-starters/pom.xml
# spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml
# spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml
# spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
# spring-cloud-contract-stub-runner-boot/pom.xml
# spring-cloud-contract-stub-runner/pom.xml
# spring-cloud-contract-tools/pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
# spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties
# spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties
# spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties
# spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
# spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
# spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml
# spring-cloud-contract-verifier/pom.xml
# spring-cloud-contract-wiremock/pom.xml
# tests/pom.xml
# tests/samples-messaging-amqp/pom.xml
# tests/samples-messaging-camel/pom.xml
# tests/samples-messaging-integration/pom.xml
# tests/samples-messaging-stream/pom.xml
# tests/spring-cloud-contract-stub-runner-amqp/pom.xml
# tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml
# tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml
# tests/spring-cloud-contract-stub-runner-camel/pom.xml
# tests/spring-cloud-contract-stub-runner-context-path/pom.xml
# tests/spring-cloud-contract-stub-runner-integration/pom.xml
# tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml
# tests/spring-cloud-contract-stub-runner-moco/pom.xml
# tests/spring-cloud-contract-stub-runner-stream/pom.xml
2019-06-27 15:26:56 +02:00
..
2019-06-27 15:26:56 +02:00
2019-04-23 12:37:01 +04:00