Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Flyway 7.5

Browse Source 
Closes gh-24953
This commit is contained in:
Andy Wilkinson
2021-01-21 12:09:07 +00:00
parent d15ec4cdb4
commit 4135e3c061
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -231,10 +231,10 @@ public class FlywayAutoConfiguration {
.to((jdbcProperties) -> configuration.jdbcProperties(jdbcProperties));
// No method reference for compatibility with Flyway 6.x
map.from(properties.getOracleKerberosCacheFile()).whenNonNull()
.to((cacheFile) -> configuration.orackeKerberosCacheFile(cacheFile));
.to((cacheFile) -> configuration.oracleKerberosCacheFile(cacheFile));
// No method reference for compatibility with Flyway 6.x
map.from(properties.getOracleKerberosConfigFile()).whenNonNull()
.to((configFile) -> configuration.orackeKerberosConfigFile(configFile));
.to((configFile) -> configuration.oracleKerberosConfigFile(configFile));
// No method reference for compatibility with Flyway 6.x
map.from(properties.getOutputQueryResults()).whenNonNull()
.to((outputQueryResults) -> configuration.outputQueryResults(outputQueryResults));

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -100,7 +100,6 @@ class FlywayPropertiesTests {
PropertyAccessorFactory.forBeanPropertyAccess(new ClassicConfiguration()));
// Properties specific settings
ignoreProperties(properties, "url", "user", "password", "enabled", "checkLocation", "createDataSource");
// High level object we can't set with properties
ignoreProperties(configuration, "callbacks", "classLoader", "dataSource", "javaMigrations",
"javaMigrationClassProvider", "resourceProvider", "resolvers");
@@ -109,6 +108,9 @@ class FlywayPropertiesTests {
// Handled by the conversion service
ignoreProperties(configuration, "baselineVersionAsString", "encodingAsString", "locationsAsStrings",
"targetAsString");
// Teams-only properties that we cannot detect as no exception is thrown and
// getters return null
ignoreProperties(configuration, "conjurToken", "conjurUrl", "vaultSecret", "vaultToken", "vaultUrl");
// Handled as initSql array
ignoreProperties(configuration, "initSql");
ignoreProperties(properties, "initSqls");

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

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