From 4fcd95c5f6653b167a38a0876148c9af8409d3d9 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 4 Nov 2020 11:28:34 +0100 Subject: [PATCH] Migrating to Boot 2.4.0-RC1 --- docker/spring-cloud-contract-docker/project/gradle.properties | 2 +- guides/gs-contract-rest/complete/contract-rest-client/pom.xml | 2 +- guides/gs-contract-rest/complete/contract-rest-service/pom.xml | 2 +- guides/gs-contract-rest/initial/contract-rest-client/pom.xml | 2 +- guides/gs-contract-rest/initial/contract-rest-service/pom.xml | 2 +- samples/wiremock-jetty/pom.xml | 2 +- samples/wiremock-native/pom.xml | 2 +- samples/wiremock-tomcat/pom.xml | 2 +- samples/wiremock-undertow-ssl/pom.xml | 2 +- samples/wiremock-undertow/pom.xml | 2 +- samples/wiremock/pom.xml | 2 +- .../StubRunnerSpringCloudConsulAutoConfigurationSpec.groovy | 3 ++- .../resources/functionalTest/scenarioProject/gradle.properties | 2 +- .../functionalTest/scenarioProjectKotlin/gradle.properties | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) diff --git a/docker/spring-cloud-contract-docker/project/gradle.properties b/docker/spring-cloud-contract-docker/project/gradle.properties index 0528f1de19..24309a6bd2 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false verifierVersion=3.0.0-SNAPSHOT -springBootVersion=2.4.0-M4 +springBootVersion=2.4.0-RC1 camelVersion=3.4.3 \ No newline at end of file diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index 619d24d854..530170a7c2 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index 74d62f0e3b..6f16569734 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index b2a414471a..b514c9788e 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 546ecfe04e..8902e156f0 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index 1b190e737d..7af24ed55f 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index 3482c18a5c..f262d232ff 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index a2ed22870f..f217bfb099 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index f109c14911..e0284e6115 100644 --- a/samples/wiremock-undertow-ssl/pom.xml +++ b/samples/wiremock-undertow-ssl/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index fbaecadab4..7473244383 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index 9b8696cc3c..9c478cb888 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-M4 + 2.4.0-RC1 diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/consul/StubRunnerSpringCloudConsulAutoConfigurationSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/consul/StubRunnerSpringCloudConsulAutoConfigurationSpec.groovy index 4c43e92c54..69a29b3a92 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/consul/StubRunnerSpringCloudConsulAutoConfigurationSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/consul/StubRunnerSpringCloudConsulAutoConfigurationSpec.groovy @@ -25,6 +25,7 @@ import spock.lang.Specification import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.EnableAutoConfiguration +import org.springframework.boot.test.autoconfigure.web.reactive.WebTestClientAutoConfiguration import org.springframework.boot.test.context.SpringBootContextLoader import org.springframework.boot.test.context.SpringBootTest import org.springframework.cloud.client.discovery.EnableDiscoveryClient @@ -99,7 +100,7 @@ class StubRunnerSpringCloudConsulAutoConfigurationSpec extends Specification { } @Configuration - @EnableAutoConfiguration + @EnableAutoConfiguration(exclude = WebTestClientAutoConfiguration) @EnableDiscoveryClient static class Config { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties index e51db474ae..7acf4115ca 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties @@ -16,5 +16,5 @@ wiremockVersion=2.27.0 jsonAssertVersion=0.4.13 verifierVersion=3.0.0-SNAPSHOT -bootVersion=2.4.0-M4 +bootVersion=2.4.0-RC1 groovyVersion=2.4.17 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index e51db474ae..7acf4115ca 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -16,5 +16,5 @@ wiremockVersion=2.27.0 jsonAssertVersion=0.4.13 verifierVersion=3.0.0-SNAPSHOT -bootVersion=2.4.0-M4 +bootVersion=2.4.0-RC1 groovyVersion=2.4.17