Merge pull request #68 from zonkyio/flyway-6.0.3

#67 Fix compatibility with Flyway 6.0.3+

Author: tomix26

build.gradle

@@ -26,7 +26,8 @@ ext {
 
             [core: '5.1.4', test: '5.1.0'],
             [core: '5.2.4', test: '5.2.4'],
-            [core: '6.0.2', test: '5.2.4'],
+            [core: '6.0.2', test: '6.0.0'],
+            [core: '6.0.7', test: '6.0.0'],
 
             [core: '5.0.7', test: '5.0.0'] // default version
     ]

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

@@ -42,6 +42,7 @@
 import javax.sql.DataSource;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.SQLException;
@@ -265,10 +266,21 @@ protected static MigrationResolver createMigrationResolver(Flyway flyway, String
                 Object sqlScriptExecutorFactory = invokeStaticMethod(DatabaseFactory.class, "createSqlScriptExecutorFactory", jdbcConnectionFactory);
 
                 Class<?> scannerType = ClassUtils.forName("org.flywaydb.core.internal.scanner.Scanner", classLoader);
-                Object scanner = scannerType.getConstructors()[0].newInstance(
-                        Arrays.asList((Object[]) invokeMethod(configuration, "getLocations")),
-                        invokeMethod(configuration, "getClassLoader"),
-                        invokeMethod(configuration, "getEncoding"));
+                Constructor<?> scannerConstructor = scannerType.getConstructors()[0];
+                Object scanner;
+
+                if (scannerConstructor.getParameterCount() == 4) {
+                    scanner = scannerConstructor.newInstance(
+                            ClassUtils.forName("org.flywaydb.core.api.migration.JavaMigration", classLoader),
+                            Arrays.asList((Object[]) invokeMethod(configuration, "getLocations")),
+                            invokeMethod(configuration, "getClassLoader"),
+                            invokeMethod(configuration, "getEncoding"));
+                } else {
+                    scanner = scannerConstructor.newInstance(
+                            Arrays.asList((Object[]) invokeMethod(configuration, "getLocations")),
+                            invokeMethod(configuration, "getClassLoader"),
+                            invokeMethod(configuration, "getEncoding"));
+                }
 
                 return invokeMethod(flyway, "createMigrationResolver", scanner, scanner, sqlScriptExecutorFactory, sqlScriptFactory);
             } else if (flywayVersion >= 52) {