From 3a0f42969903936fd9d5e385a7d5738d85f2c86b Mon Sep 17 00:00:00 2001
From: Keith Gustafson <github@gustamove.com>
Date: Fri, 23 Aug 2019 09:08:48 -0700
Subject: [PATCH] Flyway bump (#55)

* Bump Flyway version to 6.0.0

* Enhance Flyway logging to list pending migrations before applying them
---
 .../java/com/techempower/gemini/data/FlywayMigrator.java   | 7 ++++++-
 pom.xml                                                    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gemini/src/main/java/com/techempower/gemini/data/FlywayMigrator.java b/gemini/src/main/java/com/techempower/gemini/data/FlywayMigrator.java
index 6db05baf..b6d3f9ee 100644
--- a/gemini/src/main/java/com/techempower/gemini/data/FlywayMigrator.java
+++ b/gemini/src/main/java/com/techempower/gemini/data/FlywayMigrator.java
@@ -97,7 +97,12 @@ public int migrate(DataSource dataSource)
   {
     if (flywayConfig != null)
     {
-      return flywayConfig.dataSource(dataSource).load().migrate();
+      Flyway f = flywayConfig.dataSource(dataSource).load();
+      for (MigrationInfo i : f.info().pending())
+      {
+        log.log("Pending migration: " + i.getScript());
+      }
+      return f.migrate();
     }
     log.log("Flyway not initialized. Skipping database migrations.");
     return 0;
diff --git a/pom.xml b/pom.xml
index 27d68bda..cfd0617e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
     <jms.version>2.0.1</jms.version>
     <hikaricp.version>3.3.1</hikaricp.version>
     <slf4j.version>1.8.0-beta4</slf4j.version>
-    <flyway.version>5.2.1</flyway.version>
+    <flyway.version>6.0.0</flyway.version>
   </properties>
 
   <scm>