Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Flyway 7.1.1

Browse Source 
Closes gh-23932
This commit is contained in:
Andy Wilkinson 2020-10-29 13:04:00 +00:00
parent 7b4d26138d
commit a8705d19e5
5 changed files with 24 additions and 1 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

@ -173,6 +173,9 @@ public class FlywayAutoConfiguration {
map.from(locations).to(configuration::locations);
map.from(properties.getEncoding()).to(configuration::encoding);
map.from(properties.getConnectRetries()).to(configuration::connectRetries);
// No method reference for compatibility with Flyway 6.x
map.from(properties.getLockRetryCount())
.to((lockRetryCount) -> configuration.lockRetryCount(lockRetryCount));
// No method reference for compatibility with Flyway 5.x
map.from(properties.getDefaultSchema()).to((schema) -> configuration.defaultSchema(schema));
map.from(properties.getSchemas()).as(StringUtils::toStringArray).to(configuration::schemas);

13
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
View File

@ -64,6 +64,11 @@ public class FlywayProperties {
*/
private int connectRetries;
/**
* Maximum number of retries when trying to obtain a lock.
*/
private Integer lockRetryCount;
/**
* Default schema name managed by Flyway (case-sensitive).
*/
@ -363,6 +368,14 @@ public class FlywayProperties {
this.connectRetries = connectRetries;
}
public Integer getLockRetryCount() {
return this.lockRetryCount;
}
public void setLockRetryCount(Integer lockRetryCount) {
this.lockRetryCount = lockRetryCount;
}
public String getDefaultSchema() {
return this.defaultSchema;
}

4
spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -856,6 +856,10 @@
"classpath:db/migration"
]
},
{
"name": "spring.flyway.lock-retry-count",
"defaultValue": 50
},
{
"name": "spring.flyway.sql-migration-suffix",
"type": "java.lang.String",

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

@ -51,6 +51,9 @@ class FlywayPropertiesTests {
.isEqualTo(configuration.getLocations());
assertThat(properties.getEncoding()).isEqualTo(configuration.getEncoding());
assertThat(properties.getConnectRetries()).isEqualTo(configuration.getConnectRetries());
// Can't assert lock retry count default as it is new in Flyway 7.1
// Asserting hard-coded value in the metadata instead
assertThat(configuration.getLockRetryCount()).isEqualTo(50);
assertThat(properties.getDefaultSchema()).isEqualTo(configuration.getDefaultSchema());
assertThat(properties.getSchemas()).isEqualTo(Arrays.asList(configuration.getSchemas()));
assertThat(properties.isCreateSchemas()).isEqualTo(configuration.getCreateSchemas());

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

@ -304,7 +304,7 @@ bom {
]
}
}
library("Flyway", "7.0.4") {
library("Flyway", "7.1.1") {
group("org.flywaydb") {
modules = [
"flyway-core"