From a9d8befe7236ebbb91039000b1bf315b7fb8e4d0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 7 Jan 2022 14:52:44 +0100 Subject: [PATCH 1/2] Fix build failures See gh-29290 --- .../boot/autoconfigure/flyway/FlywayPropertiesTests.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java index 0d680ec619..996be24636 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java @@ -108,8 +108,7 @@ class FlywayPropertiesTests { Map configuration = indexProperties( PropertyAccessorFactory.forBeanPropertyAccess(new ClassicConfiguration())); // Properties specific settings - ignoreProperties(properties, "url", "driverClassName", "user", "password", "enabled", "checkLocation", - "createDataSource"); + ignoreProperties(properties, "url", "driverClassName", "user", "password", "enabled"); // Property that moved to a separate SQL plugin ignoreProperties(properties, "sqlServerKerberosLoginFile"); // High level object we can't set with properties From 7afae4aad943e98d442bd24811ede22be5497c9e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 7 Jan 2022 14:50:08 +0100 Subject: [PATCH 2/2] Start building against Reactor 2020.0.15 snapshots See gh-29280 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 212e4ebf31..8f5c11e590 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1415,7 +1415,7 @@ bom { ] } } - library("Reactor Bom", "2020.0.14") { + library("Reactor Bom", "2020.0.15-SNAPSHOT") { group("io.projectreactor") { imports = [ "reactor-bom"