From 8ca3599cbf5e7fbd1d21c14b93caaae1b4b4d273 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Sun, 25 Jun 2017 14:29:46 +1200
Subject: [PATCH] #1046 Bump DB migration to 10.1.9 - fix for Checksum mismatch
 does not stop migration

---
 pom.xml                                              | 4 ++--
 src/main/java/io/ebean/config/DbMigrationConfig.java | 6 +++++-
 src/main/java/io/ebean/config/ServerConfig.java      | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 204eca057..a31d5a5b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration</artifactId>
-      <version>10.1.8</version>
+      <version>10.1.9</version>
     </dependency>
 
     <dependency>
@@ -130,7 +130,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>9.4.1212.jre7</version>
+      <version>42.1.1.jre7</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/src/main/java/io/ebean/config/DbMigrationConfig.java b/src/main/java/io/ebean/config/DbMigrationConfig.java
index ca236cd32..ba9dcd38c 100644
--- a/src/main/java/io/ebean/config/DbMigrationConfig.java
+++ b/src/main/java/io/ebean/config/DbMigrationConfig.java
@@ -7,6 +7,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
+import java.util.Properties;
 
 /**
  * Configuration for the DB migration processing.
@@ -443,7 +444,7 @@ public class DbMigrationConfig {
   /**
    * Create the MigrationRunner to run migrations if necessary.
    */
-  public MigrationRunner createRunner(ClassLoader classLoader) {
+  public MigrationRunner createRunner(ClassLoader classLoader, Properties properties) {
 
     MigrationConfig runnerConfig = new MigrationConfig();
     runnerConfig.setMetaTable(metaTable);
@@ -454,6 +455,9 @@ public class DbMigrationConfig {
     runnerConfig.setDbUsername(getDbUsername());
     runnerConfig.setDbPassword(getDbPassword());
     runnerConfig.setClassLoader(classLoader);
+    if (properties != null) {
+      runnerConfig.load(properties);
+    }
     return new MigrationRunner(runnerConfig);
   }
 }
diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java
index c36612208..04f3e0810 100644
--- a/src/main/java/io/ebean/config/ServerConfig.java
+++ b/src/main/java/io/ebean/config/ServerConfig.java
@@ -2755,7 +2755,7 @@ public class ServerConfig {
    */
   public DataSource runDbMigration(DataSource dataSource) {
     if (migrationConfig.isRunMigration()) {
-      MigrationRunner runner = migrationConfig.createRunner(getClassLoadConfig().getClassLoader());
+      MigrationRunner runner = migrationConfig.createRunner(getClassLoadConfig().getClassLoader(), properties);
       runner.run(dataSource);
     }
     return dataSource;