From f394e7f39b23db24bb516e0f50bbe26e10cedb30 Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Thu, 12 Nov 2020 22:42:00 +1300
Subject: [PATCH] #2099 - Refactor internals introduce use of ebean-ddl-runner

---
 ebean-core/pom.xml                                         | 7 +++++++
 .../java/io/ebeaninternal/server/core/DScriptRunner.java   | 4 ++--
 ebean-ddlgen/pom.xml                                       | 7 +++++++
 .../java/io/ebeaninternal/dbmigration/DdlGenerator.java    | 4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 39aac1d7f..f80758628 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -48,6 +48,12 @@
   </profiles>
   <dependencies>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-ddl-runner</artifactId>
+      <version>1.0</version>
+    </dependency>
+
     <!-- keep testing in core using ebean-ddlgen -->
     <dependency>
       <groupId>io.ebean</groupId>
@@ -55,6 +61,7 @@
       <version>12.5.0</version>
       <scope>test</scope>
     </dependency>
+
     <!-- test scope for supporting ebean-ddlgen -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
index 842f86848..8bf649438 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.ScriptRunner;
-import io.ebean.migration.ddl.DdlRunner;
-import io.ebean.migration.runner.ScriptTransform;
+import io.ebean.ddlrunner.DdlRunner;
+import io.ebean.ddlrunner.ScriptTransform;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.util.UrlHelper;
 
diff --git a/ebean-ddlgen/pom.xml b/ebean-ddlgen/pom.xml
index 3ce6f1af7..6339c9cb3 100644
--- a/ebean-ddlgen/pom.xml
+++ b/ebean-ddlgen/pom.xml
@@ -13,10 +13,17 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-ddl-runner</artifactId>
+      <version>1.0</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
       <version>12.5.3-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- needed for java 11+ -->
diff --git a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 2871c58a7..d2c800ff2 100644
--- a/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/ebean-ddlgen/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -4,8 +4,8 @@ import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DbMigrationConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.migration.ddl.DdlRunner;
-import io.ebean.migration.runner.ScriptTransform;
+import io.ebean.ddlrunner.DdlRunner;
+import io.ebean.ddlrunner.ScriptTransform;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.SpiDdlGenerator;
 import io.ebeaninternal.api.SpiEbeanServer;