mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Tolerate Flway 9.20
Closes gh-36029
This commit is contained in:
parent
15d6858db9
commit
9e1f2c4257
@ -224,7 +224,8 @@ public class FlywayAutoConfiguration {
|
||||
map.from(properties.getDryRunOutput()).to(configuration::dryRunOutput);
|
||||
map.from(properties.getErrorOverrides()).to(configuration::errorOverrides);
|
||||
map.from(properties.getLicenseKey()).to(configuration::licenseKey);
|
||||
map.from(properties.getOracleSqlplus()).to(configuration::oracleSqlplus);
|
||||
// No method reference for compatibility with Flyway 9.20+
|
||||
map.from(properties.getOracleSqlplus()).to((oracleSqlplus) -> configuration.oracleSqlplus(oracleSqlplus));
|
||||
// No method reference for compatibility with Flyway 5.x
|
||||
map.from(properties.getOracleSqlplusWarn())
|
||||
.to((oracleSqlplusWarn) -> configuration.oracleSqlplusWarn(oracleSqlplusWarn));
|
||||
|
@ -32,7 +32,8 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
*
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
@ClassPathOverrides({ "org.flywaydb:flyway-core:9.1.2", "com.h2database:h2:2.1.210" })
|
||||
@ClassPathOverrides({ "org.flywaydb:flyway-core:9.20.0", "org.flywaydb:flyway-sqlserver:9.20.0",
|
||||
"com.h2database:h2:2.1.210" })
|
||||
class Flyway9xAutoConfigurationTests {
|
||||
|
||||
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
|
||||
|
Loading…
Reference in New Issue
Block a user