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

Merge branch '2.5.x' into 2.6.x

This commit is contained in:
Stephane Nicoll 2022-03-31 12:44:52 +02:00
parent 57f11696eb 17936b855c
commit 546a7e5edb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -111,8 +111,8 @@ class FlywayPropertiesTests {
ignoreProperties(properties, "url", "driverClassName", "user", "password", "enabled", "checkLocation", ignoreProperties(properties, "url", "driverClassName", "user", "password", "enabled", "checkLocation",
"createDataSource"); "createDataSource");
// High level object we can't set with properties // High level object we can't set with properties
ignoreProperties(configuration, "callbacks", "classLoader", "dataSource", "javaMigrations", ignoreProperties(configuration, "callbacks", "dataSource", "javaMigrations", "javaMigrationClassProvider",
"javaMigrationClassProvider", "resourceProvider", "resolvers"); "resourceProvider", "resolvers");
// Properties we don't want to expose // Properties we don't want to expose
ignoreProperties(configuration, "resolversAsClassNames", "callbacksAsClassNames", "loggers", "driver"); ignoreProperties(configuration, "resolversAsClassNames", "callbacksAsClassNames", "loggers", "driver");
// Handled by the conversion service // Handled by the conversion service