diff --git a/auth-core/src/main/resources/auth/db/changelog/db.changelog-master.yaml b/auth-core/src/main/resources/auth/db/changelog/db.changelog-master.yaml index 37850b8..b5fbf73 100644 --- a/auth-core/src/main/resources/auth/db/changelog/db.changelog-master.yaml +++ b/auth-core/src/main/resources/auth/db/changelog/db.changelog-master.yaml @@ -4,5 +4,4 @@ databaseChangeLog: author: touchin comment: initial change log - includeAll: - relativeToChangelogFile: true - path: core + path: classpath*:/auth/db/changelog/core diff --git a/build.gradle.kts b/build.gradle.kts index 08c607d..2331e72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -57,6 +57,8 @@ subprojects { dependency("org.junit.jupiter:junit-jupiter-params:5.4.2") dependency("org.junit.jupiter:junit-jupiter-engine:5.4.2") + dependency("org.liquibase:liquibase-core:4.4.0") + dependency("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0") dependency("org.mockito:mockito-inline:3.11.0") diff --git a/common-spring-jpa/src/main/kotlin/ru/touchin/common/spring/jpa/liquibase/LiquibaseStart.kt b/common-spring-jpa/src/main/kotlin/ru/touchin/common/spring/jpa/liquibase/LiquibaseStart.kt index ed0feb2..f4fbda1 100644 --- a/common-spring-jpa/src/main/kotlin/ru/touchin/common/spring/jpa/liquibase/LiquibaseStart.kt +++ b/common-spring-jpa/src/main/kotlin/ru/touchin/common/spring/jpa/liquibase/LiquibaseStart.kt @@ -7,7 +7,8 @@ import liquibase.Liquibase import liquibase.database.Database import liquibase.database.DatabaseFactory import liquibase.database.jvm.JdbcConnection -import liquibase.resource.ClassLoaderResourceAccessor +import liquibase.integration.spring.SpringResourceAccessor +import org.springframework.core.io.DefaultResourceLoader import org.springframework.stereotype.Component import ru.touchin.common.spring.annotations.RunOnceOnStartup import javax.sql.DataSource @@ -25,7 +26,9 @@ class LiquibaseStart( .findCorrectDatabaseImplementation(JdbcConnection(connection)) .apply { defaultSchemaName = liquibaseParams.schema } - val liquibase = Liquibase(liquibaseParams.changeLogPath, ClassLoaderResourceAccessor(), database) + val resourceAccessor = SpringResourceAccessor(DefaultResourceLoader()) + + val liquibase = Liquibase(liquibaseParams.changeLogPath, resourceAccessor, database) liquibase.update(Contexts()) }