From c5acd31da48140c6811e3430720bd6b7ef1e83b6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 2 Mar 2022 12:25:57 +1300
Subject: [PATCH] #2579 - Bump to ebean-migration 12.16.0, support both
 basePlatform and platform for finding/running migrations

---
 ebean-core/pom.xml                                          | 2 +-
 .../java/io/ebeaninternal/server/core/DefaultServer.java    | 4 +++-
 ebean-ddl-generator/pom.xml                                 | 2 +-
 pom.xml                                                     | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 05490669f..09e51a6ce 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-runner</artifactId>
-      <version>1.2</version>
+      <version>${ebean-ddl-runner.version}</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 552816408..2f51eeffd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -373,7 +373,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
         migrationRunner.setDefaultDbSchema(dbSchema);
       }
       migrationRunner.setName(config.getName());
-      migrationRunner.setPlatform(config.getDatabasePlatform().getPlatform().base().name().toLowerCase());
+      Platform platform = config.getDatabasePlatform().getPlatform();
+      migrationRunner.setBasePlatform(platform.base().name().toLowerCase());
+      migrationRunner.setPlatform(platform.name().toLowerCase());
       migrationRunner.loadProperties(config.getProperties());
       migrationRunner.run(config.getDataSource());
     }
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index ca8918d6a..d05318f87 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-runner</artifactId>
-      <version>1.2</version>
+      <version>${ebean-ddl-runner.version}</version>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index 5fcf54843..fc4c0db53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,10 +41,10 @@
     <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
     <jackson.version>2.12.1</jackson.version>
     <h2database.version>2.1.210</h2database.version>
-    <ebean-ddl-runner.version>1.2</ebean-ddl-runner.version>
+    <ebean-ddl-runner.version>1.3</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.1</ebean-migration-auto.version>
-    <ebean-migration.version>12.15.0</ebean-migration.version>
-    <ebean-test-docker.version>4.2</ebean-test-docker.version>
+    <ebean-migration.version>12.16.0</ebean-migration.version>
+    <ebean-test-docker.version>4.5</ebean-test-docker.version>
     <ebean-datasource.version>7.5</ebean-datasource.version>
     <ebean-agent.version>12.15.0</ebean-agent.version>
     <ebean-maven-plugin.version>12.15.0</ebean-maven-plugin.version>