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

Tolerate Flway 9.20 

Closes gh-36029
This commit is contained in:
Andy Wilkinson 2023-06-27 20:22:24 +01:00
parent 15d6858db9
commit 9e1f2c4257
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@ -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));

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

@ -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()