From 8784d29a44225a746af1b571bbc2edf24a097dbd Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 5 Jan 2022 16:20:27 +0100
Subject: [PATCH] Upgraded Flywaydb to latest version

---
 pom.xml                                                     | 2 +-
 .../java/no/nibio/vips/logic/startup/StartupListener.java   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f55fad85..b36fc3af 100755
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>4.2.0</version>
+            <version>8.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
diff --git a/src/main/java/no/nibio/vips/logic/startup/StartupListener.java b/src/main/java/no/nibio/vips/logic/startup/StartupListener.java
index 334f052c..867b1309 100755
--- a/src/main/java/no/nibio/vips/logic/startup/StartupListener.java
+++ b/src/main/java/no/nibio/vips/logic/startup/StartupListener.java
@@ -51,8 +51,10 @@ public class StartupListener implements javax.servlet.ServletContextListener{
         System.out.println("VIPSLogic system initializing");
         System.out.println("VIPSLogic checking for database migrations");
         // Migrate DB on startup using flywaydb.org
-        Flyway flyway = new Flyway();
-        flyway.setDataSource(vipslogicDS);
+        Flyway flyway = Flyway.configure()
+                .table("schema_version") // This was done to ease the upgrade from v4 to v8 - which has "flyway_schema_history" as default name for this table
+                .dataSource(vipslogicDS)
+                .load();
         flyway.migrate();
         
         schedulingBean.initSystemScheduler();
-- 
GitLab