Migrating to Boot 2.4.0-RC1

2020-11-04 11:28:34 +01:00
parent cebcd37648
commit 4fcd95c5f6
14 changed files with 15 additions and 14 deletions
--- 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
--- 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

--- 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- 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 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

--- a/samples/wiremock-jetty/pom.xml
+++ b/samples/wiremock-jetty/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- a/samples/wiremock-native/pom.xml
+++ b/samples/wiremock-native/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- a/samples/wiremock-tomcat/pom.xml
+++ b/samples/wiremock-tomcat/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- a/samples/wiremock-undertow-ssl/pom.xml
+++ b/samples/wiremock-undertow-ssl/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- a/samples/wiremock-undertow/pom.xml
+++ b/samples/wiremock-undertow/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- a/samples/wiremock/pom.xml
+++ b/samples/wiremock/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

--- 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 {

--- 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
--- 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