Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	ebean-core/src/main/java/io/ebeaninternal/server/deploy/TablespaceMeta.java
#	ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
#	ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
#	ebean-test/src/test/java/misc/migration/v1_0/EBasic.java
#	ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java
#	ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java
#	ebean-test/src/test/java/org/tests/json/TestDbJson_List.java
#	ebean-test/src/test/resources/extra-ddl.xml
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/I__create_tablespaces.sql
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
#	ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml

ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java

@@ -1,8 +1,8 @@
 package org.tests.aggregateformula;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java

@@ -1,6 +1,6 @@
 package org.tests.aggregateformula;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.annotation.Index;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Where;

ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;

ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.cache.ServerCache;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java

@@ -1,8 +1,8 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EDefaultProp;

ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java

@@ -1,7 +1,7 @@
 package org.tests.basic;
 
 import io.ebean.DB;
-import io.ebean.TransactionalTestCase;
+import io.ebean.xtest.base.TransactionalTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;

ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Article;

ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java

@@ -1,15 +1,15 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.PFile;
 import org.tests.model.basic.PFileContent;
 
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 import java.nio.charset.StandardCharsets;
 
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class TestDeleteImportedPartial extends BaseTestCase {
 
   @Test

ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java

@@ -1,15 +1,15 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.PersistentFile;
 import org.tests.model.basic.PersistentFileContent;
 
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 import java.nio.charset.StandardCharsets;
 
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class TestDeleteOneToOne extends BaseTestCase {
 
   @Test

ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java

@@ -1,15 +1,15 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.PFile;
 import org.tests.model.basic.PFileContent;
 
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 import java.nio.charset.StandardCharsets;
 
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class TestDeleteOneToOneMultiple extends BaseTestCase {
 
   @Test

ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TMapSuperEntity;

ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
 import io.ebean.Database;

ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;

ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestFetchId.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.FutureIds;
 import io.ebean.Query;

ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicVer;
@@ -10,9 +10,7 @@ import javax.persistence.OptimisticLockException;
 import java.sql.Timestamp;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestIUDVanilla extends BaseTestCase {
 

ebean-test/src/test/java/org/tests/basic/TestInEmpty.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestInheritRef.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Car;

ebean-test/src/test/java/org/tests/basic/TestJodaType.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.SpiEbeanServer;

ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.*;

ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;

ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.CacheMode;
 import io.ebean.DB;

ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java

@@ -1,9 +1,8 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.test.LoggedSql;
-
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Country;
 import org.tests.model.basic.Customer;
@@ -13,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 class TestLoadBeanCache extends BaseTestCase {
 

ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 

ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;

ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.ResetBasicData;

ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TMapSuperEntity;

ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java

@@ -1,8 +1,8 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Address;

ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.MNonUpdPropEntity;

ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java

@@ -2,7 +2,7 @@ package org.tests.basic;
 
 import io.ebean.DB;
 import io.ebean.Query;
-import io.ebean.TransactionalTestCase;
+import io.ebean.xtest.base.TransactionalTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;

ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;

ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java

@@ -1,6 +1,7 @@
 package org.tests.basic;
 
 import io.ebean.*;
+import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.OrderAggregate;
 import org.tests.model.basic.ResetBasicData;

ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.SqlRow;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import io.ebeaninternal.api.SpiPersistenceContext;

ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java

@@ -1,7 +1,8 @@
 package org.tests.basic;
 
 import io.ebean.*;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java

@@ -1,8 +1,8 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.annotation.ForPlatform;
+import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java

@@ -1,9 +1,9 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Country;

ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Disabled;

ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.cache.ServerCache;

ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.BeanCollection;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java

@@ -1,15 +1,15 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.PersistentFile;
 import org.tests.model.basic.PersistentFileContent;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 import java.nio.charset.StandardCharsets;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class TestSaveDeleteOneToOne extends BaseTestCase {
 
   @Test

ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java

@@ -1,15 +1,15 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.PFile;
 import org.tests.model.basic.PFileContent;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 import java.nio.charset.StandardCharsets;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class TestSaveDeleteOneToOneMultiple extends BaseTestCase {
 
 //	public void testCreateDeletePFile() {

ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.bean.BeanCollection;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestTransient.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/TestUpdate.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Update;
 import org.junit.jupiter.api.AfterEach;

ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;

ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TUuidEntity;

ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.UUOne;

ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java

@@ -2,7 +2,7 @@ package org.tests.basic;
 
 import io.ebean.DB;
 import io.ebean.Query;
-import io.ebean.TransactionalTestCase;
+import io.ebean.xtest.base.TransactionalTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;

ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java

@@ -1,6 +1,6 @@
 package org.tests.basic.delete;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java

@@ -1,6 +1,6 @@
 package org.tests.basic.delete;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebeaninternal.api.SpiEbeanServer;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java

@@ -1,6 +1,6 @@
 package org.tests.basic.delete;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.AfterEach;

ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java

@@ -1,10 +1,10 @@
 package org.tests.basic.encrypt;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.SqlRow;
-import io.ebean.annotation.ForPlatform;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.ForPlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.test.LoggedSql;

ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java

@@ -1,6 +1,6 @@
 package org.tests.basic.encrypt;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.SqlRow;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java

@@ -1,6 +1,6 @@
 package org.tests.basic.encrypt;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasicEncryptClient;

ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java

@@ -1,7 +1,7 @@
 package org.tests.basic.event;
 
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TWithPreInsert;

ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java

@@ -1,6 +1,6 @@
 package org.tests.basic.event;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.QueryType;

ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java

@@ -1,7 +1,7 @@
 package org.tests.basic.join;
 
 import io.ebean.DB;
-import io.ebean.TransactionalTestCase;
+import io.ebean.xtest.base.TransactionalTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.Order.Status;

ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java

@@ -1,6 +1,6 @@
 package org.tests.basic.lob;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.Query;

ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java

@@ -1,6 +1,6 @@
 package org.tests.basic.lob;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.test.LoggedSql;

ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java

@@ -1,6 +1,6 @@
 package org.tests.basic.lob;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TBytesOnly;

ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java

@@ -1,6 +1,6 @@
 package org.tests.basic.one2one;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 

ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java

@@ -1,6 +1,6 @@
 package org.tests.basic.one2one;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 

ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java

@@ -1,6 +1,6 @@
 package org.tests.basic.type;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;

ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java

@@ -1,6 +1,6 @@
 package org.tests.basic.type;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.ESomeType;

ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java

@@ -1,7 +1,7 @@
 package org.tests.basic.type;
 
 import io.ebean.DB;
-import io.ebean.TransactionalTestCase;
+import io.ebean.xtest.base.TransactionalTestCase;
 import io.ebean.types.Cidr;
 import io.ebean.types.Inet;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java

@@ -1,6 +1,6 @@
 package org.tests.basic.type;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TOne;

ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java

@@ -1,6 +1,6 @@
 package org.tests.basic.type;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;

ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java

@@ -1,6 +1,6 @@
 package org.tests.basic.type;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 

ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java

@@ -1,13 +1,15 @@
 package org.tests.batchinsert;
 
 import io.ebean.*;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.BaseTestCase;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.meta.ServerMetrics;
 import io.ebean.test.LoggedSql;
+import io.ebean.xtest.base.DtoQuery2Test;
 import io.ebeaninternal.api.SpiTransaction;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;

ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java

@@ -1,9 +1,9 @@
 package org.tests.batchinsert;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;

ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java

@@ -1,6 +1,6 @@
 package org.tests.batchinsert;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import io.ebean.test.LoggedSql;

ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java

@@ -1,9 +1,9 @@
 package org.tests.batchinsert;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.Database;
 import io.ebean.Transaction;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiTransaction;

ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java

@@ -1,9 +1,9 @@
 package org.tests.batchinsert;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Database;
-import io.ebean.annotation.IgnorePlatform;
+import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Transactional;
 import org.junit.jupiter.api.BeforeAll;

ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Expr;
 import io.ebean.Transaction;

ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;

ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheStatistics;

ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.UUOne;

ebean-test/src/test/java/org/tests/batchload/TestBeanState.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
 import io.ebean.bean.EntityBean;

ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;

ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.*;

ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java

@@ -1,7 +1,7 @@
 package org.tests.batchload;
 
 import io.ebean.DB;
-import io.ebean.TransactionalTestCase;
+import io.ebean.xtest.base.TransactionalTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;

ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.UUOne;

ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.UUOne;

ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.DB;
 import io.ebean.Query;

ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;

ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java

@@ -1,6 +1,6 @@
 package org.tests.batchload;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;

ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java

@@ -3,7 +3,7 @@ package org.tests.batchload;
 import io.ebean.DB;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
-import io.ebean.TransactionalTestCase;
+import io.ebean.xtest.base.TransactionalTestCase;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;

ebean-test/src/test/java/org/tests/cache/TestBeanCache.java

@@ -1,6 +1,6 @@
 package org.tests.cache;
 
-import io.ebean.BaseTestCase;
+import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Transaction;
 import io.ebean.cache.ServerCache;