Browse Source

Upgrade to Flyway 11.13.1

Closes gh-47261
pull/47268/head
Stéphane Nicoll 3 months ago
parent
commit
2e76cda4ba
  1. 2
      module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfiguration.java
  2. 12
      module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigurationTests.java
  3. 2
      platform/spring-boot-dependencies/build.gradle

2
module/spring-boot-flyway/src/main/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfiguration.java

@ -584,7 +584,7 @@ public final class FlywayAutoConfiguration { @@ -584,7 +584,7 @@ public final class FlywayAutoConfiguration {
Extension(FluentConfiguration configuration, Class<E> type, String name) {
this.extension = SingletonSupplier.of(() -> {
E extension = configuration.getPluginRegister().getPlugin(type);
E extension = configuration.getPluginRegister().getExact(type);
Assert.state(extension != null, () -> "Flyway %s extension missing".formatted(name));
return extension;
});

12
module/spring-boot-flyway/src/test/java/org/springframework/boot/flyway/autoconfigure/FlywayAutoConfigurationTests.java

@ -651,7 +651,7 @@ class FlywayAutoConfigurationTests { @@ -651,7 +651,7 @@ class FlywayAutoConfigurationTests {
.run((context) -> assertThat(context.getBean(Flyway.class)
.getConfiguration()
.getPluginRegister()
.getPlugin(OracleConfigurationExtension.class)
.getExact(OracleConfigurationExtension.class)
.getSqlplus()).isTrue());
}
@ -663,7 +663,7 @@ class FlywayAutoConfigurationTests { @@ -663,7 +663,7 @@ class FlywayAutoConfigurationTests {
.run((context) -> assertThat(context.getBean(Flyway.class)
.getConfiguration()
.getPluginRegister()
.getPlugin(OracleConfigurationExtension.class)
.getExact(OracleConfigurationExtension.class)
.getSqlplusWarn()).isTrue());
}
@ -674,7 +674,7 @@ class FlywayAutoConfigurationTests { @@ -674,7 +674,7 @@ class FlywayAutoConfigurationTests {
.run((context) -> assertThat(context.getBean(Flyway.class)
.getConfiguration()
.getPluginRegister()
.getPlugin(OracleConfigurationExtension.class)
.getExact(OracleConfigurationExtension.class)
.getWalletLocation()).isEqualTo("/tmp/my.wallet"));
}
@ -685,7 +685,7 @@ class FlywayAutoConfigurationTests { @@ -685,7 +685,7 @@ class FlywayAutoConfigurationTests {
.run((context) -> assertThat(context.getBean(Flyway.class)
.getConfiguration()
.getPluginRegister()
.getPlugin(OracleConfigurationExtension.class)
.getExact(OracleConfigurationExtension.class)
.getKerberosCacheFile()).isEqualTo("/tmp/cache"));
}
@ -783,7 +783,7 @@ class FlywayAutoConfigurationTests { @@ -783,7 +783,7 @@ class FlywayAutoConfigurationTests {
.run((context) -> assertThat(context.getBean(Flyway.class)
.getConfiguration()
.getPluginRegister()
.getPlugin(PostgreSQLConfigurationExtension.class)
.getExact(PostgreSQLConfigurationExtension.class)
.isTransactionalLock()).isFalse());
}
@ -801,7 +801,7 @@ class FlywayAutoConfigurationTests { @@ -801,7 +801,7 @@ class FlywayAutoConfigurationTests {
.run((context) -> assertThat(context.getBean(Flyway.class)
.getConfiguration()
.getPluginRegister()
.getPlugin(SQLServerConfigurationExtension.class)
.getExact(SQLServerConfigurationExtension.class)
.getKerberos()
.getLogin()
.getFile()).isEqualTo("/tmp/config"));

2
platform/spring-boot-dependencies/build.gradle

@ -375,7 +375,7 @@ bom { @@ -375,7 +375,7 @@ bom {
javadoc("elasticsearch-java", version -> "https://javadoc.io/doc/co.elastic.clients/elasticsearch-java/%s/index.html".formatted(version), "co.elastic.clients.elasticsearch", "co.elastic.clients.transport")
}
}
library("Flyway", "11.13.0") {
library("Flyway", "11.13.1") {
group("org.flywaydb") {
modules = [
"flyway-commandline",

Loading…
Cancel
Save