Merge pull request #207 from conductor-oss/flyway_upgrade

Upgrade flyway
conductor-oss · Jul 13, 2024 · abce46e · abce46e
2 parents 3a43cc6 + 29ec813
commit abce46e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -83,7 +83,7 @@ allprojects {
         implementation('org.apache.logging.log4j:log4j-slf4j-impl')
         implementation('org.apache.logging.log4j:log4j-jul')
         implementation('org.apache.logging.log4j:log4j-web')
-
+        implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
         compileOnly 'org.projectlombok:lombok:1.18.34'
 
         annotationProcessor 'org.projectlombok:lombok:1.18.34'

diff --git a/common/build.gradle b/common/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'org.springframework.boot:spring-boot-starter'
     compileOnly 'org.springframework.boot:spring-boot-starter-validation'
 
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}"
+    compileOnly "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}"
 
     implementation "org.apache.commons:commons-lang3"
 
@@ -23,6 +23,7 @@ dependencies {
     implementation "com.fasterxml.jackson.module:jackson-module-afterburner:${revFasterXml}"
 
     testImplementation 'org.springframework.boot:spring-boot-starter-validation'
+    testImplementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}"
 }
 
 /*

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -68,6 +68,6 @@ ext {
     revNatsStreaming = '2.6.5'
     revNats = '2.16.14'
     revStan = '2.2.3'
-    revFlyway = '9.0.4'
+    revFlyway = '10.15.2'
 
 }
diff --git a/mysql-persistence/build.gradle b/mysql-persistence/build.gradle
@@ -16,7 +16,7 @@ dependencies {
 
     implementation "mysql:mysql-connector-java:8.0.33"
     implementation "org.springframework.boot:spring-boot-starter-jdbc"
-    implementation "org.flywaydb:flyway-mysql"
+    implementation "org.flywaydb:flyway-mysql:${revFlyway}"
 
     testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
 

diff --git a/postgres-external-storage/build.gradle b/postgres-external-storage/build.gradle
@@ -8,6 +8,8 @@ dependencies {
     implementation "org.postgresql:postgresql:${revPostgres}"
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation "org.flywaydb:flyway-core:${revFlyway}"
+    implementation "org.flywaydb:flyway-database-postgresql:${revFlyway}"
+
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${revSpringDoc}"
     implementation "commons-codec:commons-codec:${revCodec}"
 

diff --git a/postgres-persistence/build.gradle b/postgres-persistence/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     implementation "org.postgresql:postgresql:${revPostgres}"
     implementation "org.springframework.boot:spring-boot-starter-jdbc"
     implementation "org.flywaydb:flyway-core:${revFlyway}"
+    implementation "org.flywaydb:flyway-database-postgresql:${revFlyway}"
 
     testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
     testImplementation project(':conductor-server')

diff --git a/...ersistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java b/...ersistence/src/main/java/com/netflix/conductor/postgres/config/PostgresConfiguration.java
@@ -65,7 +65,7 @@ public Flyway flywayForPrimaryDb() {
             config.locations("classpath:db/migration_postgres");
         }
 
-        return config.configuration(Map.of())
+        return config.configuration(Map.of("flyway.postgresql.transactional.lock", "false"))
                 .schemas(properties.getSchema())
                 .dataSource(dataSource)
                 .outOfOrder(true)