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

Upgrade to Flyway 11.13.1 

Closes gh-47261
This commit is contained in:
Stéphane Nicoll 2025-09-18 03:27:19 +02:00
parent 6642bf7beb
commit 2e76cda4ba
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -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") 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") { group("org.flywaydb") {
modules = [ modules = [
"flyway-commandline", "flyway-commandline",