From 154dabad756d2d5491e2579267ed00ea4d1b4ea0 Mon Sep 17 00:00:00 2001 From: Asher Feldman Date: Wed, 11 Sep 2019 13:25:36 -0700 Subject: [PATCH] fix(queue/sql): fix clash between orca/keiko changelogs (#3140) --- gradle.properties | 2 +- .../com/netflix/spinnaker/orca/sql/SpringLiquibaseProxy.kt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d4fa685398..fcf0963a4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ enablePublishing=false korkVersion=6.7.1 spinnakerGradleVersion=7.0.1 org.gradle.parallel=true -keikoVersion=2.13.0 +keikoVersion=2.13.1 diff --git a/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SpringLiquibaseProxy.kt b/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SpringLiquibaseProxy.kt index fd2bd694a1..a8295bdafb 100644 --- a/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SpringLiquibaseProxy.kt +++ b/orca-sql/src/main/kotlin/com/netflix/spinnaker/orca/sql/SpringLiquibaseProxy.kt @@ -49,6 +49,12 @@ class SpringLiquibaseProxy( // First do the OSS migrations super.afterPropertiesSet() + SpringLiquibase().apply { + changeLog = "classpath:db/changelog-keiko.yml" + dataSource = createDataSource() + resourceLoader = this@SpringLiquibaseProxy.resourceLoader + }.afterPropertiesSet() + // Then if anything else has been defined, do that afterwards sqlProperties.migration.additionalChangeLogs .filter { !it.isEmpty() }