From 1fbfcd393f2e3b56cf998a52343780f61d887d8d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 14 Sep 2021 19:00:55 +1200
Subject: [PATCH 1/2] #2363 - Bump to dependencies that have module-info via
 mult-version jars etc

Bump ebean-ddl-generator and avaje-config
---
 ebean-api/pom.xml           | 2 +-
 ebean-core/pom.xml          | 2 +-
 ebean-ddl-generator/pom.xml | 2 +-
 pom.xml                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index c5621372b..b8cd099a2 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>1.3</version>
+      <version>1.4</version>
     </dependency>
 
     <!--
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index b4ae7fb11..cf6b1ae1b 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.1</version>
+      <version>1.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 4fabbbe9b..b5340367f 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-runner</artifactId>
-      <version>1.1</version>
+      <version>1.2</version>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index 215bf59fa..d43b3a93f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
   <properties>
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
     <jackson.version>2.12.1</jackson.version>
-    <ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
+    <ebean-ddl-runner.version>1.2</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.1</ebean-migration-auto.version>
     <ebean-migration.version>12.11.0</ebean-migration.version>
     <ebean-test-docker.version>4.1</ebean-test-docker.version>

From 512ba240410039c534b90c1fcdcb1d3483783b02 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 14 Sep 2021 19:10:23 +1200
Subject: [PATCH 2/2] #2364 - Move tests only in ebean-ddl-generator

---
 .../dbmigration/DbMigrationTest.java             |  4 ++--
 .../ddlgeneration/BaseDdlHandlerTest.java        |  2 +-
 .../model/build/ModelBuildBeanVisitorTest.java   |  2 +-
 .../model/build/ModelBuild_compoundKeyTest.java  |  2 +-
 .../build/ModelBuild_compound_IdClassTest.java   |  8 +-------
 .../build/ModelBuild_explicitSequencesTest.java  |  2 +-
 .../io/{ebean => localtest}/BaseTestCase.java    | 16 +++-------------
 .../DbMigrationSqlServerTest.java                |  3 ++-
 .../{ebean => localtest}/PlatformCondition.java  |  5 +++--
 .../annotation/ForPlatform.java                  |  4 +++-
 .../annotation/IgnorePlatform.java               |  4 +++-
 11 files changed, 21 insertions(+), 31 deletions(-)
 rename ebean-ddl-generator/src/test/java/io/{ebean => localtest}/BaseTestCase.java (83%)
 rename ebean-ddl-generator/src/test/java/io/{ebean/dbmigration => localtest}/DbMigrationSqlServerTest.java (93%)
 rename ebean-ddl-generator/src/test/java/io/{ebean => localtest}/PlatformCondition.java (93%)
 rename ebean-ddl-generator/src/test/java/io/{ebean => localtest}/annotation/ForPlatform.java (84%)
 rename ebean-ddl-generator/src/test/java/io/{ebean => localtest}/annotation/IgnorePlatform.java (84%)

diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
index 6eacdc2ac..aec05f62e 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.dbmigration;
 
-import io.ebean.BaseTestCase;
+import io.localtest.BaseTestCase;
 import io.ebean.SqlRow;
 import io.ebean.SqlUpdate;
-import io.ebean.annotation.IgnorePlatform;
+import io.localtest.annotation.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
 import org.junit.jupiter.api.Test;
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
index 6065448bc..8de6ac22b 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.ddlgeneration;
 
-import io.ebean.BaseTestCase;
+import io.localtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
index 7c2e32b9d..a6aee3cd1 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.dbmigration.model.build;
 
 
-import io.ebean.BaseTestCase;
+import io.localtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.DatabaseConfig;
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
index 3d95eb951..d6bc51741 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.dbmigration.model.build;
 
 
-import io.ebean.BaseTestCase;
+import io.localtest.BaseTestCase;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.SpiEbeanServer;
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java
index 6cd16314d..2c47bbaae 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java
@@ -1,21 +1,15 @@
 package io.ebeaninternal.dbmigration.model.build;
 
 
-import io.ebean.BaseTestCase;
+import io.localtest.BaseTestCase;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
-import io.ebeaninternal.dbmigration.migration.Migration;
-import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
 import io.ebeaninternal.dbmigration.model.CurrentModel;
 import io.ebeaninternal.dbmigration.model.MTable;
 import io.ebeaninternal.dbmigration.model.ModelContainer;
 import org.junit.jupiter.api.Test;
-import org.tests.model.basic.CKeyAssoc;
-import org.tests.model.basic.CKeyDetail;
-import org.tests.model.basic.CKeyParent;
-import org.tests.model.basic.CKeyParentId;
 import org.tests.model.compositekeys.CKEmbId;
 import org.tests.model.compositekeys.CKSiteUser;
 
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
index 07f29e34e..f25567956 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.dbmigration.model.build;
 
 
-import io.ebean.BaseTestCase;
+import io.localtest.BaseTestCase;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.SpiEbeanServer;
diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
similarity index 83%
rename from ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
rename to ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
index 223598f91..f7634c0e0 100644
--- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
@@ -1,25 +1,15 @@
-package io.ebean;
+package io.localtest;
 
+import io.ebean.DB;
+import io.ebean.Database;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
-import io.ebean.cache.ServerCacheStatistics;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.meta.MetaTimedMetric;
-import io.ebean.meta.ServerMetrics;
-import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.SpiTransaction;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
-import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
-import org.assertj.core.api.AbstractCharSequenceAssert;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.sql.Types;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java b/ebean-ddl-generator/src/test/java/io/localtest/DbMigrationSqlServerTest.java
similarity index 93%
rename from ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
rename to ebean-ddl-generator/src/test/java/io/localtest/DbMigrationSqlServerTest.java
index b30bcbc8b..3e63179ec 100644
--- a/ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/DbMigrationSqlServerTest.java
@@ -1,6 +1,7 @@
-package io.ebean.dbmigration;
+package io.localtest;
 
 import io.ebean.annotation.Platform;
+import io.ebean.dbmigration.DbMigration;
 import io.ebeaninternal.api.DbOffline;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/ebean-ddl-generator/src/test/java/io/ebean/PlatformCondition.java b/ebean-ddl-generator/src/test/java/io/localtest/PlatformCondition.java
similarity index 93%
rename from ebean-ddl-generator/src/test/java/io/ebean/PlatformCondition.java
rename to ebean-ddl-generator/src/test/java/io/localtest/PlatformCondition.java
index b04f3db1c..a0ecf55c1 100644
--- a/ebean-ddl-generator/src/test/java/io/ebean/PlatformCondition.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/PlatformCondition.java
@@ -1,6 +1,7 @@
-package io.ebean;
+package io.localtest;
 
-import io.ebean.annotation.ForPlatform;
+import io.ebean.DB;
+import io.localtest.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
diff --git a/ebean-ddl-generator/src/test/java/io/ebean/annotation/ForPlatform.java b/ebean-ddl-generator/src/test/java/io/localtest/annotation/ForPlatform.java
similarity index 84%
rename from ebean-ddl-generator/src/test/java/io/ebean/annotation/ForPlatform.java
rename to ebean-ddl-generator/src/test/java/io/localtest/annotation/ForPlatform.java
index a69c42e9a..914302361 100644
--- a/ebean-ddl-generator/src/test/java/io/ebean/annotation/ForPlatform.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/annotation/ForPlatform.java
@@ -1,4 +1,6 @@
-package io.ebean.annotation;
+package io.localtest.annotation;
+
+import io.ebean.annotation.Platform;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/ebean-ddl-generator/src/test/java/io/ebean/annotation/IgnorePlatform.java b/ebean-ddl-generator/src/test/java/io/localtest/annotation/IgnorePlatform.java
similarity index 84%
rename from ebean-ddl-generator/src/test/java/io/ebean/annotation/IgnorePlatform.java
rename to ebean-ddl-generator/src/test/java/io/localtest/annotation/IgnorePlatform.java
index 6fafc4852..a48808434 100644
--- a/ebean-ddl-generator/src/test/java/io/ebean/annotation/IgnorePlatform.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/annotation/IgnorePlatform.java
@@ -1,4 +1,6 @@
-package io.ebean.annotation;
+package io.localtest.annotation;
+
+import io.ebean.annotation.Platform;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;