root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

This commit is contained in:
Stephane Nicoll 2022-01-07 15:40:59 +01:00
parent eba2c8c8fe 7afae4aad9
commit 9392ff59f7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java
View File

@ -108,8 +108,7 @@ class FlywayPropertiesTests {
Map<String, PropertyDescriptor> 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

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1096,7 +1096,7 @@ bom {
]
}
}
library("Reactor Bom", "2020.0.13") {
library("Reactor Bom", "2020.0.15-SNAPSHOT") {
group("io.projectreactor") {
imports = [
"reactor-bom"