From c1fca13f126b944193823296456dbdfe8058de24 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 15 Jun 2017 14:56:18 +0200 Subject: [PATCH] Initial commit --- docs/pom.xml | 4 ++-- pom.xml | 24 +++++++++++-------- samples/pom.xml | 4 ++-- .../contracts/com/example/server/pom.xml | 4 ++-- samples/standalone/dsl/http-client/pom.xml | 2 +- samples/standalone/dsl/http-server/pom.xml | 6 ++--- samples/standalone/dsl/pom.xml | 4 ++-- samples/standalone/messaging/pom.xml | 4 ++-- .../messaging/stream-sink/build.gradle | 2 +- .../standalone/messaging/stream-sink/pom.xml | 4 ++-- .../messaging/stream-source/build.gradle | 2 +- .../messaging/stream-source/pom.xml | 6 ++--- .../standalone/pact/pact-http-client/pom.xml | 2 +- .../standalone/pact/pact-http-server/pom.xml | 6 ++--- samples/standalone/pact/pom.xml | 4 ++-- samples/standalone/pom.xml | 4 ++-- .../standalone/restdocs/http-client/pom.xml | 6 ++--- .../standalone/restdocs/http-server/pom.xml | 4 ++-- samples/standalone/restdocs/pom.xml | 4 ++-- samples/wiremock-jetty/pom.xml | 6 ++--- samples/wiremock-native/pom.xml | 6 ++--- samples/wiremock-tomcat/pom.xml | 6 ++--- samples/wiremock-undertow-ssl/pom.xml | 6 ++--- samples/wiremock-undertow/pom.xml | 6 ++--- spring-cloud-contract-dependencies/pom.xml | 2 +- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-spec/pom.xml | 2 +- spring-cloud-contract-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-contract-stub-runner/pom.xml | 2 +- spring-cloud-contract-tools/pom.xml | 2 +- .../spring-cloud-contract-converters/pom.xml | 2 +- .../pom.xml | 2 +- .../sampleJerseyProject/build.gradle | 2 +- .../functionalTest/sampleProject/build.gradle | 2 +- .../scenarioProject/build.gradle | 2 +- .../pom.xml | 4 ++-- .../projects/complex-configuration/pom.xml | 2 +- .../projects/complex-remote-contracts/pom.xml | 2 +- .../src/test/projects/pact/pom.xml | 2 +- .../test/projects/plugin-extension/pom.xml | 2 +- .../test/projects/spring-boot-groovy/pom.xml | 2 +- .../test/projects/spring-boot-java/pom.xml | 2 +- .../spring-cloud-contract-spec-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- .../builder/SingleTestGeneratorSpec.groovy | 2 +- spring-cloud-contract-wiremock/pom.xml | 2 +- .../wiremock/SpringBootHttpServerFactory.java | 22 ++++++++--------- tests/pom.xml | 2 +- tests/samples-messaging-amqp/pom.xml | 2 +- tests/samples-messaging-camel/pom.xml | 2 +- tests/samples-messaging-integration/pom.xml | 2 +- tests/samples-messaging-spring/pom.xml | 2 +- tests/samples-messaging-stream/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 65 files changed, 117 insertions(+), 113 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 9f72d4104e..1c5b6122d4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-docs @@ -16,7 +16,7 @@ spring-cloud-contract ${basedir}/.. 3.4 - 1.0.x + 1.0.x,1.1.x diff --git a/pom.xml b/pom.xml index 45bcdb70f1..bb9feaf517 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 1.3.3.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT spring-cloud-contract-parent pom - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Cloud Contract Spring Cloud Contract @@ -25,14 +25,14 @@ 5.12.1 2.18.3 - 1.5.4.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT 2.17 - 1.3.3.BUILD-SNAPSHOT - 1.1.2.BUILD-SNAPSHOT - Chelsea.BUILD-SNAPSHOT - 1.3.2.BUILD-SNAPSHOT - 1.2.2.BUILD-SNAPSHOT - 1.2.3.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT + Elmhurst.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT @@ -121,7 +121,6 @@ org.mockito mockito-core - 1.10.19 io.specto @@ -143,6 +142,11 @@ handlebars 4.0.6 + + org.springframework.integration + spring-integration-java-dsl + 1.2.1.RELEASE + org.springframework.cloud spring-cloud-contract-dependencies diff --git a/samples/pom.xml b/samples/pom.xml index 4a448fb909..5593036e94 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -6,13 +6,13 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-samples pom - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml index c4b33dba67..2b895c8608 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Dalston.BUILD-SNAPSHOT true diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index 551eabd564..4d98574f91 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index 5404cd949b..30a4c54c39 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Dalston.BUILD-SNAPSHOT @@ -118,7 +118,7 @@ org.springframework.cloud spring-cloud-contract-maven-plugin - [1.1.2.BUILD-SNAPSHOT,) + [2.0.0.BUILD-SNAPSHOT,) convert generateTests diff --git a/samples/standalone/dsl/pom.xml b/samples/standalone/dsl/pom.xml index f823786991..0515f233b6 100644 --- a/samples/standalone/dsl/pom.xml +++ b/samples/standalone/dsl/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. @@ -17,7 +17,7 @@ Spring Cloud Contract Standalone Test Samples used for end to end tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/standalone/messaging/pom.xml b/samples/standalone/messaging/pom.xml index 15bfc4ca3e..bf67ee7ecc 100644 --- a/samples/standalone/messaging/pom.xml +++ b/samples/standalone/messaging/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. @@ -17,7 +17,7 @@ Spring Cloud Contract Standalone Test Samples used for end to end tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/standalone/messaging/stream-sink/build.gradle b/samples/standalone/messaging/stream-sink/build.gradle index 0629042ea2..bbbd297d96 100644 --- a/samples/standalone/messaging/stream-sink/build.gradle +++ b/samples/standalone/messaging/stream-sink/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.3.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.0.0.BUILD-SNAPSHOT" } } diff --git a/samples/standalone/messaging/stream-sink/pom.xml b/samples/standalone/messaging/stream-sink/pom.xml index 6d75504f00..3ad15fb2db 100644 --- a/samples/standalone/messaging/stream-sink/pom.xml +++ b/samples/standalone/messaging/stream-sink/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.3.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/standalone/messaging/stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle index 3d25eaaec9..90cae0c837 100644 --- a/samples/standalone/messaging/stream-source/build.gradle +++ b/samples/standalone/messaging/stream-source/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.3.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.0.0.BUILD-SNAPSHOT" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" classpath "io.rest-assured:rest-assured:3.0.2" classpath "io.rest-assured:spring-mock-mvc:3.0.2" diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml index 1af906adb4..d772830a57 100644 --- a/samples/standalone/messaging/stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.3.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT @@ -157,7 +157,7 @@ org.springframework.cloud spring-cloud-contract-maven-plugin - [1.1.2.BUILD-SNAPSHOT,) + [2.0.0.BUILD-SNAPSHOT,) convert generateTests diff --git a/samples/standalone/pact/pact-http-client/pom.xml b/samples/standalone/pact/pact-http-client/pom.xml index 1027906fb0..14cd062d1d 100644 --- a/samples/standalone/pact/pact-http-client/pom.xml +++ b/samples/standalone/pact/pact-http-client/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/standalone/pact/pact-http-server/pom.xml b/samples/standalone/pact/pact-http-server/pom.xml index a7123c4a77..bd6f059f95 100644 --- a/samples/standalone/pact/pact-http-server/pom.xml +++ b/samples/standalone/pact/pact-http-server/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Dalston.BUILD-SNAPSHOT @@ -126,7 +126,7 @@ org.springframework.cloud spring-cloud-contract-maven-plugin - [1.1.2.BUILD-SNAPSHOT,) + [2.0.0.BUILD-SNAPSHOT,) convert generateTests diff --git a/samples/standalone/pact/pom.xml b/samples/standalone/pact/pom.xml index 16a6baafdf..2035c0bc75 100644 --- a/samples/standalone/pact/pom.xml +++ b/samples/standalone/pact/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. @@ -17,7 +17,7 @@ Spring Cloud Contract Standalone Test Samples used for end to end tests with Pact - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index a73390ca4a..dea61ec965 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -6,13 +6,13 @@ org.springframework.cloud spring-cloud-contract-samples - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-samples-standalone pom - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT Spring Cloud Contract Standalone Test Samples Spring Cloud Contract Standalone Test Samples used for end to end tests diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index c83db88901..2fcea9969d 100644 --- a/samples/standalone/restdocs/http-client/pom.xml +++ b/samples/standalone/restdocs/http-client/pom.xml @@ -13,15 +13,15 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT - 1.1.8.RELEASE + 2.0.0.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index 61a6074113..d5b43dafaa 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/standalone/restdocs/pom.xml b/samples/standalone/restdocs/pom.xml index 7dc4a60e30..ac78d0ad0d 100644 --- a/samples/standalone/restdocs/pom.xml +++ b/samples/standalone/restdocs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. @@ -17,7 +17,7 @@ Spring Cloud Contract Standalone Test Samples used for end to end tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index ea87ae7979..4bc6ee166e 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ com.example wiremock-jetty - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index 4af21bcd4c..627a441fd6 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ com.example wiremock-native - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT jar wiremock-native @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT @@ -22,7 +22,7 @@ UTF-8 1.8 9.2.13.v20150730 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 6f42c766ac..b17a20144f 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ com.example wiremock-tomcat - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index d4f58d36dd..18d327e225 100644 --- a/samples/wiremock-undertow-ssl/pom.xml +++ b/samples/wiremock-undertow-ssl/pom.xml @@ -5,7 +5,7 @@ com.example wiremock-undertow-ssl - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index e8b35f4b3c..102f42d752 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ com.example wiremock-undertow - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.0.0.BUILD-SNAPSHOT UTF-8 1.8 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index ff928bb11f..264c241b7e 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-contract-dependencies - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT pom spring-cloud-contract-dependencies Spring Cloud Contract Dependencies diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml index 8f8b0f0715..c201b3f782 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-spec/pom.xml b/spring-cloud-contract-spec/pom.xml index 3e94d4bd4a..5e3d1f1479 100644 --- a/spring-cloud-contract-spec/pom.xml +++ b/spring-cloud-contract-spec/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-spec diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 9c555c2876..c30ea485dc 100644 --- a/spring-cloud-contract-starters/pom.xml +++ b/spring-cloud-contract-starters/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml index 4e973c3506..8b72e0b72b 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-starters - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-starter-contract-stub-runner-jetty diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml index a24c4836a0..1c7c01e9e5 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-starters - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-starter-contract-stub-runner diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml index 4348ecb766..5cb8345958 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-starters - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-starter-contract-verifier diff --git a/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/pom.xml index 834ba7e100..ed11f6a9d0 100644 --- a/spring-cloud-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-stub-runner/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index e38890320b..1f2a7ae820 100644 --- a/spring-cloud-contract-tools/pom.xml +++ b/spring-cloud-contract-tools/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml index fc884fca5a..6677166fc9 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tools - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-converters diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml index c0765133c3..f6aa31661c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle index 91246c9b2f..31e37dd14d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.1.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.0.BUILD-SNAPSHOT") } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle index c7afdc8a54..d5065c4631 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenLocal() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.1.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.0.BUILD-SNAPSHOT") } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle index 41e40c1b8a..88038d3a83 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenLocal() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.1.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.0.BUILD-SNAPSHOT") } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index defb32fa49..ba7809990a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. @@ -33,7 +33,7 @@ 1.7 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT 2016 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml index 48bd2113ec..7a5de9e1f9 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.5.RELEASE + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-remote-contracts/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-remote-contracts/pom.xml index 79554c53b3..638a01ec4a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-remote-contracts/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-remote-contracts/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-contract-maven-plugin - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT com/example/server diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml index cce499c343..4a2a27e42f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml @@ -26,7 +26,7 @@ 0.1 - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml index 2bba9a460e..7d43f8ab08 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.1.RELEASE + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml index 7bab12033a..87e53fc7c8 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.1.RELEASE + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml index 2bba9a460e..7d43f8ab08 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.1.RELEASE + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-spec-pact/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-spec-pact/pom.xml index bd6af65bb7..4fe0364be0 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-spec-pact/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-spec-pact/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tools - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-spec-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index 15471c9f5c..48279d0011 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy index a93bbe6cc6..531c18918d 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy @@ -402,7 +402,7 @@ class SingleTestGeneratorSpec extends Specification { // tag::context_path_baseclass[] import com.jayway.restassured.RestAssured; import org.junit.Before; - import org.springframework.boot.context.embedded.LocalServerPort; + import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest(classes = ContextPathTestingBaseClass.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index ff200c407d..ab08141e14 100644 --- a/spring-cloud-contract-wiremock/pom.xml +++ b/spring-cloud-contract-wiremock/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-wiremock diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/SpringBootHttpServerFactory.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/SpringBootHttpServerFactory.java index 03d655b972..55afc312ba 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/SpringBootHttpServerFactory.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/SpringBootHttpServerFactory.java @@ -54,17 +54,17 @@ import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoCo import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer; -import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent; -import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext; -import org.springframework.boot.context.embedded.Ssl; -import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.boot.context.embedded.jetty.JettyServerCustomizer; -import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.boot.context.embedded.undertow.UndertowBuilderCustomizer; -import org.springframework.boot.context.embedded.undertow.UndertowEmbeddedServletContainerFactory; +import org.springframework.boot.web.server.ConfigurableEmbeddedServletContainer; +import org.springframework.boot.web.server.EmbeddedServletContainerCustomizer; +import org.springframework.boot.web.server.EmbeddedServletContainerFactory; +import org.springframework.boot.web.server.EmbeddedServletContainerInitializedEvent; +import org.springframework.boot.web.server.EmbeddedWebApplicationContext; +import org.springframework.boot.web.server.Ssl; +import org.springframework.boot.web.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer; +import org.springframework.boot.web.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.boot.web.embedded.undertow.UndertowBuilderCustomizer; +import org.springframework.boot.web.embedded.undertow.UndertowEmbeddedServletContainerFactory; import org.springframework.boot.context.event.ApplicationPreparedEvent; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.cloud.contract.wiremock.ContainerConfiguration.JettyContainerConfiguration; diff --git a/tests/pom.xml b/tests/pom.xml index 6a884f92fa..1858443d1d 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index 639656686e..6d99636ccb 100644 --- a/tests/samples-messaging-amqp/pom.xml +++ b/tests/samples-messaging-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index e3a7c84761..fb057d29b0 100644 --- a/tests/samples-messaging-camel/pom.xml +++ b/tests/samples-messaging-camel/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index da8a5d5105..e586adc71f 100644 --- a/tests/samples-messaging-integration/pom.xml +++ b/tests/samples-messaging-integration/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-spring/pom.xml b/tests/samples-messaging-spring/pom.xml index ca97018ebb..79a18e3fcd 100644 --- a/tests/samples-messaging-spring/pom.xml +++ b/tests/samples-messaging-spring/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-sample-spring diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index 36b724e1e6..9ad4fa8a07 100644 --- a/tests/samples-messaging-stream/pom.xml +++ b/tests/samples-messaging-stream/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-sample-stream diff --git a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml index 4d7b21e065..19e2e84ac2 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-amqp diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml index 8e15823ae7..9127d3ca37 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-boot-eureka diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml index fa92f9ed59..dc43e82d6d 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-boot-zookeeper diff --git a/tests/spring-cloud-contract-stub-runner-camel/pom.xml b/tests/spring-cloud-contract-stub-runner-camel/pom.xml index d392e84c37..0bacc75164 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-camel/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-camel diff --git a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml index 2aa9f7503a..fb29de0bb2 100644 --- a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-context-path diff --git a/tests/spring-cloud-contract-stub-runner-integration/pom.xml b/tests/spring-cloud-contract-stub-runner-integration/pom.xml index fa9e06b16b..9a4ca8712a 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-integration/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml index c44d535580..40a8270173 100644 --- a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-moco-contract-jar diff --git a/tests/spring-cloud-contract-stub-runner-moco/pom.xml b/tests/spring-cloud-contract-stub-runner-moco/pom.xml index 9940fd091b..536e2b67d4 100644 --- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-moco diff --git a/tests/spring-cloud-contract-stub-runner-stream/pom.xml b/tests/spring-cloud-contract-stub-runner-stream/pom.xml index 9f6c1762c9..3cd8813557 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-stream/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.1.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-stream