Merge pull request #641 from AbhayChandel/develop-2.x

Migration from Flyway 3.2.1 to 4.2.0
oasp · May 16, 2018 · ea4a0c5 · ea4a0c5
2 parents d0e7aee + 223297a
commit ea4a0c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/samples/core/pom.xml b/samples/core/pom.xml
@@ -116,6 +116,7 @@
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-core</artifactId>
+      <version>4.2.0</version>
     </dependency>
 
     <!-- hibernate -->

diff --git a/...src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/DatabaseMigrator.java b/...src/main/java/io/oasp/gastronomy/restaurant/general/dataaccess/base/DatabaseMigrator.java
@@ -58,6 +58,7 @@ public void importTestData(String importTestDataPath) {
     final Flyway flyway = new Flyway();
     flyway.setDataSource(this.dataSource);
     flyway.setLocations(importTestDataPath);
+    flyway.setIgnoreMissingMigrations(true);
     flyway.migrate();
   }