parent
3d336f9204
commit
454aae92d6
|
@ -288,7 +288,7 @@ public class FlywayAutoConfiguration {
|
||||||
SQLServerConfigurationExtension sqlServerConfigurationExtension = configuration.getPluginRegister()
|
SQLServerConfigurationExtension sqlServerConfigurationExtension = configuration.getPluginRegister()
|
||||||
.getPlugin(SQLServerConfigurationExtension.class);
|
.getPlugin(SQLServerConfigurationExtension.class);
|
||||||
Assert.state(sqlServerConfigurationExtension != null, "Flyway SQL Server extension missing");
|
Assert.state(sqlServerConfigurationExtension != null, "Flyway SQL Server extension missing");
|
||||||
sqlServerConfigurationExtension.setKerberosLoginFile(sqlServerKerberosLoginFile);
|
sqlServerConfigurationExtension.getKerberos().getLogin().setFile(sqlServerKerberosLoginFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void configureCallbacks(FluentConfiguration configuration, List<Callback> callbacks) {
|
private void configureCallbacks(FluentConfiguration configuration, List<Callback> callbacks) {
|
||||||
|
|
|
@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test;
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
||||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||||
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
|
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
|
||||||
|
import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
|
||||||
import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
|
import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
@ -34,6 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||||
*
|
*
|
||||||
* @author Andy Wilkinson
|
* @author Andy Wilkinson
|
||||||
*/
|
*/
|
||||||
|
@ClassPathExclusions("flyway-*.jar")
|
||||||
@ClassPathOverrides("org.flywaydb:flyway-core:9.0.4")
|
@ClassPathOverrides("org.flywaydb:flyway-core:9.0.4")
|
||||||
class Flyway90AutoConfigurationTests {
|
class Flyway90AutoConfigurationTests {
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ import org.flywaydb.core.api.callback.Context;
|
||||||
import org.flywaydb.core.api.callback.Event;
|
import org.flywaydb.core.api.callback.Event;
|
||||||
import org.flywaydb.core.api.migration.JavaMigration;
|
import org.flywaydb.core.api.migration.JavaMigration;
|
||||||
import org.flywaydb.core.internal.license.FlywayTeamsUpgradeRequiredException;
|
import org.flywaydb.core.internal.license.FlywayTeamsUpgradeRequiredException;
|
||||||
|
import org.flywaydb.database.sqlserver.SQLServerConfigurationExtension;
|
||||||
import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
|
import org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform;
|
||||||
import org.jooq.DSLContext;
|
import org.jooq.DSLContext;
|
||||||
import org.jooq.SQLDialect;
|
import org.jooq.SQLDialect;
|
||||||
|
@ -700,7 +701,15 @@ class FlywayAutoConfigurationTests {
|
||||||
void sqlServerKerberosLoginFileIsCorrectlyMapped() {
|
void sqlServerKerberosLoginFileIsCorrectlyMapped() {
|
||||||
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
|
this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
|
||||||
.withPropertyValues("spring.flyway.sql-server-kerberos-login-file=/tmp/config")
|
.withPropertyValues("spring.flyway.sql-server-kerberos-login-file=/tmp/config")
|
||||||
.run(validateFlywayTeamsPropertyOnly("sqlserver.kerberos.login.file"));
|
.run((context) -> {
|
||||||
|
assertThat(context.getBean(Flyway.class)
|
||||||
|
.getConfiguration()
|
||||||
|
.getPluginRegister()
|
||||||
|
.getPlugin(SQLServerConfigurationExtension.class)
|
||||||
|
.getKerberos()
|
||||||
|
.getLogin()
|
||||||
|
.getFile()).isEqualTo("/tmp/config");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -116,7 +116,7 @@ class FlywayPropertiesTests {
|
||||||
"javaMigrationClassProvider", "pluginRegister", "resourceProvider", "resolvers");
|
"javaMigrationClassProvider", "pluginRegister", "resourceProvider", "resolvers");
|
||||||
// Properties we don't want to expose
|
// Properties we don't want to expose
|
||||||
ignoreProperties(configuration, "resolversAsClassNames", "callbacksAsClassNames", "driver", "modernConfig",
|
ignoreProperties(configuration, "resolversAsClassNames", "callbacksAsClassNames", "driver", "modernConfig",
|
||||||
"currentResolvedEnvironment", "reportFilename");
|
"currentResolvedEnvironment", "reportFilename", "reportEnabled");
|
||||||
// Handled by the conversion service
|
// Handled by the conversion service
|
||||||
ignoreProperties(configuration, "baselineVersionAsString", "encodingAsString", "locationsAsStrings",
|
ignoreProperties(configuration, "baselineVersionAsString", "encodingAsString", "locationsAsStrings",
|
||||||
"targetAsString");
|
"targetAsString");
|
||||||
|
|
|
@ -279,7 +279,7 @@ bom {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
library("Flyway", "9.16.3") {
|
library("Flyway", "9.19.4") {
|
||||||
group("org.flywaydb") {
|
group("org.flywaydb") {
|
||||||
modules = [
|
modules = [
|
||||||
"flyway-core",
|
"flyway-core",
|
||||||
|
|
Loading…
Reference in New Issue