Tolerate Flway 9.20

Closes gh-36029
spring-projects · Jun 27, 2023 · 9e1f2c4 · 9e1f2c4
1 parent 15d6858
commit 9e1f2c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.../src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/.../src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
@@ -224,7 +224,8 @@ private void configureProperties(FluentConfiguration configuration, FlywayProper
 			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));

diff --git a/...st/java/org/springframework/boot/autoconfigure/flyway/Flyway9xAutoConfigurationTests.java b/...st/java/org/springframework/boot/autoconfigure/flyway/Flyway9xAutoConfigurationTests.java
@@ -32,7 +32,8 @@
  *
  * @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()