#5 upgrade to flyway 5.0.7 with forward compatibility for flyway 5.1.x

Author: tomix26

build.gradle

@@ -1,5 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 import java.util.regex.Matcher
 
 plugins {
@@ -11,10 +10,12 @@ ext {
     ossrhUsername = project.findProperty('ossrh.username')
     ossrhPassword = project.findProperty('ossrh.password')
 
-    flywayCoreVersions = ['3.0', '3.1', '3.2.1', '4.0.3', '4.1.2']
-    flywayTestExtensionsVersions = ['3.0.1', '3.1', '3.2.1.1', '4.0.1', '4.1.0']
+    flywayCoreVersions = ['3.0', '3.1', '3.2.1', '4.0.3', '4.1.2', '4.2.0', '5.0.7']
+    flywayTestExtensionsVersions = ['3.0.1', '3.1', '3.2.1.1', '4.0.1', '4.1.0', '4.2.0.2', '5.0.0']
     embeddedPostgresVersions = ['9.3.23', '9.4.18', '9.5.13', '9.6.9', '10.4.0']
 
+    flywayCoreVersion = flywayCoreVersions.last()
+    flywayTestVersion = flywayTestExtensionsVersions.last()
     postgresVersion = embeddedPostgresVersions.last()
 }
 
@@ -143,7 +144,8 @@ project(':embedded-database-spring-test') {
         compile project(':embedded-database-spring-test-autoconfigure')
         compile 'org.springframework:spring-context:4.3.10.RELEASE'
         compile 'org.springframework:spring-test:4.3.10.RELEASE'
-        compile 'org.flywaydb.flyway-test-extensions:flyway-spring-test:4.2.0.2'
+        compile "org.flywaydb:flyway-core:$flywayCoreVersion"
+        compile "org.flywaydb.flyway-test-extensions:flyway-spring-test:$flywayTestVersion"
         compile 'com.google.guava:guava:23.0'
         compile 'org.tukaani:xz:1.8'
 
@@ -191,7 +193,7 @@ project(':embedded-database-spring-test') {
     }
 
     configurations {
-        for (version in flywayCoreVersions) {
+        flywayCoreVersions.init().each { version ->
             "testRuntimeWithFlywayCore$version" {
                 extendsFrom testRuntime
                 resolutionStrategy {
@@ -204,7 +206,7 @@ project(':embedded-database-spring-test') {
             }
         }
 
-        for (version in flywayTestExtensionsVersions) {
+        flywayTestExtensionsVersions.init().each { version ->
             "testRuntimeWithFlywayTestExtensions$version" {
                 extendsFrom testRuntime
                 resolutionStrategy {
@@ -231,7 +233,7 @@ project(':embedded-database-spring-test') {
         }
     }
 
-    for (version in flywayCoreVersions) {
+    flywayCoreVersions.init().each { version ->
         task "testWithFlywayCore$version"(type: Test) {
             dependsOn jar
 
@@ -246,7 +248,7 @@ project(':embedded-database-spring-test') {
         check.dependsOn("testWithFlywayCore$version")
     }
 
-    for (version in flywayTestExtensionsVersions) {
+    flywayTestExtensionsVersions.init().each { version ->
         task "testWithFlywayTestExtensions$version"(type: Test) {
             dependsOn jar
 
@@ -257,7 +259,6 @@ project(':embedded-database-spring-test') {
                 includeCategories 'io.zonky.test.category.FlywayIntegrationTests'
 
                 if (VersionNumber.withPatchNumber().parse(version) >= VersionNumber.withPatchNumber().parse("4.2.0.1")) {
-                    println "MultiFlywayIntegrationTests category has been applied!!! - $version"
                     includeCategories 'io.zonky.test.category.MultiFlywayIntegrationTests'
                 }
             }

embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayClassUtils.java

@@ -2,6 +2,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.FlywayException;
 import org.flywaydb.test.annotation.FlywayTest;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
@@ -15,6 +16,7 @@ public class FlywayClassUtils {
             "org.flywaydb.test.annotation.FlywayTests", FlywayClassUtils.class.getClassLoader());
 
     private static final int flywayVersion;
+    private static final boolean isFlywayPro;
 
     static {
         String version;
@@ -34,6 +36,19 @@ public class FlywayClassUtils {
             version = "0";
         }
         flywayVersion = Integer.valueOf(version);
+
+        if (flywayVersion >= 50) {
+            boolean isCommercial;
+            try {
+                new Flyway().getUndoSqlMigrationPrefix();
+                isCommercial = true;
+            } catch (FlywayException e) {
+                isCommercial = false;
+            }
+            isFlywayPro = isCommercial;
+        } else {
+            isFlywayPro = false;
+        }
     }
 
     private FlywayClassUtils() {}
@@ -53,4 +68,8 @@ public static boolean isRepeatableFlywayTestAnnotationPresent() {
     public static int getFlywayVersion() {
         return flywayVersion;
     }
+
+    public static boolean isFlywayPro() {
+        return isFlywayPro;
+    }
 }