Merge pull request #19 from didrikjonassen/master

Fixing compatibility with Flyway 6

Author: tomix26

pom.xml

@@ -134,7 +134,7 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>5.0.7</version>
+            <version>6.0.8</version>
             <optional>true</optional>
         </dependency>
         <dependency>

src/main/java/io/zonky/test/db/postgres/embedded/FlywayPreparer.java

@@ -21,31 +21,32 @@
 import javax.sql.DataSource;
 
 import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.configuration.FluentConfiguration;
 
 // TODO: Detect missing migration files.
 // cf. https://github.com/flyway/flyway/issues/1496
 // There is also a related @Ignored test in otj-sql.
 
 public final class FlywayPreparer implements DatabasePreparer {
 
-    private final Flyway flyway;
+    private final FluentConfiguration flyway;
     private final List<String> locations;
 
     public static FlywayPreparer forClasspathLocation(String... locations) {
-        Flyway f = new Flyway();
-        f.setLocations(locations);
+        FluentConfiguration f = Flyway.configure()
+            .locations(locations);
         return new FlywayPreparer(f, Arrays.asList(locations));
     }
 
-    private FlywayPreparer(Flyway flyway, List<String> locations) {
+    private FlywayPreparer(FluentConfiguration flyway, List<String> locations) {
         this.flyway = flyway;
         this.locations = locations;
     }
 
     @Override
     public void prepare(DataSource ds) throws SQLException {
-        flyway.setDataSource(ds);
-        flyway.migrate();
+        flyway.dataSource(ds);
+        flyway.load().migrate();
     }
 
     @Override