mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Upgrade to Flyway 7.7.0
Closes gh-25660
This commit is contained in:
parent
2006444b71
commit
4a75798acc
@ -231,8 +231,6 @@ public class FlywayAutoConfiguration {
|
||||
.to((skipExecutingMigrations) -> configuration.skipExecutingMigrations(skipExecutingMigrations));
|
||||
// Teams secrets management properties (all non-method reference for
|
||||
// compatibility with Flyway 6.x)
|
||||
map.from(properties.getConjurUrl()).to((conjurUrl) -> configuration.conjurUrl(conjurUrl));
|
||||
map.from(properties.getConjurToken()).to((conjurToken) -> configuration.conjurToken(conjurToken));
|
||||
map.from(properties.getVaultUrl()).to((vaultUrl) -> configuration.vaultUrl(vaultUrl));
|
||||
map.from(properties.getVaultToken()).to((vaultToken) -> configuration.vaultToken(vaultToken));
|
||||
map.from(properties.getVaultSecrets()).whenNot(List::isEmpty)
|
||||
|
@ -332,16 +332,6 @@ public class FlywayProperties {
|
||||
*/
|
||||
private Boolean skipExecutingMigrations;
|
||||
|
||||
/**
|
||||
* REST API URL of the Conjur server. Requires Flyway teams.
|
||||
*/
|
||||
private String conjurUrl;
|
||||
|
||||
/**
|
||||
* Conjur token required to access secrets. Requires Flyway teams.
|
||||
*/
|
||||
private String conjurToken;
|
||||
|
||||
/**
|
||||
* REST API URL of the Vault server. Requires Flyway teams.
|
||||
*/
|
||||
@ -808,22 +798,6 @@ public class FlywayProperties {
|
||||
this.skipExecutingMigrations = skipExecutingMigrations;
|
||||
}
|
||||
|
||||
public String getConjurUrl() {
|
||||
return this.conjurUrl;
|
||||
}
|
||||
|
||||
public void setConjurUrl(String conjurUrl) {
|
||||
this.conjurUrl = conjurUrl;
|
||||
}
|
||||
|
||||
public String getConjurToken() {
|
||||
return this.conjurToken;
|
||||
}
|
||||
|
||||
public void setConjurToken(String conjurToken) {
|
||||
this.conjurToken = conjurToken;
|
||||
}
|
||||
|
||||
public String getVaultUrl() {
|
||||
return this.vaultUrl;
|
||||
}
|
||||
|
@ -537,20 +537,6 @@ class FlywayAutoConfigurationTests {
|
||||
.run(validateFlywayTeamsPropertyOnly("skipExecutingMigrations"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void conjurUrlIsCorrectlyMapped() {
|
||||
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
|
||||
.withPropertyValues("spring.flyway.conjur-url=http://foo.com/secrets")
|
||||
.run(validateFlywayTeamsPropertyOnly("conjurUrl"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void conjurTokenIsCorrectlyMapped() {
|
||||
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
|
||||
.withPropertyValues("spring.flyway.conjur-token=5150")
|
||||
.run(validateFlywayTeamsPropertyOnly("conjurToken"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void vaultUrlIsCorrectlyMapped() {
|
||||
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
|
||||
|
@ -306,7 +306,7 @@ bom {
|
||||
]
|
||||
}
|
||||
}
|
||||
library("Flyway", "7.5.3") {
|
||||
library("Flyway", "7.7.0") {
|
||||
group("org.flywaydb") {
|
||||
modules = [
|
||||
"flyway-core"
|
||||
|
Loading…
Reference in New Issue
Block a user