From a35a6d4a28a6a494b5d9f2855109bc004bc943d8 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 5 Jan 2022 10:12:32 -0600
Subject: [PATCH] Upgrade to Flyway 8.2.x to support h2 v2

---
 dspace-api/pom.xml                                     |  2 +-
 .../storage/rdbms/EntityTypeServiceInitializer.java    | 10 ++++++++++
 .../dspace/storage/rdbms/GroupServiceInitializer.java  | 10 ++++++++++
 .../dspace/storage/rdbms/PostgreSQLCryptoChecker.java  | 10 ++++++++++
 .../java/org/dspace/storage/rdbms/RegistryUpdater.java | 10 ++++++++++
 .../dspace/storage/rdbms/SiteServiceInitializer.java   | 10 ++++++++++
 6 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index d3085ecdec..572b9f8cf3 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -762,7 +762,7 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>6.5.7</version>
+            <version>8.2.3</version>
         </dependency>
 
         <!-- Google Analytics -->
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/EntityTypeServiceInitializer.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/EntityTypeServiceInitializer.java
index ebf790900b..e0e41516d0 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/EntityTypeServiceInitializer.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/EntityTypeServiceInitializer.java
@@ -49,6 +49,16 @@ public class EntityTypeServiceInitializer implements Callback {
         }
     }
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return EntityTypeServiceInitializer.class.getSimpleName();
+    }
+
     @Override
     public boolean supports(Event event, org.flywaydb.core.api.callback.Context context) {
         // Must run AFTER all migrations complete, since it is dependent on Hibernate
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/GroupServiceInitializer.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/GroupServiceInitializer.java
index 7338dd75bc..54498a1c64 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/GroupServiceInitializer.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/GroupServiceInitializer.java
@@ -51,6 +51,16 @@ public class GroupServiceInitializer implements Callback {
 
     }
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return GroupServiceInitializer.class.getSimpleName();
+    }
+
     /**
      * Events supported by this callback.
      * @param event Flyway event
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgreSQLCryptoChecker.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgreSQLCryptoChecker.java
index 5798f4254c..5459cc3cc3 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgreSQLCryptoChecker.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgreSQLCryptoChecker.java
@@ -97,6 +97,16 @@ public class PostgreSQLCryptoChecker implements Callback {
         }
     }
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return PostgreSQLCryptoChecker.class.getSimpleName();
+    }
+
     /**
      * Events supported by this callback.
      * @param event Flyway event
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java
index ae8be0988a..c2a9b8a848 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java
@@ -101,6 +101,16 @@ public class RegistryUpdater implements Callback {
     }
 
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return RegistryUpdater.class.getSimpleName();
+    }
+
     /**
      * Events supported by this callback.
      * @param event Flyway event
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/SiteServiceInitializer.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/SiteServiceInitializer.java
index 26e76804e1..872a633146 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/SiteServiceInitializer.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/SiteServiceInitializer.java
@@ -73,6 +73,16 @@ public class SiteServiceInitializer implements Callback {
 
     }
 
+    /**
+     * The callback name, Flyway will use this to sort the callbacks alphabetically before executing them
+     * @return The callback name
+     */
+    @Override
+    public String getCallbackName() {
+        // Return class name only (not prepended by package)
+        return SiteServiceInitializer.class.getSimpleName();
+    }
+
     /**
      * Events supported by this callback.
      * @param event Flyway event