Merge pull request #145 from navikt/flyway

Flyway 9.21.0
navikt · Jul 26, 2023 · 583e180 · 583e180
2 parents eba85f2 + 9110f74
commit 583e180
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
-val flywayVersion = "9.18.0" // Nyere versjoner støtter ikke Oracle 19.1?
+val flywayVersion = "9.21.0"
 val h2Version = "2.2.220"
 val jacksonVersion = "2.15.2"
 val kotlinLoggerVersion = "3.0.5"
@@ -91,6 +91,7 @@ dependencies {
     implementation("no.nav.security:token-validation-ktor-v2:$tokenValidationVersion")
     implementation("com.github.navikt.tjenestespesifikasjoner:arena-sakogaktivitet_v1:$tjenestespecVersion")
     implementation("org.flywaydb:flyway-core:$flywayVersion")
+    implementation("org.flywaydb:flyway-database-oracle:$flywayVersion")
     implementation("org.postgresql:postgresql:$postgresVersion")
     implementation("org.webjars:swagger-ui:$swaggerVersion")
     implementation("no.nav:vault-jdbc:$vaultJdbcVersion")

diff --git a/src/main/kotlin/no/nav/meldeplikt/meldekortservice/config/Flyway.kt b/src/main/kotlin/no/nav/meldeplikt/meldekortservice/config/Flyway.kt
@@ -17,7 +17,7 @@ object Flyway {
     }
 
     fun configure(dataSource: DataSource): FluentConfiguration {
-        val configBuilder = Flyway.configure()
+        val configBuilder = Flyway.configure(this.javaClass.classLoader)
         configBuilder.dataSource(dataSource)
 
         val commonMigrationFiles = "classpath:db/migration/common"