Upgrade Flywaydb to v7.6.0

Signed-off-by: Dakshin Karthikeyan <[email protected]>
MarquezProject · May 1, 2022 · caee583 · caee583
1 parent 546de17
commit caee583
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@
 * Enable pod specific annotations in Marquez Helm Chart via `marquez.podAnnotations` [@wslulciuc](https://github.com/wslulciuc)
 * Add support for job renaming/redirection via symlink [@collado-mike](https://github.com/collado-mike)
 
+### Changed
+
+* Upgrade Flyway to v7.6.0 [@dakshin-k](https://github.com/dakshin-k)
+
 ## [0.21.0](https://github.com/MarquezProject/marquez/compare/0.20.0...0.21.0) - 2022-03-03
 
 ### Added

diff --git a/api/build.gradle b/api/build.gradle
@@ -45,7 +45,7 @@ dependencies {
  implementation 'com.google.guava:guava:31.1-jre'
  implementation 'org.dhatim:dropwizard-sentry:2.0.29'
  implementation "io.sentry:sentry:${sentryVersion}"
- implementation 'org.flywaydb:flyway-core:6.5.7'
+ implementation 'org.flywaydb:flyway-core:7.6.0'
  implementation "org.postgresql:postgresql:${postgresqlVersion}"
  implementation 'com.graphql-java:graphql-java:18.0'
  implementation 'com.graphql-java-kickstart:graphql-java-servlet:12.0.0'

diff --git a/api/src/main/java/marquez/db/DbMigration.java b/api/src/main/java/marquez/db/DbMigration.java
@@ -7,6 +7,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.FlywayException;
+import org.flywaydb.core.api.output.MigrateResult;
 
 @Slf4j
 public final class DbMigration {
@@ -31,8 +32,8 @@ public static void migrateDbOrError(
  // issues before app termination.
  try {
  log.info("Migrating database...");
- final int migrations = flyway.migrate();
- log.info("Successfully applied '{}' migrations to database.", migrations);
+ final MigrateResult migrateResult = flyway.migrate();
+ log.info("Successfully applied '{}' migrations to database.", migrateResult.migrationsExecuted);
  } catch (FlywayException errorOnDbMigrate) {
  log.error("Failed to apply migration to database.", errorOnDbMigrate);
  try {