From 475b05052e048c2998fdbe6685fed2cd541e28b7 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 9 Aug 2022 15:43:16 +1200
Subject: [PATCH 001/127] Refactor rename internal methods for SpiQueryPlan and
 DbReadContext

Change the getter methods to use accessor style
---
 .../io/ebeaninternal/api/SpiQueryPlan.java    | 10 ++--
 .../server/deploy/AssocOneHelp.java           |  2 +-
 .../server/deploy/AssocOneHelpRefInherit.java |  4 +-
 .../server/deploy/BeanDescriptor.java         |  4 +-
 .../server/deploy/BeanProperty.java           |  6 +--
 .../server/deploy/DbReadContext.java          |  7 ++-
 .../DynamicPropertyAggregationFormula.java    |  2 +-
 .../server/deploy/DynamicPropertyBase.java    |  2 +-
 .../server/deploy/InheritInfo.java            |  2 +-
 .../expression/ExistsQueryExpression.java     |  4 +-
 .../server/expression/InQueryExpression.java  |  4 +-
 .../io/ebeaninternal/server/query/CQuery.java | 53 +++++++++----------
 .../server/query/CQueryBuilder.java           |  2 +-
 .../server/query/CQueryEngine.java            | 34 ++++++------
 .../query/CQueryFetchSingleAttribute.java     |  8 ++-
 .../server/query/CQueryPlan.java              | 30 +++++------
 .../server/query/CQueryPlanStats.java         | 12 ++---
 .../server/query/CQueryPredicates.java        |  2 +-
 .../server/query/CQueryRowCount.java          |  4 +-
 .../server/query/CQueryUpdate.java            |  2 +-
 .../server/query/QueryPlanLoggerExplain.java  |  2 +-
 .../server/query/QueryPlanLoggerOracle.java   |  2 +-
 .../server/query/QueryPlanLoggerPostgres.java |  2 +-
 .../query/QueryPlanLoggerSqlServer.java       |  2 +-
 .../server/query/SqlTreeLoadBean.java         |  4 +-
 .../server/query/SqlTreeLoadRoot.java         |  4 +-
 26 files changed, 103 insertions(+), 107 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
index 0b4c3ea0a..137cf60ff 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryPlan.java
@@ -10,27 +10,27 @@ public interface SpiQueryPlan {
   /**
    * The related entity bean type
    */
-  Class<?> getBeanType();
+  Class<?> beanType();
 
   /**
    * The plan name.
    */
-  String getName();
+  String name();
 
   /**
    * The hash of the sql.
    */
-  String getHash();
+  String hash();
 
   /**
    * The SQL for the query plan.
    */
-  String getSql();
+  String sql();
 
   /**
    * The related profile location.
    */
-  ProfileLocation getProfileLocation();
+  ProfileLocation profileLocation();
 
   /**
    * Initiate bind capture with the give threshold.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
index c2ed2a472..7f2366006 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelp.java
@@ -61,7 +61,7 @@ abstract class AssocOneHelp {
     if (id == null) {
       return null;
     }
-    PersistenceContext pc = ctx.getPersistenceContext();
+    PersistenceContext pc = ctx.persistenceContext();
     Object existing = target.contextGet(pc, id);
     if (existing != null) {
       return existing;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
index 72fb828c7..ce36dcc6e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
@@ -22,7 +22,7 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
   @Override
   void loadIgnore(DbReadContext ctx) {
     property.targetIdBinder.loadIgnore(ctx);
-    ctx.getDataReader().incrementPos(1);
+    ctx.dataReader().incrementPos(1);
   }
 
   /**
@@ -47,7 +47,7 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
       return null;
     }
     // check transaction context to see if it already exists
-    PersistenceContext pc = ctx.getPersistenceContext();
+    PersistenceContext pc = ctx.persistenceContext();
     Object existing = desc.contextGet(pc, id);
     if (existing != null) {
       return existing;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 08804a53d..2ba7bf20b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1468,7 +1468,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
 
   void queryPlanInit(QueryPlanInit request, List<MetaQueryPlan> list) {
     for (CQueryPlan queryPlan : queryPlanCache.values()) {
-      if (request.includeHash(queryPlan.getHash())) {
+      if (request.includeHash(queryPlan.hash())) {
         queryPlan.queryPlanInit(request.thresholdMicros());
         list.add(queryPlan.createMeta(null, null));
       }
@@ -1500,7 +1500,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    * Trim query plans not used since the passed in epoch time.
    */
   void trimQueryPlans(long unusedSince) {
-    queryPlanCache.values().removeIf(queryPlan -> queryPlan.getLastQueryTime() < unusedSince);
+    queryPlanCache.values().removeIf(queryPlan -> queryPlan.lastQueryTime() < unusedSince);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 243db22ac..cebac3275 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -506,7 +506,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
 
   @Override
   public void loadIgnore(DbReadContext ctx) {
-    scalarType.loadIgnore(ctx.getDataReader());
+    scalarType.loadIgnore(ctx.dataReader());
   }
 
   @Override
@@ -541,11 +541,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   }
 
   public Object read(DbReadContext ctx) throws SQLException {
-    return scalarType.read(ctx.getDataReader());
+    return scalarType.read(ctx.dataReader());
   }
 
   public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
-    return readSet(ctx.getDataReader(), bean);
+    return readSet(ctx.dataReader(), bean);
   }
 
   @SuppressWarnings("unchecked")
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
index e79e7e0df..7ac256b4b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbReadContext.java
@@ -27,7 +27,7 @@ public interface DbReadContext {
   /**
    * Return the DataReader.
    */
-  DataReader getDataReader();
+  DataReader dataReader();
 
   /**
    * Return true if the query is using supplied SQL rather than generated SQL.
@@ -52,7 +52,7 @@ public interface DbReadContext {
   /**
    * Return the persistence context.
    */
-  PersistenceContext getPersistenceContext();
+  PersistenceContext persistenceContext();
 
   /**
    * Register a reference for lazy loading.
@@ -69,7 +69,6 @@ public interface DbReadContext {
    */
   void register(BeanPropertyAssocMany<?> many, BeanCollection<?> bc);
 
-
   /**
    * Set back the bean that has just been loaded with its id.
    */
@@ -78,7 +77,7 @@ public interface DbReadContext {
   /**
    * Return the query mode.
    */
-  SpiQuery.Mode getQueryMode();
+  SpiQuery.Mode queryMode();
 
   /**
    * Return true if the underlying query is a 'asDraft' query.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index ec1c7035b..faab87419 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -47,7 +47,7 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
   public void load(SqlBeanLoad sqlBeanLoad) {
     Object value;
     try {
-      value = scalarType.read(sqlBeanLoad.ctx().getDataReader());
+      value = scalarType.read(sqlBeanLoad.ctx().dataReader());
     } catch (Exception e) {
       sqlBeanLoad.ctx().handleLoadError(fullName, e);
       return;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
index 08fc33036..fe06c0f4c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
@@ -65,7 +65,7 @@ abstract class DynamicPropertyBase implements STreeProperty {
 
   @Override
   public void loadIgnore(DbReadContext ctx) {
-    scalarType.loadIgnore(ctx.getDataReader());
+    scalarType.loadIgnore(ctx.dataReader());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
index 3f0c5c8cb..ae588e466 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
@@ -197,7 +197,7 @@ public final class InheritInfo {
    * Return the associated InheritInfo for this DB row read.
    */
   public InheritInfo readType(DbReadContext ctx) throws SQLException {
-    return readType(ctx.getDataReader().getString());
+    return readType(ctx.dataReader().getString());
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index 06b9a43e1..e746e58ff 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -57,8 +57,8 @@ final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreE
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
     CQuery<?> subQuery = compileSubQuery(request);
-    this.bindParams = subQuery.getPredicates().getWhereExprBindValues();
-    this.sql = subQuery.getGeneratedSql().replace('\n', ' ');
+    this.bindParams = subQuery.predicates().getWhereExprBindValues();
+    this.sql = subQuery.generatedSql().replace('\n', ' ');
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index 8c0a12506..779f222e6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -45,8 +45,8 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
   public void prepareExpression(BeanQueryRequest<?> request) {
 
     CQuery<?> subQuery = compileSubQuery(request);
-    this.bindParams = subQuery.getPredicates().getWhereExprBindValues();
-    this.sql = subQuery.getGeneratedSql().replace('\n', ' ');
+    this.bindParams = subQuery.predicates().getWhereExprBindValues();
+    this.sql = subQuery.generatedSql().replace('\n', ' ');
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index d153c359a..b7d6b38a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -188,13 +188,13 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
     this.autoTuneProfiling = profilingListener != null;
     // set the generated sql back to the query
     // so its available to the user...
-    query.setGeneratedSql(queryPlan.getSql());
-    SqlTreePlan sqlTree = queryPlan.getSqlTree();
+    query.setGeneratedSql(queryPlan.sql());
+    SqlTreePlan sqlTree = queryPlan.sqlTree();
     this.rootNode = sqlTree.getRootNode();
     this.manyProperty = sqlTree.getManyProperty();
-    this.sql = queryPlan.getSql();
+    this.sql = queryPlan.sql();
     this.rawSql = queryPlan.isRawSql();
-    this.logWhereSql = queryPlan.getLogWhereSql();
+    this.logWhereSql = queryPlan.logWhereSql();
     this.desc = request.descriptor();
     this.predicates = predicates;
     if (lazyLoadManyProperty != null) {
@@ -243,20 +243,20 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
   }
 
   @Override
-  public DataReader getDataReader() {
+  public DataReader dataReader() {
     return dataReader;
   }
 
   @Override
-  public Mode getQueryMode() {
+  public Mode queryMode() {
     return queryMode;
   }
 
-  public CQueryPredicates getPredicates() {
+  public CQueryPredicates predicates() {
     return predicates;
   }
 
-  SpiOrmQueryRequest<?> getQueryRequest() {
+  SpiOrmQueryRequest<?> request() {
     return request;
   }
 
@@ -362,7 +362,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
    * Return the persistence context.
    */
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public PersistenceContext persistenceContext() {
     return request.persistenceContext();
   }
 
@@ -371,7 +371,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
     if (lazyLoadParentId != null) {
       if (!lazyLoadParentId.equals(this.lazyLoadParentId)) {
         // get the appropriate parent bean from the persistence context
-        this.lazyLoadParentBean = (EntityBean) lazyLoadManyProperty.descriptor().contextGet(getPersistenceContext(), lazyLoadParentId);
+        this.lazyLoadParentBean = (EntityBean) lazyLoadManyProperty.descriptor().contextGet(persistenceContext(), lazyLoadParentId);
         this.lazyLoadParentId = lazyLoadParentId;
       }
       // add the loadedBean to the appropriate collection of lazyLoadParentBean
@@ -451,7 +451,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
     return true;
   }
 
-  long getQueryExecutionTimeMicros() {
+  long queryExecutionTimeMicros() {
     return executionTimeMicros;
   }
 
@@ -546,7 +546,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
       if (queryPlan.executionTime(executionTimeMicros)) {
         queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros);
       }
-      getTransaction().profileEvent(this);
+      transaction().profileEvent(this);
     } catch (Exception e) {
       CoreLog.log.error("Error updating execution statistics", e);
     }
@@ -554,7 +554,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
 
   @Override
   public void profile() {
-    getTransaction()
+    transaction()
       .profileStream()
       .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), loadedBeanCount, query.getProfileId());
   }
@@ -567,7 +567,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
     }
   }
 
-  String getLoadedRowDetail() {
+  String loadedRowDetail() {
     if (manyProperty == null) {
       return String.valueOf(rowCount);
     } else {
@@ -601,30 +601,29 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
   /**
    * Return the where predicate for display in the transaction log.
    */
-  String getLogWhereSql() {
+  String logWhereSql() {
     return logWhereSql;
   }
 
-
-  public String getBindLog() {
+  public String bindLog() {
     return bindLog;
   }
 
-  public SpiTransaction getTransaction() {
+  public SpiTransaction transaction() {
     return request.transaction();
   }
 
   /**
    * Return the short bean name.
    */
-  String getBeanName() {
+  String beanName() {
     return desc.name();
   }
 
   /**
    * Return the generated sql.
    */
-  public String getGeneratedSql() {
+  public String generatedSql() {
     return sql;
   }
 
@@ -676,7 +675,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
   void auditFind(EntityBean bean) {
     if (bean != null) {
       // only audit when a bean was actually found
-      desc.readAuditBean(queryPlan.getAuditQueryKey(), bindLog, bean);
+      desc.readAuditBean(queryPlan.auditQueryKey(), bindLog, bean);
     }
   }
 
@@ -689,11 +688,11 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
       ReadEvent futureReadEvent = query.getFutureFetchAudit();
       if (futureReadEvent == null) {
         // normal query execution
-        desc.readAuditMany(queryPlan.getAuditQueryKey(), bindLog, auditIds);
+        desc.readAuditMany(queryPlan.auditQueryKey(), bindLog, auditIds);
       } else {
         // this query was executed via findFutureList() and the prepare()
         // has already been called so set the details and log
-        futureReadEvent.setQueryKey(queryPlan.getAuditQueryKey());
+        futureReadEvent.setQueryKey(queryPlan.auditQueryKey());
         futureReadEvent.setBindLog(bindLog);
         futureReadEvent.setIds(auditIds);
         desc.readAuditFutureMany(futureReadEvent);
@@ -712,7 +711,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
    * Send the current buffer of findIterate collected ids to the audit log.
    */
   private void auditIterateLogMessage() {
-    desc.readAuditMany(queryPlan.getAuditQueryKey(), bindLog, auditIds);
+    desc.readAuditMany(queryPlan.auditQueryKey(), bindLog, auditIds);
     // create a new list on demand with the next bean/id
     auditIds = null;
   }
@@ -733,7 +732,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
   /**
    * Return the underlying PreparedStatement.
    */
-  PreparedStatement getPstmt() {
+  PreparedStatement pstmt() {
     return pstmt;
   }
 
@@ -742,7 +741,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
     query.handleLoadError(fullName, e);
   }
 
-  public Set<String> getDependentTables() {
-    return queryPlan.getDependentTables();
+  public Set<String> dependentTables() {
+    return queryPlan.dependentTables();
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 3ced1ac0b..ed9cbea6c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -347,7 +347,7 @@ final class CQueryBuilder {
     BeanDescriptor<T> desc = request.descriptor();
     if (desc.isReadAuditing()) {
       // log the query plan based bean type (i.e. ignoring query disabling for logging the sql/plan)
-      desc.readAuditLogger().queryPlan(new ReadAuditQueryPlan(desc.fullName(), queryPlan.getAuditQueryKey(), queryPlan.getSql()));
+      desc.readAuditLogger().queryPlan(new ReadAuditQueryPlan(desc.fullName(), queryPlan.auditQueryKey(), queryPlan.sql()));
     }
     // cache the query plan because we can reuse it and also
     // gather query performance statistics based on it.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 416da3c31..26d728c36 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -331,10 +331,10 @@ public final class CQueryEngine {
       if (request.logSql()) {
         logSql(cquery);
       }
-      return new SpiResultSet(cquery.getPstmt(), resultSet);
+      return new SpiResultSet(cquery.pstmt(), resultSet);
 
     } catch (SQLException e) {
-      JdbcClose.close(cquery.getPstmt());
+      JdbcClose.close(cquery.pstmt());
       throw cquery.createPersistenceException(e);
     }
   }
@@ -366,7 +366,7 @@ public final class CQueryEngine {
       }
       request.executeSecondaryQueries(false);
       if (request.isQueryCachePut()) {
-        request.addDependentTables(cquery.getDependentTables());
+        request.addDependentTables(cquery.dependentTables());
       }
       return beanCollection;
 
@@ -414,14 +414,14 @@ public final class CQueryEngine {
    * Log the generated SQL to the transaction log.
    */
   private void logSql(CQuery<?> query) {
-    query.getTransaction().logSql(Str.add(query.getGeneratedSql(), "; --bind(", query.getBindLog(), ") --micros(", query.micros() + ")"));
+    query.transaction().logSql(Str.add(query.generatedSql(), "; --bind(", query.bindLog(), ") --micros(", query.micros() + ")"));
   }
 
   /**
    * Log the FindById summary to the transaction log.
    */
   private void logFindBeanSummary(CQuery<?> q) {
-    SpiQuery<?> query = q.getQueryRequest().query();
+    SpiQuery<?> query = q.request().query();
     String loadMode = query.getLoadMode();
     String loadDesc = query.getLoadDescription();
     String lazyLoadProp = query.getLazyLoadProperty();
@@ -438,7 +438,7 @@ public final class CQueryEngine {
     if (loadMode != null) {
       msg.append("mode[").append(loadMode).append("] ");
     }
-    msg.append("type[").append(q.getBeanName()).append("] ");
+    msg.append("type[").append(q.beanName()).append("] ");
     if (query.isAutoTuned()) {
       msg.append("tuned[true] ");
     }
@@ -454,17 +454,17 @@ public final class CQueryEngine {
     if (loadDesc != null) {
       msg.append("load[").append(loadDesc).append("] ");
     }
-    msg.append("exeMicros[").append(q.getQueryExecutionTimeMicros());
-    msg.append("] rows[").append(q.getLoadedRowDetail());
-    msg.append("] bind[").append(q.getBindLog()).append("]");
-    q.getTransaction().logSummary(msg.toString());
+    msg.append("exeMicros[").append(q.queryExecutionTimeMicros());
+    msg.append("] rows[").append(q.loadedRowDetail());
+    msg.append("] bind[").append(q.bindLog()).append("]");
+    q.transaction().logSummary(msg.toString());
   }
 
   /**
    * Log the FindMany to the transaction log.
    */
   private void logFindManySummary(CQuery<?> q) {
-    SpiQuery<?> query = q.getQueryRequest().query();
+    SpiQuery<?> query = q.request().query();
     String loadMode = query.getLoadMode();
     String loadDesc = query.getLoadDescription();
     String lazyLoadProp = query.getLazyLoadProperty();
@@ -482,7 +482,7 @@ public final class CQueryEngine {
     if (loadMode != null) {
       msg.append("mode[").append(loadMode).append("] ");
     }
-    msg.append("type[").append(q.getBeanName()).append("] ");
+    msg.append("type[").append(q.beanName()).append("] ");
     if (query.isAutoTuned()) {
       msg.append("tuned[true] ");
     }
@@ -498,10 +498,10 @@ public final class CQueryEngine {
     if (loadDesc != null) {
       msg.append("load[").append(loadDesc).append("] ");
     }
-    msg.append("exeMicros[").append(q.getQueryExecutionTimeMicros());
-    msg.append("] rows[").append(q.getLoadedRowDetail());
-    msg.append("] predicates[").append(q.getLogWhereSql());
-    msg.append("] bind[").append(q.getBindLog()).append("]");
-    q.getTransaction().logSummary(msg.toString());
+    msg.append("exeMicros[").append(q.queryExecutionTimeMicros());
+    msg.append("] rows[").append(q.loadedRowDetail());
+    msg.append("] predicates[").append(q.logWhereSql());
+    msg.append("] bind[").append(q.bindLog()).append("]");
+    q.transaction().logSummary(msg.toString());
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index 747793e85..37ed9e1ab 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -15,9 +15,7 @@ import io.ebeaninternal.server.type.RsetDataReader;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -49,11 +47,11 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca
     this.request = request;
     this.queryPlan = queryPlan;
     this.query = request.query();
-    this.sql = queryPlan.getSql();
+    this.sql = queryPlan.sql();
     this.desc = request.descriptor();
     this.predicates = predicates;
     this.containsCounts = containsCounts;
-    this.reader = queryPlan.getSingleAttributeScalarType();
+    this.reader = queryPlan.singleAttributeScalarType();
     query.setGeneratedSql(sql);
   }
 
@@ -168,7 +166,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca
   }
 
   Set<String> getDependentTables() {
-    return queryPlan.getDependentTables();
+    return queryPlan.dependentTables();
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 5ce73fc62..bdcd7c372 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -157,39 +157,39 @@ public class CQueryPlan implements SpiQueryPlan {
   }
 
   @Override
-  public final Class<?> getBeanType() {
+  public final Class<?> beanType() {
     return beanType;
   }
 
   @Override
-  public final String getName() {
+  public final String name() {
     return name;
   }
 
   @Override
-  public final String getHash() {
+  public final String hash() {
     return hash;
   }
 
   @Override
-  public final String getSql() {
+  public final String sql() {
     return sql;
   }
 
   @Override
-  public final ProfileLocation getProfileLocation() {
+  public final ProfileLocation profileLocation() {
     return profileLocation;
   }
 
-  public final String getLabel() {
+  public final String label() {
     return label;
   }
 
-  public final Set<String> getDependentTables() {
+  public final Set<String> dependentTables() {
     return dependentTables;
   }
 
-  public final String getLocation() {
+  public final String location() {
     return location;
   }
 
@@ -200,7 +200,7 @@ public class CQueryPlan implements SpiQueryPlan {
 
   @Override
   public final DQueryPlanOutput createMeta(String bind, String planString) {
-    return new DQueryPlanOutput(getBeanType(), name, hash, sql, profileLocation, bind, planString);
+    return new DQueryPlanOutput(beanType(), name, hash, sql, profileLocation, bind, planString);
   }
 
   public DataReader createDataReader(ResultSet rset) {
@@ -230,14 +230,14 @@ public class CQueryPlan implements SpiQueryPlan {
     return dataBind;
   }
 
-  final int getAsOfTableCount() {
+  final int asOfTableCount() {
     return asOfTableCount;
   }
 
   /**
    * Return a key used in audit logging to identify the query.
    */
-  final String getAuditQueryKey() {
+  final String auditQueryKey() {
     if (auditQueryHash == null) {
       // volatile object assignment (so happy for multithreaded access)
       auditQueryHash = calcAuditQueryKey();
@@ -250,7 +250,7 @@ public class CQueryPlan implements SpiQueryPlan {
     return rawSql ? planKey.getPartialKey() + "_" + hash : planKey.getPartialKey();
   }
 
-  final SqlTreePlan getSqlTree() {
+  final SqlTreePlan sqlTree() {
     return sqlTree;
   }
 
@@ -258,7 +258,7 @@ public class CQueryPlan implements SpiQueryPlan {
     return rawSql;
   }
 
-  final String getLogWhereSql() {
+  final String logWhereSql() {
     return logWhereSql;
   }
 
@@ -287,11 +287,11 @@ public class CQueryPlan implements SpiQueryPlan {
   /**
    * Return the time this query plan was last used.
    */
-  public final long getLastQueryTime() {
+  public final long lastQueryTime() {
     return stats.getLastQueryTime();
   }
 
-  final ScalarDataReader<?> getSingleAttributeScalarType() {
+  final ScalarDataReader<?> singleAttributeScalarType() {
     return sqlTree.getRootNode().getSingleAttributeReader();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 6b6c3d66e..118450452 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -66,7 +66,7 @@ public final class CQueryPlanStats {
   }
 
   String reportName(MetricVisitor visitor) {
-    final String tmp = visitor.namingConvention().apply(queryPlan.getName());
+    final String tmp = visitor.namingConvention().apply(queryPlan.name());
     this.reportName = tmp;
     return tmp;
   }
@@ -95,12 +95,12 @@ public final class CQueryPlanStats {
 
     @Override
     public Class<?> type() {
-      return queryPlan.getBeanType();
+      return queryPlan.beanType();
     }
 
     @Override
     public String label() {
-      return queryPlan.getLabel();
+      return queryPlan.label();
     }
 
     @Override
@@ -110,7 +110,7 @@ public final class CQueryPlanStats {
 
     @Override
     public String location() {
-      return queryPlan.getLocation();
+      return queryPlan.location();
     }
 
     @Override
@@ -135,12 +135,12 @@ public final class CQueryPlanStats {
 
     @Override
     public String hash() {
-      return queryPlan.getHash();
+      return queryPlan.hash();
     }
 
     @Override
     public String sql() {
-      return queryPlan.getSql();
+      return queryPlan.sql();
     }
 
     @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index 783ffe852..dff185cc8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -111,7 +111,7 @@ public final class CQueryPredicates {
     }
     CQueryPlan queryPlan = request.queryPlan();
     if (queryPlan != null) {
-      int asOfTableCount = queryPlan.getAsOfTableCount();
+      int asOfTableCount = queryPlan.asOfTableCount();
       if (asOfTableCount > 0) {
         // bind the asOf value for each table alias as part of the from/join clauses
         // there is one effective date predicate per table alias
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
index da7def29b..6834f46d9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
@@ -42,7 +42,7 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer
     this.queryPlan = queryPlan;
     this.request = request;
     this.query = request.query();
-    this.sql = queryPlan.getSql();
+    this.sql = queryPlan.sql();
     this.desc = request.descriptor();
     this.predicates = predicates;
     query.setGeneratedSql(sql);
@@ -141,7 +141,7 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer
   }
 
   Set<String> getDependentTables() {
-    return queryPlan.getDependentTables();
+    return queryPlan.dependentTables();
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
index 8e7dfd1f5..20ad3fb44 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
@@ -38,7 +38,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery
     this.request = request;
     this.queryPlan = queryPlan;
     this.query = request.query();
-    this.sql = queryPlan.getSql();
+    this.sql = queryPlan.sql();
     this.desc = request.descriptor();
     this.predicates = predicates;
     query.setGeneratedSql(sql);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
index 8aab42e4e..d87f66ed6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
@@ -17,7 +17,7 @@ public final class QueryPlanLoggerExplain extends QueryPlanLogger {
 
   @Override
   public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) {
-    try (PreparedStatement explainStmt = conn.prepareStatement("EXPLAIN " + plan.getSql())) {
+    try (PreparedStatement explainStmt = conn.prepareStatement("EXPLAIN " + plan.sql())) {
       bind.prepare(explainStmt, conn);
       try (ResultSet rset = explainStmt.executeQuery()) {
         return readQueryPlan(plan, bind, rset);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
index 90c806dc0..f5454bb76 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
@@ -22,7 +22,7 @@ public final class QueryPlanLoggerOracle extends QueryPlanLogger {
   @Override
   public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) {
     try (Statement stmt = conn.createStatement()) {
-      try (PreparedStatement explainStmt = conn.prepareStatement("EXPLAIN PLAN FOR " + plan.getSql())) {
+      try (PreparedStatement explainStmt = conn.prepareStatement("EXPLAIN PLAN FOR " + plan.sql())) {
         bind.prepare(explainStmt, conn);
         explainStmt.execute();
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
index 9b5bed9a9..db99ef672 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
@@ -17,7 +17,7 @@ public final class QueryPlanLoggerPostgres extends QueryPlanLogger {
 
   @Override
   public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) {
-    String explain = "explain analyze " + plan.getSql();
+    String explain = "explain analyze " + plan.sql();
     try (PreparedStatement explainStmt = conn.prepareStatement(explain)) {
       bind.prepare(explainStmt, conn);
       try (ResultSet rset = explainStmt.executeQuery()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
index 0bec7e4db..75df42bc1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
@@ -24,7 +24,7 @@ public final class QueryPlanLoggerSqlServer extends QueryPlanLogger {
     try (Statement stmt = conn.createStatement()) {
       stmt.execute("set statistics xml on");
       stmt.execute("begin transaction");
-      try (PreparedStatement explainStmt = conn.prepareStatement(plan.getSql())) {
+      try (PreparedStatement explainStmt = conn.prepareStatement(plan.sql())) {
         bind.prepare(explainStmt, conn);
 
         try (ResultSet rset = explainStmt.executeQuery()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java
index a95ff951f..48b476d33 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java
@@ -163,8 +163,8 @@ class SqlTreeLoadBean implements SqlTreeLoad {
     }
 
     private void initPersistenceContext() {
-      queryMode = ctx.getQueryMode();
-      persistenceContext = (!readIdNormal) ? null : ctx.getPersistenceContext();
+      queryMode = ctx.queryMode();
+      persistenceContext = (!readIdNormal) ? null : ctx.persistenceContext();
     }
 
     private void readId() throws SQLException {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadRoot.java
index d1792ecbe..475dd9576 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadRoot.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadRoot.java
@@ -34,8 +34,8 @@ final class SqlTreeLoadRoot extends SqlTreeLoadBean implements SqlTreeRoot {
   public <T> Version<T> loadVersion(DbReadContext ctx) throws SQLException {
     // read the sys period lower and upper bounds
     // these are always the first 2 columns in the resultSet
-    Timestamp start = ctx.getDataReader().getTimestamp();
-    Timestamp end = ctx.getDataReader().getTimestamp();
+    Timestamp start = ctx.dataReader().getTimestamp();
+    Timestamp end = ctx.dataReader().getTimestamp();
     T bean = (T) load(ctx, null, null);
     return new Version<>(bean, start, end);
   }

From dd5bb3edff515c88b5d19d882b7dffdeb328df94 Mon Sep 17 00:00:00 2001
From: Flo <flo.k.exe@googlemail.com>
Date: Wed, 10 Aug 2022 12:48:02 +0200
Subject: [PATCH 002/127] Bump mariadb-java-client to 3.0.7

---
 ebean-test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 22e23e283..0db31e539 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -188,7 +188,7 @@
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
-      <version>2.6.0</version>
+      <version>3.0.7</version>
       <scope>test</scope>
     </dependency>
 

From e8afba7ed26c5caf92d7860a8d54a65d9281deae Mon Sep 17 00:00:00 2001
From: Flo <flo.k.exe@googlemail.com>
Date: Wed, 10 Aug 2022 19:26:40 +0200
Subject: [PATCH 003/127] Use fetch size 1 instead of Integer.MIN_VALUE

---
 .../src/main/java/io/ebeaninternal/server/query/CQuery.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index d153c359a..22c212d0c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -314,7 +314,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
       if (forwardOnlyHint) {
         // Use forward only hints for large resultSet processing (Issue 56, MySql specific)
         pstmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-        pstmt.setFetchSize(Integer.MIN_VALUE);
+        pstmt.setFetchSize(1);
       } else {
         pstmt = conn.prepareStatement(sql);
       }

From d703709f144d726843218ed08a18c3a28623360e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Aug 2022 15:50:17 +1200
Subject: [PATCH 004/127] #2784 - Correct documentation for
 TQRootBean.findSingleAttribute with @Nullable

---
 ebean-api/src/main/java/io/ebean/Query.java                    | 3 ++-
 .../src/main/java/io/ebean/typequery/TQRootBean.java           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index a9793a7ce..0d0fe1e5e 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -931,7 +931,7 @@ public interface Query<T> extends CancelableQuery {
   <A> Set<A> findSingleAttributeSet();
 
   /**
-   * Execute a query returning a single value of a single property/column.
+   * Execute a query returning a single value or null for a single property/column.
    * <p>
    * <pre>{@code
    *
@@ -943,6 +943,7 @@ public interface Query<T> extends CancelableQuery {
    *
    * }</pre>
    */
+  @Nullable
   <A> A findSingleAttribute();
 
   /**
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 7f8621fb0..a7b24a85b 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -1767,7 +1767,7 @@ public abstract class TQRootBean<T, R> {
   }
 
   /**
-   * Execute the query returning a single value for a single property.
+   * Execute the query returning a single value or null for a single property.
    * <p>
    * <h3>Example</h3>
    * <pre>{@code
@@ -1781,6 +1781,7 @@ public abstract class TQRootBean<T, R> {
    *
    * @return the list of values for the selected property
    */
+  @Nullable
   public <A> A findSingleAttribute() {
     return query.findSingleAttribute();
   }

From 4523db85c3e2bd6762b33087cc069266e8259d45 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 12 Aug 2022 15:54:09 +1200
Subject: [PATCH 005/127] Fix for generated migration index files in test

---
 .../migrationtest/dbmigration/oracle/idx_oracle.migrations      | 2 +-
 .../migrationtest/dbmigration/oracle11/idx_oracle.migrations    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations
index d2a58f4d3..cf60af39b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations
@@ -3,6 +3,6 @@
 930172034,      1.2__dropsFor_1.1.sql
 -1621367223,    1.3.sql
 663051206,      1.4__dropsFor_1.3.sql
-13.7.1-SNAPSHOT1733,     R__oracle_only_views.sql
+1357801733,     R__oracle_only_views.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
index 52bdd2b16..d50ab5194 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
@@ -3,6 +3,6 @@
 930172034,      1.2__dropsFor_1.1.sql
 -144959080,     1.3.sql
 663051206,      1.4__dropsFor_1.3.sql
-13.7.1-SNAPSHOT1733,     R__oracle_only_views.sql
+1357801733,     R__oracle_only_views.sql
 561281075,      R__order_views.sql
 

From 73bc9e516e904dab24e19a5179017d487dc1f214 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 15 Aug 2022 15:14:57 +1200
Subject: [PATCH 006/127] Revert "Migrate to Jakarta JAXB (jakarta.xml.bind <-
 javax.xml.bind)"

---
 ebean-autotune/pom.xml                           | 13 ++++---------
 .../server/autotune/model/Autotune.java          |  8 ++++----
 .../server/autotune/model/ObjectFactory.java     |  2 +-
 .../server/autotune/model/Origin.java            | 10 +++++-----
 .../server/autotune/model/ProfileDiff.java       |  8 ++++----
 .../server/autotune/model/ProfileEmpty.java      |  8 ++++----
 .../server/autotune/model/ProfileNew.java        |  8 ++++----
 .../server/autotune/model/package-info.java      |  2 +-
 .../autotune/service/AutoTuneXmlReader.java      |  6 +++---
 .../autotune/service/AutoTuneXmlWriter.java      |  6 +++---
 ebean-autotune/src/main/java/module-info.java    |  3 ++-
 ebean-ddl-generator/pom.xml                      | 14 +++++---------
 .../io/ebeaninternal/dbmigration/Detect.java     |  2 +-
 .../dbmigration/migration/AddColumn.java         |  2 +-
 .../dbmigration/migration/AddHistoryTable.java   |  2 +-
 .../dbmigration/migration/AddTableComment.java   |  2 +-
 .../migration/AddUniqueConstraint.java           |  2 +-
 .../dbmigration/migration/AlterColumn.java       |  2 +-
 .../dbmigration/migration/AlterForeignKey.java   |  2 +-
 .../dbmigration/migration/AlterHistoryTable.java |  2 +-
 .../dbmigration/migration/AlterTable.java        |  2 +-
 .../dbmigration/migration/Application.java       |  2 +-
 .../dbmigration/migration/Applications.java      |  8 ++++----
 .../dbmigration/migration/Apply.java             |  2 +-
 .../dbmigration/migration/ChangeSet.java         |  2 +-
 .../dbmigration/migration/ChangeSetType.java     |  6 +++---
 .../dbmigration/migration/Column.java            |  2 +-
 .../dbmigration/migration/Configuration.java     |  2 +-
 .../dbmigration/migration/CreateIndex.java       |  2 +-
 .../dbmigration/migration/CreateSchema.java      |  2 +-
 .../dbmigration/migration/CreateTable.java       |  2 +-
 .../dbmigration/migration/DdlScript.java         |  2 +-
 .../dbmigration/migration/DefaultTablespace.java |  2 +-
 .../dbmigration/migration/DropColumn.java        |  2 +-
 .../dbmigration/migration/DropHistoryTable.java  |  2 +-
 .../dbmigration/migration/DropIndex.java         |  2 +-
 .../dbmigration/migration/DropTable.java         |  2 +-
 .../dbmigration/migration/ForeignKey.java        |  2 +-
 .../dbmigration/migration/IdentityType.java      |  6 +++---
 .../dbmigration/migration/Migration.java         |  2 +-
 .../dbmigration/migration/ObjectFactory.java     |  2 +-
 .../dbmigration/migration/RenameColumn.java      |  2 +-
 .../dbmigration/migration/RenameTable.java       |  2 +-
 .../dbmigration/migration/Rollback.java          |  2 +-
 .../ebeaninternal/dbmigration/migration/Sql.java |  2 +-
 .../dbmigration/migration/UniqueConstraint.java  |  2 +-
 .../dbmigration/migration/package-info.java      |  2 +-
 .../migrationreader/MigrationXmlReader.java      |  6 +++---
 .../migrationreader/MigrationXmlWriter.java      |  6 +++---
 .../ebeaninternal/extraddl/model/DdlScript.java  | 12 ++++++------
 .../ebeaninternal/extraddl/model/ExtraDdl.java   | 10 +++++-----
 .../extraddl/model/ExtraDdlXmlReader.java        |  6 +++---
 .../extraddl/model/ObjectFactory.java            |  2 +-
 .../extraddl/model/package-info.java             |  2 +-
 .../src/main/java/module-info.java               |  2 +-
 ebean-externalmapping-xml/pom.xml                | 15 ++++++++-------
 .../xmlmapping/XmlMappingReader.java             |  6 +++---
 .../xmlmapping/model/ObjectFactory.java          |  2 +-
 .../xmlmapping/model/XmAliasMapping.java         | 10 +++++-----
 .../xmlmapping/model/XmColumnMapping.java        | 10 +++++-----
 .../io/ebeaninternal/xmlmapping/model/XmDto.java | 12 ++++++------
 .../ebeaninternal/xmlmapping/model/XmEbean.java  | 10 +++++-----
 .../ebeaninternal/xmlmapping/model/XmEntity.java | 12 ++++++------
 .../xmlmapping/model/XmNamedQuery.java           | 12 ++++++------
 .../ebeaninternal/xmlmapping/model/XmQuery.java  | 10 +++++-----
 .../ebeaninternal/xmlmapping/model/XmRawSql.java | 12 ++++++------
 .../xmlmapping/model/package-info.java           |  2 +-
 .../src/main/java/module-info.java               |  3 ++-
 ebean-test/pom.xml                               | 16 +++++++++-------
 ebean-test/src/main/java/module-info.java        |  2 +-
 70 files changed, 174 insertions(+), 178 deletions(-)

diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 500b98f4d..a8b20c069 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -32,15 +32,10 @@
 
     <!-- needed for java 11+ -->
     <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>4.0.0</version>
-      <scope>runtime</scope>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>2.3.6</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java
index 9dc140779..f5b4954bb 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Autotune.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.autotune.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java
index 4f81e26e1..2e5d7eba3 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ObjectFactory.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.autotune.model;
 
-import jakarta.xml.bind.annotation.XmlRegistry;
+import javax.xml.bind.annotation.XmlRegistry;
 
 
 /**
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java
index 65b6cfc3f..6471d3877 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/Origin.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.server.autotune.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java
index 370ed7bc7..1738fead9 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileDiff.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.autotune.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java
index b038240ef..d22140aa8 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileEmpty.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.autotune.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java
index 0f2666fcb..7910acb84 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/ProfileNew.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.autotune.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java
index 86e328054..78deec068 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/model/package-info.java
@@ -1,2 +1,2 @@
-@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/autotune", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package io.ebeaninternal.server.autotune.model;
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java
index 42c93c7d7..3b0dd797f 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlReader.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.autotune.service;
 
 import io.ebeaninternal.server.autotune.model.Autotune;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java
index 9899ef77d..3a9fd859e 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/AutoTuneXmlWriter.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.server.autotune.service;
 
 import io.ebeaninternal.server.autotune.model.Autotune;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Marshaller;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/ebean-autotune/src/main/java/module-info.java b/ebean-autotune/src/main/java/module-info.java
index e53081272..6cb7d3a54 100644
--- a/ebean-autotune/src/main/java/module-info.java
+++ b/ebean-autotune/src/main/java/module-info.java
@@ -10,5 +10,6 @@ module io.ebean.autotune {
 
   requires io.ebean.api;
   requires io.ebean.core;
-  requires jakarta.xml.bind;
+  requires java.xml;
+  requires java.xml.bind;
 }
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 93d5108e7..ee7c5167a 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -39,16 +39,12 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- needed for java 11+ -->
     <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>4.0.0</version>
-      <scope>runtime</scope>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>2.3.6</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java
index f7d326c13..8a002f513 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java
@@ -11,6 +11,6 @@ public class Detect {
    * Return true if JAXB is present.
    */
   public static boolean isJAXBPresent(DatabaseConfig config) {
-    return config.getClassLoadConfig().isPresent("jakarta.xml.bind.JAXBException");
+    return config.getClassLoadConfig().isPresent("javax.xml.bind.JAXBException");
   }
 }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
index fdf57a999..2586acf89 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
index b4d12ede5..e8e6b9420 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
index 20326eb5b..630ccbce9 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
index 578fbf172..a53b6cb65 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
index 256ed1d64..7082c03e2 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
index 9a394b531..95996d71c 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
index 7f38df0fa..0f6d43dc0 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java
index 895b51c29..fc37c8e63 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 import java.math.BigInteger;
 
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
index 7240b5223..424c48a16 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
index 62b185d73..ae24ce457 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
index 2bcafcae5..a469e331a 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
index 2526468b1..edc22f380 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
index cdad503a7..8f15e8496 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.XmlEnum;
-import jakarta.xml.bind.annotation.XmlEnumValue;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
index aa9e7f814..995c01fb9 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
index d065a09ab..62c0deb46 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
index 0380942a6..f0ec659d7 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java
index a1bb5a44b..cc45c3b44 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
index 13187d594..4c303d97d 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
index 758a0f28c..e85add7c2 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
index 36bb0f2b3..25b63ad80 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
index 473560549..7c9906d83 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
index 1ccdcaf8a..65b15e979 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
index e37065ad6..1104b31d1 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
index 48a241819..640c53ed1 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
index 05bcbcd55..7673fa881 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
index be5b2aa25..50eba9dad 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.XmlEnum;
-import jakarta.xml.bind.annotation.XmlEnumValue;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
index 9b455358e..78bc2ef99 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
index 0266a5a50..85e04f4a7 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.XmlRegistry;
+import javax.xml.bind.annotation.XmlRegistry;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
index 052b72be1..4535c5eec 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
index 423e00618..6e45cbba8 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
index bb0cf2838..893356679 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
index 8702ec7fe..954ac5a02 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
index 08bd1ed7d..47b22f02e 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.dbmigration.migration;
 
-import jakarta.xml.bind.annotation.*;
+import javax.xml.bind.annotation.*;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
index 8f7b350c2..f52bba831 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java
@@ -1,2 +1,2 @@
-@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package io.ebeaninternal.dbmigration.migration;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
index bac25a508..e93260ba9 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.dbmigration.migrationreader;
 
 import io.ebeaninternal.dbmigration.migration.Migration;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
index 12c50e9cf..c887fc2b0 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java
@@ -4,9 +4,9 @@ package io.ebeaninternal.dbmigration.migrationreader;
 import io.ebean.util.IOUtils;
 import io.ebeaninternal.dbmigration.migration.Migration;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Marshaller;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
index 7fbcbd2d6..53819461f 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.extraddl.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java
index bdd2f45c2..2255ee88d 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.extraddl.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index f1b1ed262..eac6284d5 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -4,9 +4,9 @@ import io.ebean.annotation.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java
index 320fced06..20cf3cd46 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.extraddl.model;
 
-import jakarta.xml.bind.annotation.XmlRegistry;
+import javax.xml.bind.annotation.XmlRegistry;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java
index b4f69f462..c8e18d1dc 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java
@@ -1,2 +1,2 @@
-@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package io.ebeaninternal.extraddl.model;
diff --git a/ebean-ddl-generator/src/main/java/module-info.java b/ebean-ddl-generator/src/main/java/module-info.java
index d3a8affe5..1a7ef332e 100644
--- a/ebean-ddl-generator/src/main/java/module-info.java
+++ b/ebean-ddl-generator/src/main/java/module-info.java
@@ -7,7 +7,7 @@ module io.ebean.ddl.generator {
 
   requires transitive io.ebean.ddl.runner;
   requires transitive io.ebean.core;
-  requires transitive jakarta.xml.bind;
+  requires transitive java.xml.bind;
   requires io.ebean.core.type;
   requires io.ebean.migration;
 
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 187c78c46..1dbde4ab0 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -32,15 +32,16 @@
     </dependency>
 
     <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>4.0.0</version>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>2.3.6</version>
     </dependency>
+
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>4.0.0</version>
-      <scope>runtime</scope>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <version>1.2.1</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
index bb0ca2e5b..8b28975ef 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
@@ -3,9 +3,9 @@ package io.ebeaninternal.xmlmapping;
 import io.avaje.classpath.scanner.Resource;
 import io.ebeaninternal.xmlmapping.model.XmEbean;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java
index b4933a796..7d10dde8d 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/ObjectFactory.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import jakarta.xml.bind.annotation.XmlRegistry;
+import javax.xml.bind.annotation.XmlRegistry;
 
 
 /**
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java
index 3b1bc00ab..82f4da7d6 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmAliasMapping.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java
index a3e561ef8..a992971cb 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmColumnMapping.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
index 35f6403a8..57e431322 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmDto.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
index 448ab9928..35ba42d58 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEbean.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java
index a6d390543..daf352993 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmEntity.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java
index 9026c941b..644075c7b 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmNamedQuery.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java
index 449674ddf..236cd3817 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmQuery.java
@@ -1,10 +1,10 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
-import jakarta.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
 
 
 /**
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java
index cbf078fde..52455aa49 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/XmRawSql.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.xmlmapping.model;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java
index 74608576d..1822923b4 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/model/package-info.java
@@ -1,2 +1,2 @@
-@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/ebean", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/ebean", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package io.ebeaninternal.xmlmapping.model;
diff --git a/ebean-externalmapping-xml/src/main/java/module-info.java b/ebean-externalmapping-xml/src/main/java/module-info.java
index 6283e637b..de792b2df 100644
--- a/ebean-externalmapping-xml/src/main/java/module-info.java
+++ b/ebean-externalmapping-xml/src/main/java/module-info.java
@@ -10,7 +10,8 @@ module io.ebean.xmapping.xml {
   provides XmapService with JaxbXmapService;
 
   requires transitive io.ebean.xmapping.api;
-  requires transitive jakarta.xml.bind;
+  requires transitive java.xml;
+  requires transitive java.xml.bind;
   requires io.avaje.classpath.scanner.api;
   requires io.avaje.classpath.scanner;
   requires static org.slf4j;
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 22e23e283..896e33ffb 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -73,15 +73,17 @@
 
     <!-- Including JAXB for DB Migration generation with Java 11+ -->
     <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
-      <version>4.0.0</version>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>2.3.6</version>
     </dependency>
+
+    <!-- Needed for module path compile, jaxb foo bar needs review -->
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>4.0.0</version>
-      <scope>runtime</scope>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <version>1.2.1</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- Not strictly required but bring in H2 Driver because we use it so much -->
diff --git a/ebean-test/src/main/java/module-info.java b/ebean-test/src/main/java/module-info.java
index d34ce12bd..a23d1e65b 100644
--- a/ebean-test/src/main/java/module-info.java
+++ b/ebean-test/src/main/java/module-info.java
@@ -20,7 +20,7 @@ module io.ebean.test {
 
   requires transitive io.ebean.test.containers;
   requires transitive org.assertj.core;
-  requires transitive jakarta.xml.bind;
+  requires transitive java.xml.bind;
   requires transitive com.h2database;
 
   // support testing

From 595c0579644f3e465e2a86a8644777657a195a57 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 16 Aug 2022 17:03:07 +1200
Subject: [PATCH 007/127] #2784 - Fix @Return javadoc for
 TQRootBean.findSingleAttribute()

---
 .../src/main/java/io/ebean/typequery/TQRootBean.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index a7b24a85b..ef3565711 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -1779,7 +1779,7 @@ public abstract class TQRootBean<T, R> {
    *
    * }</pre>
    *
-   * @return the list of values for the selected property
+   * @return a single value or null for the selected property
    */
   @Nullable
   public <A> A findSingleAttribute() {

From 50d45c6da927d24d1f86f2e2602e5e688c8ebd40 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Aug 2022 15:21:16 +1200
Subject: [PATCH 008/127] Just use String.intern() now that we are on min Java
 11 runtime.

---
 .../server/core/InternString.java             | 26 +------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternString.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternString.java
index 8a06fc4d4..dadfdb368 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternString.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternString.java
@@ -1,38 +1,14 @@
 package io.ebeaninternal.server.core;
 
-import java.util.HashMap;
-import java.util.concurrent.locks.ReentrantLock;
-
 /**
  * Used to reduce memory consumption of strings used in deployment processing.
- * <p>
- * Using this for now instead of String.intern() to avoid any unexpected
- * increase in PermGen space.
  */
 public final class InternString {
 
-  private static final HashMap<String, String> map = new HashMap<>();
-
-  private static final ReentrantLock lock = new ReentrantLock();
-
   /**
    * Return the shared instance of this string.
    */
   public static String intern(String s) {
-    if (s == null) {
-      return null;
-    }
-    lock.lock();
-    try {
-      String v = map.get(s);
-      if (v != null) {
-        return v;
-      } else {
-        map.put(s, s);
-        return s;
-      }
-    } finally {
-      lock.unlock();
-    }
+    return s == null ? null : s.intern();
   }
 }

From 507027df0ae048b1cee2a41fb3795e3187b12385 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Aug 2022 16:17:26 +1200
Subject: [PATCH 009/127] #2782 #2783 - Forward only fetchSize() for MySql and
 MariaDB is Integer.MIN_VALUE and 1 respectively

---
 .../server/core/OrmQueryEngine.java           |  2 ++
 .../server/core/OrmQueryRequest.java          |  4 +++
 .../io/ebeaninternal/server/query/CQuery.java |  2 +-
 .../server/query/CQueryEngine.java            | 12 +++----
 .../server/query/DefaultOrmQueryEngine.java   | 32 ++++---------------
 5 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java
index d3ca32b6d..d29beebe0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java
@@ -73,4 +73,6 @@ public interface OrmQueryEngine {
    * Return true if multi-value bind is supported for this type (and current platform).
    */
   boolean isMultiValueSupported(Class<?> valueType);
+
+  int forwardOnlyFetchSize();
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 423d6687b..6388de507 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -761,4 +761,8 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   public boolean isInlineSqlUpdateLimit() {
     return query.getMaxRows() < 1 || server.databasePlatform().isInlineSqlUpdateLimit();
   }
+
+  public int forwardOnlyFetchSize() {
+    return queryEngine.forwardOnlyFetchSize();
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index f8fd3144f..22b440e42 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -314,7 +314,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
       if (forwardOnlyHint) {
         // Use forward only hints for large resultSet processing (Issue 56, MySql specific)
         pstmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
-        pstmt.setFetchSize(1);
+        pstmt.setFetchSize(request.forwardOnlyFetchSize());
       } else {
         pstmt = conn.prepareStatement(sql);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 26d728c36..df78f11e7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.query;
 import io.ebean.QueryIterator;
 import io.ebean.ValuePair;
 import io.ebean.Version;
+import io.ebean.annotation.Platform;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.ObjectGraphNode;
@@ -32,19 +33,13 @@ import java.util.*;
 public final class CQueryEngine {
 
   private static final Logger log = CoreLog.log;
-
   private static final String T0 = "t0";
 
   private final int defaultFetchSizeFindList;
-
   private final int defaultFetchSizeFindEach;
-
   private final boolean forwardOnlyHintOnFindIterate;
-
   private final CQueryBuilder queryBuilder;
-
   private final CQueryHistorySupport historySupport;
-
   private final DatabasePlatform dbPlatform;
 
   public CQueryEngine(DatabaseConfig config, DatabasePlatform dbPlatform, Binder binder, Map<String, String> asOfTableMapping, Map<String, String> draftTableMap) {
@@ -56,6 +51,11 @@ public final class CQueryEngine {
     this.queryBuilder = new CQueryBuilder(dbPlatform, binder, historySupport, new CQueryDraftSupport(draftTableMap));
   }
 
+  public int forwardOnlyFetchSize() {
+    Platform base = dbPlatform.getPlatform().base();
+    return Platform.MYSQL == base ? Integer.MIN_VALUE : 1;
+  }
+
   public <T> CQuery<T> buildQuery(OrmQueryRequest<T> request) {
     return queryBuilder.buildQuery(request);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
index 95c5dbe7e..98a2ca471 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java
@@ -17,25 +17,19 @@ import javax.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
-/**
- * Main Finder implementation.
- */
 public final class DefaultOrmQueryEngine implements OrmQueryEngine {
 
-  /**
-   * Find using predicates
-   */
   private final CQueryEngine queryEngine;
-
   private final Binder binder;
+  private final int forwardOnlyFetchSize;
 
   /**
    * Create the Finder.
    */
   public DefaultOrmQueryEngine(CQueryEngine queryEngine, Binder binder) {
     this.queryEngine = queryEngine;
+    this.forwardOnlyFetchSize = queryEngine.forwardOnlyFetchSize();
     this.binder = binder;
   }
 
@@ -44,6 +38,11 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
     return queryEngine.translate(request, bindLog, sql, e);
   }
 
+  @Override
+  public int forwardOnlyFetchSize() {
+    return forwardOnlyFetchSize;
+  }
+
   @Override
   public boolean isMultiValueSupported(Class<?> cls) {
     return binder.isMultiValueSupported(cls);
@@ -53,7 +52,6 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
    * Flushes the jdbc batch by default unless explicitly turned off on the transaction.
    */
   private <T> void flushJdbcBatchOnQuery(OrmQueryRequest<T> request) {
-
     SpiTransaction t = request.transaction();
     if (t.isFlushOnQuery()) {
       // before we perform a query, we need to flush any
@@ -65,14 +63,12 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
 
   @Override
   public <T> int delete(OrmQueryRequest<T> request) {
-
     flushJdbcBatchOnQuery(request);
     return queryEngine.delete(request);
   }
 
   @Override
   public <T> int update(OrmQueryRequest<T> request) {
-
     flushJdbcBatchOnQuery(request);
     return queryEngine.update(request);
   }
@@ -85,14 +81,12 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
 
   @Override
   public <T> int findCount(OrmQueryRequest<T> request) {
-
     flushJdbcBatchOnQuery(request);
     return queryEngine.findCount(request);
   }
 
   @Override
   public <A> List<A> findIds(OrmQueryRequest<?> request) {
-
     flushJdbcBatchOnQuery(request);
     return queryEngine.findIds(request);
   }
@@ -112,16 +106,13 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
 
   @Override
   public <T> List<Version<T>> findVersions(OrmQueryRequest<T> request) {
-
     flushJdbcBatchOnQuery(request);
     return queryEngine.findVersions(request);
   }
 
   @Override
   public <T> BeanCollection<T> findMany(OrmQueryRequest<T> request) {
-
     flushJdbcBatchOnQuery(request);
-
     BeanFindController finder = request.finder();
 
     BeanCollection<T> result;
@@ -131,13 +122,11 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
     } else {
       result = queryEngine.findMany(request);
     }
-
     if (finder != null) {
       result = finder.postProcessMany(request, result);
     }
 
     SpiQuery<T> query = request.query();
-
     if (result != null && request.isBeanCachePutMany()) {
       // load the individual beans into the bean cache
       BeanDescriptor<T> descriptor = request.descriptor();
@@ -146,7 +135,6 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
     }
 
     request.mergeCacheHits(result);
-
     if (request.isQueryCachePut()) {
       // load the query result into the query cache
       result.setReadOnly(true);
@@ -155,7 +143,6 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
         result = result.getShallowCopy();
       }
     }
-
     return result;
   }
 
@@ -164,9 +151,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
    */
   @Override
   public <T> T findId(OrmQueryRequest<T> request) {
-
     flushJdbcBatchOnQuery(request);
-
     BeanFindController finder = request.finder();
 
     T result;
@@ -175,15 +160,12 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
     } else {
       result = queryEngine.find(request);
     }
-
     if (finder != null) {
       result = finder.postProcess(request, result);
     }
-
     if (result != null && request.isBeanCachePut()) {
       request.descriptor().cacheBeanPut((EntityBean) result);
     }
-
     return result;
   }
 

From 51d2f52d1991e71657016e47f3eeab12aac8dac9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Aug 2022 17:25:28 +1200
Subject: [PATCH 010/127] #2782 - Support MariaDB jdbc driver update - Batched
 JDBC SQLException translation, SqlRow BLOB reading

- Batched JDBC SQLException translation - Need to dig into nested exception to get cause error state
- SqlRow BLOB reading - BLOB can come as LONGVARBINARY (TestRawSqlBuilder)
- Fix test for history using system time (TestHistoryInsert)
- Fix SqlQueryCancelTest
- Fix TestSqlUpdateExceptions
---
 .../config/dbplatform/SqlCodeTranslator.java     |  7 ++++++-
 .../server/rawsql/DRawSqlService.java            |  1 +
 .../server/rawsql/TestRawSqlBuilder.java         |  2 +-
 ebean-test/src/test/java/main/StartMariaDb.java  |  5 +++--
 .../org/tests/history/TestHistoryInsert.java     | 16 ++++++++++------
 .../tests/query/cancel/SqlQueryCancelTest.java   | 10 +++-------
 .../tests/update/TestSqlUpdateExceptions.java    |  6 +++---
 ebean-test/src/test/resources/ebean.properties   |  2 +-
 8 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java
index 8f7adc846..49fb32682 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java
@@ -32,7 +32,12 @@ public class SqlCodeTranslator implements SqlExceptionTranslator {
   }
 
   private DataErrorType getErrorType(SQLException e) {
-    DataErrorType errorType = map.get(e.getSQLState());
+    String sqlState = e.getSQLState();
+    while (sqlState == null && e.getCause() instanceof SQLException) {
+      e = (SQLException)e.getCause();
+      sqlState = e.getSQLState();
+    }
+    DataErrorType errorType = map.get(sqlState);
     if (errorType == null) {
       // fall back to error code
       errorType = map.get(String.valueOf(e.getErrorCode()));
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
index 8ffef8a33..3f8a2c2bc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlService.java
@@ -58,6 +58,7 @@ public final class DRawSqlService implements SpiRawSqlService {
           ret.put(name, resultSet.getString(i));
           break;
 
+        case Types.LONGVARBINARY:
         case Types.BLOB:
           ret.put(name, resultSet.getBytes(i));
           break;
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java
index 816ada0c8..56d0a3347 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java
@@ -298,7 +298,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
   }
 
   @Test
-  public void testBLobClosedConnection() throws Exception {
+  void testBLobClosedConnection() throws Exception {
     final PersistentFileContent pfc = new PersistentFileContent();
     final byte[] bytes = "This is the blob as String".getBytes(StandardCharsets.UTF_8);
     pfc.setContent(bytes);
diff --git a/ebean-test/src/test/java/main/StartMariaDb.java b/ebean-test/src/test/java/main/StartMariaDb.java
index 81b026828..671f13be5 100644
--- a/ebean-test/src/test/java/main/StartMariaDb.java
+++ b/ebean-test/src/test/java/main/StartMariaDb.java
@@ -5,11 +5,12 @@ import io.ebean.test.containers.MariaDBContainer;
 public class StartMariaDb {
 
   public static void main(String[] args) {
-    MariaDBContainer.builder("10.5")
+    MariaDBContainer.builder("10.6")
       .dbName("unit")
       .user("unit")
       .password("unit")
+      .port(5306)
       .build()
-      .startWithDropCreate();
+      .start();
   }
 }
diff --git a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java
index 2d0cf3b62..9234a0d2a 100644
--- a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java
+++ b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java
@@ -15,19 +15,23 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestHistoryInsert extends BaseTestCase {
+class TestHistoryInsert extends BaseTestCase {
 
   private final Logger logger = LoggerFactory.getLogger(TestHistoryInsert.class);
 
+  private Timestamp currentDbSystemTime() {
+    return DB.sqlQuery("select current_timestamp(6)").mapToScalar(Timestamp.class).findOne();
+  }
+
   /**
    * Looks like we MUST use useLegacyDatetimeCode=false ... in order for
    * the correct server timezone to be honored by the MariaDB JDBC driver.
    */
   @Test
   @ForPlatform({Platform.MARIADB})
-  public void mariadb_simple_history() {
+  void mariadb_simple_history() {
 
-    Timestamp t0 = new Timestamp(System.currentTimeMillis());
+    Timestamp t0 = currentDbSystemTime();
     littleSleep(50);
 
     User user = new User();
@@ -35,19 +39,19 @@ public class TestHistoryInsert extends BaseTestCase {
     user.setEmail("one@email.com");
     user.setPasswordHash("someHash");
     DB.save(user);
-    Timestamp t1 = new Timestamp(System.currentTimeMillis());
+    Timestamp t1 = currentDbSystemTime();
 
     littleSleep(100);
     user.setName("NotJim");
     user.save();
-    Timestamp t2 = new Timestamp(System.currentTimeMillis());
+    Timestamp t2 = currentDbSystemTime();
 
     littleSleep(100);
     user.setName("NotJimV2");
     user.setEmail("two@email.com");
     user.save();
     littleSleep(50);
-    Timestamp t3 = new Timestamp(System.currentTimeMillis());
+    Timestamp t3 = currentDbSystemTime();
 
     List<Version<User>> versions = DB.find(User.class).setId(user.getId()).findVersionsBetween(t0, t3);
     assertThat(versions).hasSize(3);
diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
index 5bdc8b186..31260a3a6 100644
--- a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
+++ b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java
@@ -59,7 +59,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
  *
  * @author Roland Praml, FOCONIS AG
  */
-public class SqlQueryCancelTest extends BaseTestCase {
+class SqlQueryCancelTest extends BaseTestCase {
 
   private final int timing = 20;
 
@@ -191,17 +191,13 @@ public class SqlQueryCancelTest extends BaseTestCase {
   }
 
   @Test
-  public void cancelOrmDtoDuringIterate() {
+  void cancelOrmDtoDuringIterate() {
     DtoQuery<EBasicDto> query = DB.find(EBasic.class).select("id,status").asDto(EBasicDto.class);
 
     QueryIterator<EBasicDto> iter = query.findIterate();
     assertThat(iter.hasNext()).isTrue();
     query.cancel();
-    if (isMariaDB()) {
-      assertThrows(PersistenceException.class, iter::next);
-    } else {
-      assertThat(iter.next()).isNotNull();
-    }
+    assertThat(iter.next()).isNotNull();
 
     // We might have 100 entities in a buffer. So we must iterate through all.
     assertThatThrownBy(() -> {
diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
index 333380318..244f1af33 100644
--- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
+++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
@@ -9,7 +9,7 @@ import java.util.UUID;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public class TestSqlUpdateExceptions extends BaseTestCase {
+class TestSqlUpdateExceptions extends BaseTestCase {
 
   private String sql = "insert into uuone (id, name, version) values (?,?,?)";
 
@@ -63,7 +63,7 @@ public class TestSqlUpdateExceptions extends BaseTestCase {
   }
 
   @Test
-  public void duplicateKey_inBatch() {
+  void duplicateKey_inBatch() {
     UUID id = UUID.randomUUID();
     assertThrows(DuplicateKeyException.class, () -> {
       try (Transaction transaction = DB.beginTransaction()) {
@@ -85,7 +85,7 @@ public class TestSqlUpdateExceptions extends BaseTestCase {
   }
 
   @Test
-  public void duplicateKey_executeBatch() {
+  void duplicateKey_executeBatch() {
     UUID id = UUID.randomUUID();
     assertThrows(DuplicateKeyException.class, () -> {
       try (Transaction transaction = DB.beginTransaction()) {
diff --git a/ebean-test/src/test/resources/ebean.properties b/ebean-test/src/test/resources/ebean.properties
index 91c0d0c29..9dec823ee 100644
--- a/ebean-test/src/test/resources/ebean.properties
+++ b/ebean-test/src/test/resources/ebean.properties
@@ -138,7 +138,7 @@ datasource.mysql.url=jdbc:mysql://127.0.0.1:4306/unit
 
 datasource.mariadb.username=unit
 datasource.mariadb.password=unit
-datasource.mariadb.url=jdbc:mariadb://localhost:4306/unit?useLegacyDatetimeCode=false
+datasource.mariadb.url=jdbc:mariadb://localhost:5306/unit?useLegacyDatetimeCode=false
 
 datasource.cockroach.username=root
 datasource.cockroach.password=

From 6c15115530153601e2fea237d6fbf380964cac15 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 17 Aug 2022 17:42:39 +1200
Subject: [PATCH 011/127] #2786 - Support logging Ebean version unknown

We don't really care if we can't determine the version so only log when we can read it.
---
 ebean-api/src/main/java/io/ebean/EbeanVersion.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-api/src/main/java/io/ebean/EbeanVersion.java b/ebean-api/src/main/java/io/ebean/EbeanVersion.java
index ec976a74e..c47a546c0 100644
--- a/ebean-api/src/main/java/io/ebean/EbeanVersion.java
+++ b/ebean-api/src/main/java/io/ebean/EbeanVersion.java
@@ -32,10 +32,10 @@ public final class EbeanVersion {
         if (in != null) {
           try (LineNumberReader reader = new LineNumberReader(new InputStreamReader(in))) {
             version = reader.readLine();
+            log.info("ebean version: {}", version);
           }
         }
       }
-      log.info("ebean version: {}", version);
     } catch (IOException e) {
       log.warn("Could not determine ebean version: {}", e.getMessage());
     }

From dc730fd97b22d70d8e30e34a66728314b8ea93db Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 08:23:52 +1200
Subject: [PATCH 012/127] #2788 - Support mapping @DbArray List<Float> to
 Postgres float4[]

---
 .../server/type/ArrayElementConverter.java    | 40 +++++++++----------
 .../server/type/ScalarTypeArrayList.java      |  3 ++
 .../server/type/ScalarTypeArrayListH2.java    |  3 ++
 .../org/tests/model/array/EArrayBean.java     | 21 ++++++++++
 .../tests/model/array/TestDbArray_basic.java  | 10 +++--
 5 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
index 9982124af..5617e752c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
@@ -17,7 +17,7 @@ interface ArrayElementConverter<T> {
   T fromSerialized(Object rawValue);
 
   /**
-   * Convert the array element from it's DB array form.
+   * Convert the array element from its DB array form.
    */
   T fromDbArray(Object rawValue);
 
@@ -25,31 +25,12 @@ interface ArrayElementConverter<T> {
     return objects;
   }
 
-  /**
-   * The UUID converter implementation.
-   */
   ArrayElementConverter<UUID> UUID = new UuidConverter();
-
-  /**
-   * The String converter implementation.
-   */
   ArrayElementConverter<String> STRING = new StringConverter();
-
-  /**
-   * The Long converter implementation.
-   */
   ArrayElementConverter<Long> LONG = new LongConverter();
-
-  /**
-   * The Integer converter implementation.
-   */
   ArrayElementConverter<Integer> INTEGER = new IntegerConverter();
-
-  /**
-   * The Double converter implementation.
-   */
   ArrayElementConverter<Double> DOUBLE = new DoubleConverter();
-
+  ArrayElementConverter<Float> FLOAT = new FloatConverter();
   ArrayElementConverter<BigDecimal> BIG_DECIMAL = new BigDecimalConverter();
 
   class LongConverter implements ArrayElementConverter<Long> {
@@ -86,6 +67,23 @@ interface ArrayElementConverter<T> {
     }
   }
 
+  class FloatConverter implements ArrayElementConverter<Float> {
+
+    @Override
+    public Float fromSerialized(Object rawValue) {
+      return fromDbArray(rawValue);
+    }
+
+    @Override
+    public Float fromDbArray(Object rawValue) {
+      if (rawValue instanceof Float) {
+        return (Float) rawValue;
+      } else {
+        return ((Number) rawValue).floatValue();
+      }
+    }
+  }
+
   class DoubleConverter implements ArrayElementConverter<Double> {
 
     @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index fdeef6a30..56ec0127e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -57,6 +57,9 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements ScalarTyp
         if (valueType.equals(Integer.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayList(nullable, "integer", DocPropertyType.INTEGER, ArrayElementConverter.INTEGER));
         }
+        if (valueType.equals(Float.class)) {
+          return cache.computeIfAbsent(key, s -> new ScalarTypeArrayList(nullable, "float4", DocPropertyType.DOUBLE, ArrayElementConverter.FLOAT));
+        }
         if (valueType.equals(Double.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayList(nullable, "float", DocPropertyType.DOUBLE, ArrayElementConverter.DOUBLE));
         }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
index 6e16fb018..c0651ded8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
@@ -48,6 +48,9 @@ final class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
         if (valueType.equals(Integer.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayListH2(nullable, "integer", DocPropertyType.INTEGER, ArrayElementConverter.INTEGER));
         }
+        if (valueType.equals(Float.class)) {
+          return cache.computeIfAbsent(key, s -> new ScalarTypeArrayListH2(nullable, "real", DocPropertyType.DOUBLE, ArrayElementConverter.FLOAT));
+        }
         if (valueType.equals(Double.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayListH2(nullable, "float", DocPropertyType.DOUBLE, ArrayElementConverter.DOUBLE));
         }
diff --git a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
index 6ff468209..2dcd62e76 100644
--- a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
+++ b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
@@ -41,6 +41,11 @@ public class EArrayBean {
   @DbArray
   List<BigDecimal> decimals;
 
+  @DbArray
+  List<Double> doubs;
+  @DbArray
+  List<Float> floats;
+
   @DbArray
   List<Status> statuses;
 
@@ -112,6 +117,22 @@ public class EArrayBean {
     this.decimals = decimals;
   }
 
+  public List<Double> getDoubs() {
+    return doubs;
+  }
+
+  public void setDoubs(List<Double> doubs) {
+    this.doubs = doubs;
+  }
+
+  public List<Float> getFloats() {
+    return floats;
+  }
+
+  public void setFloats(List<Float> floats) {
+    this.floats = floats;
+  }
+
   public List<Status> getStatuses() {
     return statuses;
   }
diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
index 8d413c34c..2f04f31ac 100644
--- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -43,6 +43,8 @@ class TestDbArray_basic extends BaseTestCase {
     bean.getOtherIds().add(96L);
     bean.getOtherIds().add(97L);
     bean.setDecimals(doubles);
+    bean.setDoubs(List.of(1.1d, 2.3d));
+    bean.setFloats(List.of(1.01f, 2.02f));
     bean.setStatuses(new ArrayList<>());
     bean.getStatuses().add(EArrayBean.Status.ONE);
     bean.getStatuses().add(EArrayBean.Status.THREE);
@@ -60,6 +62,8 @@ class TestDbArray_basic extends BaseTestCase {
     found = DB.find(EArrayBean.class, bean.getId());
 
     assertThat(found.getPhoneNumbers()).containsExactly("4321", "9823");
+    assertThat(found.getDoubs()).hasSize(2);
+    assertThat(found.getFloats()).hasSize(2);
 
     if (isPostgresCompatible()) {
       Query<EArrayBean> query = DB.find(EArrayBean.class)
@@ -277,9 +281,9 @@ class TestDbArray_basic extends BaseTestCase {
     List<String> phNumbers = bean.getPhoneNumbers();
     phNumbers.add("4321");
     phNumbers.add("9823");
-    List<BigDecimal> doubs = bean.getDecimals();
-    doubs.add(BigDecimal.valueOf(1.23));
-    doubs.add(BigDecimal.valueOf(4.56));
+    List<BigDecimal> decimals = bean.getDecimals();
+    decimals.add(BigDecimal.valueOf(1.23));
+    decimals.add(BigDecimal.valueOf(4.56));
     DB.save(bean);
     // Data is saved correctly
 

From 1bc9bab9883ed9546d06a558239fa2e234f9b843 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 10:19:02 +1200
Subject: [PATCH 013/127] #2794 - ebean-test-containers - Handle SQLServer
 specific occasional fail on start

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ef7fea6dc..28013be22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
     <ebean-ddl-runner.version>2.2</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
     <ebean-migration.version>13.6.0</ebean-migration.version>
-    <ebean-test-containers.version>6.2</ebean-test-containers.version>
+    <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.2</ebean-datasource.version>
     <ebean-agent.version>13.7.0</ebean-agent.version>
     <ebean-maven-plugin.version>13.7.0</ebean-maven-plugin.version>

From c0a3f7e05d3e4cb61f8279ee2268e2ffc98648a3 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 11:11:12 +1200
Subject: [PATCH 014/127] Refactor rename internal methods -
 io.ebeaninternal.server.query

---
 .../io/ebeaninternal/api/CQueryPlanKey.java   |  2 +-
 .../server/core/DefaultServer.java            |  6 +--
 .../server/core/OrmQueryRequest.java          |  2 +-
 .../deploy/AssocOneHelpRefExported.java       |  4 +-
 .../server/deploy/AssocOneHelpRefInherit.java |  6 +--
 .../server/deploy/BeanProperty.java           |  4 +-
 .../server/deploy/BeanPropertyAssocMany.java  |  2 +-
 .../server/deploy/BeanPropertyAssocOne.java   |  2 +-
 .../server/deploy/DbSqlContext.java           | 10 ++---
 .../server/deploy/TableJoin.java              | 12 +++---
 .../expression/ExistsQueryExpression.java     |  2 +-
 .../server/expression/InQueryExpression.java  |  2 +-
 .../server/persist/DefaultPersister.java      |  5 +--
 .../io/ebeaninternal/server/query/CQuery.java |  4 +-
 .../server/query/CQueryBindCapture.java       |  4 +-
 .../server/query/CQueryBuilder.java           | 42 +++++++++----------
 .../server/query/CQueryBuilderRawSql.java     | 15 +++----
 .../server/query/CQueryDraftSupport.java      |  2 +-
 .../server/query/CQueryEngine.java            | 32 +++++++-------
 .../query/CQueryFetchSingleAttribute.java     | 19 +++++----
 .../server/query/CQueryHistorySupport.java    | 10 ++---
 .../server/query/CQueryIteratorSimple.java    |  2 -
 .../server/query/CQueryOrderBy.java           |  5 ---
 .../server/query/CQueryPlan.java              | 10 ++---
 .../server/query/CQueryPlanManager.java       |  2 +-
 .../server/query/CQueryPlanRequest.java       |  6 +--
 .../server/query/CQueryPlanStats.java         |  2 +-
 .../server/query/CQueryPredicates.java        | 18 ++++----
 .../server/query/CQueryRowCount.java          | 16 +++----
 .../server/query/CQueryUpdate.java            | 10 ++---
 .../server/query/DefaultDbSqlContext.java     | 28 ++++++-------
 .../server/query/DefaultFetchGroupQuery.java  |  2 -
 .../query/DefaultRelationalQueryEngine.java   |  3 --
 .../ebeaninternal/server/query/ExtraJoin.java |  2 +-
 .../server/query/LimitOffsetPagedList.java    |  6 ---
 .../server/query/NativeSqlQueryPlanKey.java   |  4 +-
 .../server/query/OrderVersionDesc.java        |  1 -
 .../server/query/QueryFutureIds.java          |  4 +-
 .../server/query/QueryFutureList.java         |  4 +-
 .../server/query/QueryFutureRowCount.java     |  4 +-
 .../server/query/RawSqlQueryPlanKey.java      |  4 +-
 .../server/query/STreePropertyAssocOne.java   |  2 +-
 .../ebeaninternal/server/query/STreeType.java |  4 +-
 .../server/query/SqlJoinType.java             |  2 +-
 .../ebeaninternal/server/query/SqlTree.java   | 12 +++---
 .../server/query/SqlTreeAlias.java            |  6 +--
 .../server/query/SqlTreeBuilder.java          | 28 ++++++-------
 .../server/query/SqlTreeLoad.java             |  2 +-
 .../server/query/SqlTreeLoadBean.java         |  6 +--
 .../server/query/SqlTreeNodeBean.java         | 16 +++----
 .../server/query/SqlTreeNodeExtraJoin.java    |  8 ++--
 .../query/SqlTreeNodeManyWhereJoin.java       |  6 +--
 .../server/query/SqlTreePlan.java             |  6 +--
 .../server/query/SqlTreeProperties.java       |  2 +-
 .../server/query/SqlTreeRoot.java             |  2 +-
 .../server/querydefn/OrmQueryPlanKey.java     |  2 +-
 .../TestFutureRowCountErrorHandling.java      |  6 +--
 57 files changed, 198 insertions(+), 232 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java b/ebean-core/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java
index 2d3425573..f23aa4edb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/CQueryPlanKey.java
@@ -9,7 +9,7 @@ public interface CQueryPlanKey {
    * Used by read audit such that we can log read audit entries without the full sql
    * (which would make the read audit logs verbose).
    */
-  String getPartialKey();
+  String partialKey();
 
   /**
    * Return a query plan key taking into account persist cascading.
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 8617c2616..b42381956 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
@@ -1330,7 +1330,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     copy.setFutureFetch(true);
     Transaction newTxn = createTransaction();
     QueryFutureRowCount<T> queryFuture = new QueryFutureRowCount<>(new CallableQueryCount<>(this, copy, newTxn));
-    backgroundExecutor.execute(queryFuture.getFutureTask());
+    backgroundExecutor.execute(queryFuture.futureTask());
     return queryFuture;
   }
 
@@ -1340,7 +1340,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     copy.setFutureFetch(true);
     Transaction newTxn = createTransaction();
     QueryFutureIds<T> queryFuture = new QueryFutureIds<>(new CallableQueryIds<>(this, copy, newTxn));
-    backgroundExecutor.execute(queryFuture.getFutureTask());
+    backgroundExecutor.execute(queryFuture.futureTask());
     return queryFuture;
   }
 
@@ -1357,7 +1357,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     // Create a new transaction solely to execute the findList() at some future time
     Transaction newTxn = createTransaction();
     QueryFutureList<T> queryFuture = new QueryFutureList<>(new CallableQueryList<>(this, spiQuery, newTxn));
-    backgroundExecutor.execute(queryFuture.getFutureTask());
+    backgroundExecutor.execute(queryFuture.futureTask());
     return queryFuture;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 6388de507..695960f6b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -639,7 +639,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
         for (T bean : actualDetails) {
           ids.add(beanDescriptor.idForJson(bean));
         }
-        beanDescriptor.readAuditMany(queryPlanKey.getPartialKey(), "l2-query-cache", ids);
+        beanDescriptor.readAuditMany(queryPlanKey.partialKey(), "l2-query-cache", ids);
       }
     }
     if (Boolean.FALSE.equals(query.isReadOnly())) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
index 8b2fbe7bd..94ffe2686 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefExported.java
@@ -22,7 +22,7 @@ final class AssocOneHelpRefExported extends AssocOneHelp {
   @Override
   void appendSelect(DbSqlContext ctx, boolean subQuery) {
     // set appropriate tableAlias for the exported id columns
-    String relativePrefix = ctx.getRelativePrefix(property.name());
+    String relativePrefix = ctx.relativePrefix(property.name());
     ctx.pushTableAlias(relativePrefix);
     property.targetIdBinder.appendSelect(ctx, subQuery);
     ctx.popTableAlias();
@@ -30,7 +30,7 @@ final class AssocOneHelpRefExported extends AssocOneHelp {
 
   @Override
   void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
-    String relativePrefix = ctx.getRelativePrefix(property.name());
+    String relativePrefix = ctx.relativePrefix(property.name());
     if (softDelete && !ctx.isIncludeSoftDelete()) {
       property.tableJoin.addJoin(joinType, relativePrefix, ctx, softDeletePredicate);
     } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
index ce36dcc6e..df8bff16f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpRefInherit.java
@@ -63,7 +63,7 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
 
   void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
     // add join to support the discriminator column
-    String relativePrefix = ctx.getRelativePrefix(property.name);
+    String relativePrefix = ctx.relativePrefix(property.name);
     ctx.addExtraJoin(new Extra(relativePrefix, joinType));
   }
 
@@ -92,8 +92,8 @@ final class AssocOneHelpRefInherit extends AssocOneHelp {
   void appendSelect(DbSqlContext ctx, boolean subQuery) {
     if (!subQuery) {
       // add discriminator column
-      String relativePrefix = ctx.getRelativePrefix(property.name());
-      String tableAlias = ctx.getTableAlias(relativePrefix);
+      String relativePrefix = ctx.relativePrefix(property.name());
+      String tableAlias = ctx.tableAlias(relativePrefix);
       ctx.appendColumn(tableAlias, property.targetInheritInfo.getDiscriminatorColumn());
     }
     property.importedId.sqlAppend(ctx);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index cebac3275..4d5e98916 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -455,7 +455,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     if (formula && sqlFormulaJoin != null) {
       ctx.appendFormulaJoin(sqlFormulaJoin, joinType, manyWhere);
     } else if (secondaryTableJoin != null) {
-      String relativePrefix = ctx.getRelativePrefix(secondaryTableJoinPrefix);
+      String relativePrefix = ctx.relativePrefix(secondaryTableJoinPrefix);
       secondaryTableJoin.addJoin(joinType, relativePrefix, ctx);
     }
   }
@@ -481,7 +481,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
       ctx.appendFormulaSelect(sqlFormulaSelect);
     } else if (!isTransient && !ignoreDraftOnlyProperty(ctx.isDraftQuery())) {
       if (secondaryTableJoin != null) {
-        ctx.pushTableAlias(ctx.getRelativePrefix(secondaryTableJoinPrefix));
+        ctx.pushTableAlias(ctx.relativePrefix(secondaryTableJoinPrefix));
       }
       if (dbEncrypted) {
         ctx.appendRawColumn(decryptSqlWithColumnAlias(ctx.peekTableAlias()));
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 81a5f4632..2afae6a9d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -326,7 +326,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    */
   @Override
   public void lazyLoadMany(EntityBean current) {
-    EntityBean parentBean = childMasterProperty.getValueAsEntityBean(current);
+    EntityBean parentBean = childMasterProperty.valueAsEntityBean(current);
     if (parentBean != null) {
       addBeanToCollectionWithCreate(parentBean, current, true);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index a024c1ddb..37937f194 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -155,7 +155,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
    * Return the property value as an entity bean.
    */
   @Override
-  public EntityBean getValueAsEntityBean(EntityBean owner) {
+  public EntityBean valueAsEntityBean(EntityBean owner) {
     return (EntityBean) getValue(owner);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
index ff6839723..9557ee7a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
@@ -31,7 +31,7 @@ public interface DbSqlContext {
   /**
    * Return a list of encrypted properties which require additional binding.
    */
-  BeanProperty[] getEncryptedProps();
+  BeanProperty[] encryptedProps();
 
   /**
    * Append a string directly to the SQL buffer.
@@ -83,7 +83,7 @@ public interface DbSqlContext {
   /**
    * Return the current context of the sql context.
    */
-  String getContent();
+  String content();
 
   /**
    * Push a join node onto the stack.
@@ -99,14 +99,14 @@ public interface DbSqlContext {
    * Return a table alias without many where clause joins. Typically this is for
    * the select clause (fetch joins).
    */
-  String getTableAlias(String prefix);
+  String tableAlias(String prefix);
 
   /**
    * Return a table alias that takes into account many where joins.
    */
-  String getTableAliasManyWhere(String prefix);
+  String tableAliasManyWhere(String prefix);
 
-  String getRelativePrefix(String propName);
+  String relativePrefix(String propName);
 
   /**
    * Append the lower and upper bound columns into the select clause
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
index 8c1624d05..951f6b92b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
@@ -34,7 +34,7 @@ public final class TableJoin {
   private final int queryHash;
 
   private final PropertyForeignKey foreignKey;
-  
+
   private final String extraWhere;
 
   public TableJoin(DeployTableJoin deploy) {
@@ -135,21 +135,21 @@ public final class TableJoin {
 
   public void addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx, String predicate) {
     String[] names = SplitName.split(prefix);
-    String a1 = ctx.getTableAlias(names[0]);
-    String a2 = ctx.getTableAlias(prefix);
+    String a1 = ctx.tableAlias(names[0]);
+    String a2 = ctx.tableAlias(prefix);
     addJoin(joinType, a1, a2, ctx);
     ctx.append(" and ").append(a2).append(predicate);
   }
 
   public SqlJoinType addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx) {
     String[] names = SplitName.split(prefix);
-    String a1 = ctx.getTableAlias(names[0]);
-    String a2 = ctx.getTableAlias(prefix);
+    String a1 = ctx.tableAlias(names[0]);
+    String a2 = ctx.tableAlias(prefix);
     return addJoin(joinType, a1, a2, ctx);
   }
 
   public SqlJoinType addJoin(SqlJoinType joinType, String a1, String a2, DbSqlContext ctx) {
-    String joinLiteral = joinType.getLiteral(type);
+    String joinLiteral = joinType.literal(type);
     ctx.addJoin(joinLiteral, table, columns(), a1, a2, extraWhere);
     return joinType.autoToOuter(type);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index e746e58ff..1e8121e52 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -57,7 +57,7 @@ final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreE
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
     CQuery<?> subQuery = compileSubQuery(request);
-    this.bindParams = subQuery.predicates().getWhereExprBindValues();
+    this.bindParams = subQuery.predicates().whereExprBindValues();
     this.sql = subQuery.generatedSql().replace('\n', ' ');
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index 779f222e6..20d6a3d16 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -45,7 +45,7 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
   public void prepareExpression(BeanQueryRequest<?> request) {
 
     CQuery<?> subQuery = compileSubQuery(request);
-    this.bindParams = subQuery.predicates().getWhereExprBindValues();
+    this.bindParams = subQuery.predicates().whereExprBindValues();
     this.sql = subQuery.generatedSql().replace('\n', ' ');
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 1f6b18df5..aa2fc8bc2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -14,7 +14,6 @@ import io.ebeaninternal.server.deploy.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.*;
 
@@ -867,7 +866,7 @@ public final class DefaultPersister implements Persister {
     for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
       // check for partial beans
       if (request.isLoadedProperty(prop)) {
-        EntityBean detailBean = prop.getValueAsEntityBean(parentBean);
+        EntityBean detailBean = prop.valueAsEntityBean(parentBean);
         if (detailBean != null) {
           if (!prop.isSaveRecurseSkippable(detailBean)) {
             t.depth(+1);
@@ -1056,7 +1055,7 @@ public final class DefaultPersister implements Persister {
         request.setImportedOrphanForRemoval(prop);
       }
       if (request.isLoadedProperty(prop)) {
-        EntityBean detailBean = prop.getValueAsEntityBean(request.entityBean());
+        EntityBean detailBean = prop.valueAsEntityBean(request.entityBean());
         if (detailBean != null
           && !prop.isSaveRecurseSkippable(detailBean)
           && !prop.isReference(detailBean)
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 22b440e42..b7457bbbb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -190,8 +190,8 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
     // so its available to the user...
     query.setGeneratedSql(queryPlan.sql());
     SqlTreePlan sqlTree = queryPlan.sqlTree();
-    this.rootNode = sqlTree.getRootNode();
-    this.manyProperty = sqlTree.getManyProperty();
+    this.rootNode = sqlTree.rootNode();
+    this.manyProperty = sqlTree.manyProperty();
     this.sql = queryPlan.sql();
     this.rawSql = queryPlan.isRawSql();
     this.logWhereSql = queryPlan.logWhereSql();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
index 559dfa0da..7f62a855e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -62,14 +62,14 @@ final class CQueryBindCapture implements SpiQueryBindCapture {
    * Collect the query plan using already captured bind values.
    */
   public boolean collectQueryPlan(CQueryPlanRequest request) {
-    if (bindCapture == null || request.getSince() < lastBindCapture) {
+    if (bindCapture == null || request.since() < lastBindCapture) {
       // no bind capture since the last capture
       return false;
     }
 
     final BindCapture last = this.bindCapture;
 
-    SpiDbQueryPlan queryPlan = manager.collectPlan(request.getConnection(), this.queryPlan, last);
+    SpiDbQueryPlan queryPlan = manager.collectPlan(request.connection(), this.queryPlan, last);
     if (queryPlan != null) {
       request.add(queryPlan.with(queryTimeMicros, captureCount));
       // effectively turn off bind capture for this plan
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index ed9cbea6c..3f308d99a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -110,7 +110,7 @@ final class CQueryBuilder {
       sql = buildUpdateSql(request, rootTableAlias, predicates, sqlTree);
     }
     // cache the query plan
-    queryPlan = new CQueryPlan(request, sql, sqlTree.plan(), predicates.getLogWhereSql());
+    queryPlan = new CQueryPlan(request, sql, sqlTree.plan(), predicates.logWhereSql());
     request.putQueryPlan(queryPlan);
     return new CQueryUpdate(request, predicates, queryPlan);
   }
@@ -149,7 +149,7 @@ final class CQueryBuilder {
     if (rootTableAlias != null) {
       sb.append(" ").append(rootTableAlias);
     }
-    sb.append(" set ").append(predicates.getDbUpdateClause());
+    sb.append(" set ").append(predicates.dbUpdateClause());
     String updateClause = sb.toString();
     if (sqlTree.noJoins() && request.isInlineSqlUpdateLimit()) {
       // simple - update table set ... where ...
@@ -196,7 +196,7 @@ final class CQueryBuilder {
     SqlTree sqlTree = createSqlTree(request, predicates);
     SqlLimitResponse s = buildSql(null, request, predicates, sqlTree);
 
-    queryPlan = new CQueryPlan(request, s.getSql(), sqlTree.plan(), predicates.getLogWhereSql());
+    queryPlan = new CQueryPlan(request, s.getSql(), sqlTree.plan(), predicates.logWhereSql());
     request.putQueryPlan(queryPlan);
     return new CQueryFetchSingleAttribute(request, predicates, queryPlan, query.isCountDistinct());
   }
@@ -217,14 +217,14 @@ final class CQueryBuilder {
   /**
    * Return the history support if this query needs it (is a 'as of' type query).
    */
-  <T> CQueryHistorySupport getHistorySupport(SpiQuery<T> query) {
+  <T> CQueryHistorySupport historySupport(SpiQuery<T> query) {
     return query.getTemporalMode().isHistory() ? historySupport : null;
   }
 
   /**
    * Return the draft support (or null) for a 'asDraft' query.
    */
-  <T> CQueryDraftSupport getDraftSupport(SpiQuery<T> query) {
+  <T> CQueryDraftSupport draftSupport(SpiQuery<T> query) {
     return query.getTemporalMode() == SpiQuery.TemporalMode.DRAFT ? draftSupport : null;
   }
 
@@ -287,7 +287,7 @@ final class CQueryBuilder {
       }
     }
     // cache the query plan
-    queryPlan = new CQueryPlan(request, sql, sqlTree.plan(), predicates.getLogWhereSql());
+    queryPlan = new CQueryPlan(request, sql, sqlTree.plan(), predicates.logWhereSql());
     request.putQueryPlan(queryPlan);
     return new CQueryRowCount(queryPlan, request, predicates);
   }
@@ -340,9 +340,9 @@ final class CQueryBuilder {
     SqlLimitResponse res = buildSql(null, request, predicates, sqlTree);
     boolean rawSql = request.isRawSql();
     if (rawSql) {
-      queryPlan = new CQueryPlanRawSql(request, res, sqlTree, predicates.getLogWhereSql());
+      queryPlan = new CQueryPlanRawSql(request, res, sqlTree, predicates.logWhereSql());
     } else {
-      queryPlan = new CQueryPlan(request, res, sqlTree.plan(), false, predicates.getLogWhereSql());
+      queryPlan = new CQueryPlan(request, res, sqlTree.plan(), false, predicates.logWhereSql());
     }
     BeanDescriptor<T> desc = request.descriptor();
     if (desc.isReadAuditing()) {
@@ -552,7 +552,7 @@ final class CQueryBuilder {
       this.select = select;
       this.updateStatement = updateStatement;
       this.distinct = query.isDistinct() || select.isSqlDistinct();
-      this.dbOrderBy = predicates.getDbOrderBy();
+      this.dbOrderBy = predicates.dbOrderBy();
       this.countSingleAttribute = query.isCountDistinct() && query.isSingleAttribute();
     }
 
@@ -560,7 +560,7 @@ final class CQueryBuilder {
       if (selectClause != null) {
         sb.append(selectClause);
       } else {
-        useSqlLimiter = (query.hasMaxRowsOrFirstRow() && (select.getManyProperty() == null || query.isSingleAttribute()));
+        useSqlLimiter = (query.hasMaxRowsOrFirstRow() && (select.manyProperty() == null || query.isSingleAttribute()));
         if (!useSqlLimiter) {
           appendSelectDistinct();
         }
@@ -578,9 +578,9 @@ final class CQueryBuilder {
               sb.append("t0.").append(idProp.dbColumn()).append(", ");
             }
           }
-          sb.append(select.getSelectSql()).append(" as attribute_");
+          sb.append(select.selectSql()).append(" as attribute_");
         } else {
-          sb.append(select.getSelectSql());
+          sb.append(select.selectSql());
         }
         if (request.isInlineCountDistinct()) {
           sb.append(")");
@@ -590,7 +590,7 @@ final class CQueryBuilder {
           final OrderBy<?> orderBy = query.getOrderBy();
           if (orderBy != null && orderBy.supportsSelect()) {
             String trimmed = DbOrderByTrim.trim(dbOrderBy);
-            if (query.isSingleAttribute() && select.getSelectSql().startsWith(trimmed)) {
+            if (query.isSingleAttribute() && select.selectSql().startsWith(trimmed)) {
               // NOP, already in SQL
               // TODO: what to do if we select("id").orderBy("prop,id")?
               // Can we live with a query like "select t0.id, t0.prop, t0.id from"
@@ -610,7 +610,7 @@ final class CQueryBuilder {
           sb.append("count(");
         }
         sb.append("distinct ");
-        String distinctOn = select.getDistinctOn();
+        String distinctOn = select.distinctOn();
         if (distinctOn != null) {
           sb.append("on (").append(distinctOn).append(") ");
         }
@@ -620,7 +620,7 @@ final class CQueryBuilder {
     private void appendFrom() {
       if (selectClause == null || !selectClause.startsWith("update")) {
         sb.append(" from ");
-        sb.append(select.getFromSql());
+        sb.append(select.fromSql());
       }
     }
 
@@ -634,7 +634,7 @@ final class CQueryBuilder {
     }
 
     private void appendInheritanceWhere() {
-      String inheritanceWhere = select.getInheritanceWhereSql();
+      String inheritanceWhere = select.inheritanceWhereSql();
       if (!inheritanceWhere.isEmpty()) {
         sb.append(" where");
         sb.append(inheritanceWhere);
@@ -647,7 +647,7 @@ final class CQueryBuilder {
         query.incrementAsOfTableCount();
         if (!historySupport.isStandardsBased()){
           appendAndOrWhere();
-          sb.append(historySupport.getAsOfPredicate(request.baseTableAlias()));
+          sb.append(historySupport.asOfPredicate(request.baseTableAlias()));
         }
       }
     }
@@ -696,16 +696,16 @@ final class CQueryBuilder {
       appendInheritanceWhere();
       appendHistoryAsOfPredicate();
       appendFindId();
-      appendToWhere(predicates.getDbWhere());
-      appendToWhere(predicates.getDbFilterMany());
+      appendToWhere(predicates.dbWhere());
+      appendToWhere(predicates.dbFilterMany());
       if (!query.isIncludeSoftDeletes()) {
         appendSoftDelete();
       }
-      String groupBy = select.getGroupBy();
+      String groupBy = select.groupBy();
       if (groupBy != null) {
         sb.append(" group by ").append(groupBy);
       }
-      String dbHaving = predicates.getDbHaving();
+      String dbHaving = predicates.dbHaving();
       if (hasValue(dbHaving)) {
         sb.append(" having ").append(dbHaving);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
index c9373724b..290b706c2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilderRawSql.java
@@ -25,12 +25,10 @@ final class CQueryBuilderRawSql {
    * Build the full SQL Select statement for the request.
    */
   SqlLimitResponse buildSql(OrmQueryRequest<?> request, CQueryPredicates predicates, SpiRawSql.Sql rsql) {
-
     if (rsql == null) {
       // this is a ResultSet based RawSql query - just use some placeholder for the SQL
       return new SqlLimitResponse(CQueryPlan.RESULT_SET_BASED_RAW_SQL);
     }
-
     if (!rsql.isParsed()) {
       String sql = rsql.getUnparsedSql();
       BindParams bindParams = request.query().getBindParams();
@@ -41,16 +39,13 @@ final class CQueryBuilderRawSql {
       return new SqlLimitResponse(sql);
     }
 
-    String orderBy = getOrderBy(predicates, rsql);
-
+    String orderBy = orderBy(predicates, rsql);
     // build the actual sql String
     String sql = buildMainQuery(orderBy, request, predicates, rsql);
-
     SpiQuery<?> query = request.query();
     if (query.hasMaxRowsOrFirstRow() && sqlLimiter != null) {
       // wrap with a limit offset or ROW_NUMBER() etc
       return sqlLimiter.limit(new OrmQueryLimitRequest(sql, orderBy, query, dbPlatform, rsql.isDistinct() || query.isDistinct()));
-
     } else {
       // add back select keyword (it was removed to support sqlQueryLimiter)
       String prefix = "select " + (rsql.isDistinct() ? "distinct " : "");
@@ -86,7 +81,7 @@ final class CQueryBuilderRawSql {
       dynamicWhere = descriptor.idBinderIdSql(null);
     }
 
-    String dbWhere = predicates.getDbWhere();
+    String dbWhere = predicates.dbWhere();
     if (hasValue(dbWhere)) {
       if (dynamicWhere == null) {
         dynamicWhere = dbWhere;
@@ -109,7 +104,7 @@ final class CQueryBuilderRawSql {
       sb.append(preHaving).append(" ");
     }
 
-    String dbHaving = predicates.getDbHaving();
+    String dbHaving = predicates.dbHaving();
     if (hasValue(dbHaving)) {
       if (sql.isAndHavingExpr()) {
         sb.append(" and ");
@@ -128,8 +123,8 @@ final class CQueryBuilderRawSql {
     return s != null && !s.isEmpty();
   }
 
-  private String getOrderBy(CQueryPredicates predicates, SpiRawSql.Sql sql) {
-    String orderBy = predicates.getDbOrderBy();
+  private String orderBy(CQueryPredicates predicates, SpiRawSql.Sql sql) {
+    String orderBy = predicates.dbOrderBy();
     if (orderBy != null) {
       return orderBy;
     } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java
index 771ff8145..c02b25ba6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryDraftSupport.java
@@ -22,7 +22,7 @@ final class CQueryDraftSupport {
    * This returns null for entities that are not draftable and in that case
    * the usual base table is used.
    */
-  String getDraftTable(String table) {
+  String draftTable(String table) {
     return tableMap.get(table);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index df78f11e7..894bcfce5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -76,11 +76,11 @@ public final class CQueryEngine {
     try {
       int rows = query.execute();
       if (request.logSql()) {
-        request.logSql(Str.add(query.getGeneratedSql(), "; --bind(", query.getBindLog(), ") --micros(", query.micros() + ") --rows(", rows + ")"));
+        request.logSql(Str.add(query.generatedSql(), "; --bind(", query.bindLog(), ") --micros(", query.micros() + ") --rows(", rows + ")"));
       }
       return rows;
     } catch (SQLException e) {
-      throw translate(request, query.getBindLog(), query.getGeneratedSql(), e);
+      throw translate(request, query.bindLog(), query.generatedSql(), e);
     }
   }
 
@@ -98,13 +98,13 @@ public final class CQueryEngine {
     try {
       rcQuery.findCollection(collection);
       if (request.logSql()) {
-        logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog(), rcQuery.micros());
+        logGeneratedSql(request, rcQuery.generatedSql(), rcQuery.bindLog(), rcQuery.micros());
       }
       if (request.logSummary()) {
-        request.transaction().logSummary(rcQuery.getSummary());
+        request.transaction().logSummary(rcQuery.summary());
       }
       if (request.isQueryCachePut()) {
-        request.addDependentTables(rcQuery.getDependentTables());
+        request.addDependentTables(rcQuery.dependentTables());
         if (collection instanceof List) {
           collection = (A) Collections.unmodifiableList((List<?>) collection);
           request.putToQueryCache(collection);
@@ -121,7 +121,7 @@ public final class CQueryEngine {
       }
       return collection;
     } catch (SQLException e) {
-      throw translate(request, rcQuery.getBindLog(), rcQuery.getGeneratedSql(), e);
+      throw translate(request, rcQuery.bindLog(), rcQuery.generatedSql(), e);
     }
   }
 
@@ -164,21 +164,21 @@ public final class CQueryEngine {
     try {
       int count = rcQuery.findCount();
       if (request.logSql()) {
-        logGeneratedSql(request, rcQuery.getGeneratedSql(), rcQuery.getBindLog(), rcQuery.micros());
+        logGeneratedSql(request, rcQuery.generatedSql(), rcQuery.bindLog(), rcQuery.micros());
       }
       if (request.logSummary()) {
-        request.transaction().logSummary(rcQuery.getSummary());
+        request.transaction().logSummary(rcQuery.summary());
       }
       if (request.query().isFutureFetch()) {
         request.transaction().end();
       }
       if (request.isQueryCachePut()) {
-        request.addDependentTables(rcQuery.getDependentTables());
+        request.addDependentTables(rcQuery.dependentTables());
         request.putToQueryCache(count);
       }
       return count;
     } catch (SQLException e) {
-      throw translate(request, rcQuery.getBindLog(), rcQuery.getGeneratedSql(), e);
+      throw translate(request, rcQuery.bindLog(), rcQuery.generatedSql(), e);
     }
   }
 
@@ -271,9 +271,7 @@ public final class CQueryEngine {
     } catch (SQLException e) {
       throw cquery.createPersistenceException(e);
     } finally {
-      if (cquery != null) {
-        cquery.close();
-      }
+      cquery.close();
     }
   }
 
@@ -299,11 +297,11 @@ public final class CQueryEngine {
   }
 
   private <T> String getSysPeriodLower(SpiQuery<T> query) {
-    return historySupport.getSysPeriodLower(query.getAlias(T0));
+    return historySupport.sysPeriodLower(query.getAlias(T0));
   }
 
   private <T> String getSysPeriodUpper(SpiQuery<T> query) {
-    return historySupport.getSysPeriodUpper(query.getAlias(T0));
+    return historySupport.sysPeriodUpper(query.getAlias(T0));
   }
 
   /**
@@ -373,9 +371,7 @@ public final class CQueryEngine {
     } catch (SQLException e) {
       throw cquery.createPersistenceException(e);
     } finally {
-      if (cquery != null) {
-        cquery.close();
-      }
+      cquery.close();
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index 37ed9e1ab..f2fb587f2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -58,12 +58,12 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca
   /**
    * Return a summary description of this query.
    */
-  String getSummary() {
+  String summary() {
     StringBuilder sb = new StringBuilder(80);
     sb.append("FindAttr exeMicros[").append(executionTimeMicros)
       .append("] rows[").append(rowCount)
       .append("] type[").append(desc.name())
-      .append("] predicates[").append(predicates.getLogWhereSql())
+      .append("] predicates[").append(predicates.logWhereSql())
       .append("] bind[").append(bindLog).append("]");
     return sb.toString();
   }
@@ -75,6 +75,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca
   /**
    * Execute the query returning the row count.
    */
+  @SuppressWarnings({"rawtypes", "unchecked"})
   void findCollection(Collection result) throws SQLException {
     long startNano = System.nanoTime();
     try {
@@ -92,27 +93,27 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca
       if (queryPlan.executionTime(executionTimeMicros)) {
         queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros);
       }
-      getTransaction().profileEvent(this);
+      transaction().profileEvent(this);
     } finally {
       close();
     }
   }
 
-  private SpiTransaction getTransaction() {
+  private SpiTransaction transaction() {
     return request.transaction();
   }
 
   /**
    * Return the bind log.
    */
-  String getBindLog() {
+  String bindLog() {
     return bindLog;
   }
 
   /**
    * Return the generated sql.
    */
-  String getGeneratedSql() {
+  String generatedSql() {
     return sql;
   }
 
@@ -120,7 +121,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca
     lock.lock();
     try {
       query.checkCancelled();
-      SpiTransaction t = getTransaction();
+      SpiTransaction t = transaction();
       profileOffset = t.profileOffset();
       Connection conn = t.getInternalConnection();
       pstmt = conn.prepareStatement(sql);
@@ -160,12 +161,12 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca
 
   @Override
   public void profile() {
-    getTransaction()
+    transaction()
       .profileStream()
       .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.getProfileId());
   }
 
-  Set<String> getDependentTables() {
+  Set<String> dependentTables() {
     return queryPlan.dependentTables();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java
index e082c97eb..aa05039a2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryHistorySupport.java
@@ -40,30 +40,28 @@ final class CQueryHistorySupport {
   /**
    * Return the 'as of' history view for the given base table.
    */
-  String getAsOfView(String table) {
+  String asOfView(String table) {
     return asOfTableMap.get(table);
   }
 
   /**
    * Return the lower bound column.
    */
-  String getSysPeriodLower(String tableAlias) {
+  String sysPeriodLower(String tableAlias) {
     return dbHistorySupport.getSysPeriodLower(tableAlias, sysPeriod);
   }
 
   /**
    * Return the upper bound column.
    */
-  String getSysPeriodUpper(String tableAlias) {
+  String sysPeriodUpper(String tableAlias) {
     return dbHistorySupport.getSysPeriodUpper(tableAlias, sysPeriod);
   }
 
   /**
    * Return the predicate appended to the end of the query.
-   * <p>
-   * Note used for Oracle total recall etc with the more standard approach.
    */
-  String getAsOfPredicate(String tableAlias) {
+  String asOfPredicate(String tableAlias) {
     return dbHistorySupport.getAsOfPredicate(tableAlias, sysPeriod);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
index 1aa5fc7ef..8d9860a7b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java
@@ -11,9 +11,7 @@ import java.sql.SQLException;
 final class CQueryIteratorSimple<T> implements QueryIterator<T> {
 
   private final CQuery<T> cquery;
-
   private final OrmQueryRequest<T> request;
-
   private boolean closed;
 
   CQueryIteratorSimple(CQuery<T> cquery, OrmQueryRequest<T> request) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java
index 0f369fef8..cefdb59cf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryOrderBy.java
@@ -16,7 +16,6 @@ import java.util.List;
 final class CQueryOrderBy {
 
   private final BeanDescriptor<?> desc;
-
   private final OrderBy<?> orderBy;
 
   /**
@@ -32,9 +31,7 @@ final class CQueryOrderBy {
   }
 
   private String parseInternal() {
-
     StringBuilder sb = new StringBuilder();
-
     List<Property> properties = orderBy.getProperties();
     if (properties.isEmpty()) {
       // order by clause removed by filterMany()
@@ -52,7 +49,6 @@ final class CQueryOrderBy {
   }
 
   private String parseProperty(Property p) {
-
     String propName = p.getProperty();
     ElPropertyValue el = desc.elGetValue(propName);
     if (el == null) {
@@ -65,7 +61,6 @@ final class CQueryOrderBy {
       IdBinder idBinder = ap.targetDescriptor().idBinder();
       return idBinder.getOrderBy(el.elName(), p.isAscending());
     }
-
     return p.toStringFormat();
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index bdcd7c372..7ab1b8a39 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -92,7 +92,7 @@ public class CQueryPlan implements SpiQueryPlan {
     this.sqlTree = sqlTree;
     this.rawSql = rawSql;
     this.logWhereSql = logWhereSql;
-    this.encryptedProps = sqlTree.getEncryptedProps();
+    this.encryptedProps = sqlTree.encryptedProps();
     this.stats = new CQueryPlanStats(this);
     this.dependentTables = sqlTree.dependentTables();
     this.bindCapture = initBindCapture(query);
@@ -117,7 +117,7 @@ public class CQueryPlan implements SpiQueryPlan {
     this.sqlTree = sqlTree;
     this.rawSql = false;
     this.logWhereSql = logWhereSql;
-    this.encryptedProps = sqlTree.getEncryptedProps();
+    this.encryptedProps = sqlTree.encryptedProps();
     this.stats = new CQueryPlanStats(this);
     this.dependentTables = sqlTree.dependentTables();
     this.bindCapture = initBindCaptureRaw(sql, query);
@@ -247,7 +247,7 @@ public class CQueryPlan implements SpiQueryPlan {
 
   private String calcAuditQueryKey() {
     // rawSql needs to include the MD5 hash of the sql
-    return rawSql ? planKey.getPartialKey() + "_" + hash : planKey.getPartialKey();
+    return rawSql ? planKey.partialKey() + "_" + hash : planKey.partialKey();
   }
 
   final SqlTreePlan sqlTree() {
@@ -288,11 +288,11 @@ public class CQueryPlan implements SpiQueryPlan {
    * Return the time this query plan was last used.
    */
   public final long lastQueryTime() {
-    return stats.getLastQueryTime();
+    return stats.lastQueryTime();
   }
 
   final ScalarDataReader<?> singleAttributeScalarType() {
-    return sqlTree.getRootNode().getSingleAttributeReader();
+    return sqlTree.rootNode().singleAttributeReader();
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
index 72791fc53..e1cb2d3c3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
@@ -62,7 +62,7 @@ public final class CQueryPlanManager implements QueryPlanManager {
       while (req.hasNext()) {
         req.nextCapture();
       }
-      return req.getPlans();
+      return req.plans();
     } catch (SQLException e) {
       CoreLog.log.error("Error during query plan collection", e);
       return emptyList();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java
index 00b202d57..573b66026 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java
@@ -34,7 +34,7 @@ final class CQueryPlanRequest {
   /**
    * Return the connection used to collect the db query plan.
    */
-  Connection getConnection() {
+  Connection connection() {
     return connection;
   }
 
@@ -48,14 +48,14 @@ final class CQueryPlanRequest {
   /**
    * Return the min epoch time in millis for minimum bind capture age.
    */
-  long getSince() {
+  long since() {
     return since;
   }
 
   /**
    * Return the captured query plans.
    */
-  List<MetaQueryPlan> getPlans() {
+  List<MetaQueryPlan> plans() {
     return plans;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
index 118450452..8c911aaac 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java
@@ -50,7 +50,7 @@ public final class CQueryPlanStats {
   /**
    * Return the last time this query was executed.
    */
-  long getLastQueryTime() {
+  long lastQueryTime() {
     return lastQueryTime;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index dff185cc8..414484d1e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -350,60 +350,60 @@ public final class CQueryPredicates {
   /**
    * Return the bind values for the where expression.
    */
-  public List<Object> getWhereExprBindValues() {
+  public List<Object> whereExprBindValues() {
     return where == null ? Collections.emptyList() : where.getBindValues();
   }
 
   /**
    * Return the db update set clause for an UpdateQuery.
    */
-  String getDbUpdateClause() {
+  String dbUpdateClause() {
     return dbUpdateClause;
   }
 
   /**
    * Return the db column version of the combined where clause.
    */
-  String getDbHaving() {
+  String dbHaving() {
     return dbHaving;
   }
 
   /**
    * Return the db column version of the combined where clause.
    */
-  String getDbWhere() {
+  String dbWhere() {
     return dbWhere;
   }
 
   /**
    * Return a db filter for filtering many fetch joins.
    */
-  String getDbFilterMany() {
+  String dbFilterMany() {
     return dbFilterMany;
   }
 
   /**
    * Return the db column version of the order by clause.
    */
-  String getDbOrderBy() {
+  String dbOrderBy() {
     return dbOrderBy;
   }
 
   /**
    * Return the includes required for the where and order by clause.
    */
-  Set<String> getPredicateIncludes() {
+  Set<String> predicateIncludes() {
     return predicateIncludes;
   }
 
   /**
    * Return the orderBy includes.
    */
-  Set<String> getOrderByIncludes() {
+  Set<String> orderByIncludes() {
     return orderByIncludes;
   }
 
-  String getLogWhereSql() {
+  String logWhereSql() {
     if (dbWhere == null && dbFilterMany == null) {
       return "";
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
index 6834f46d9..3b1865825 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java
@@ -51,13 +51,13 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer
   /**
    * Return a summary description of this query.
    */
-  public String getSummary() {
+  public String summary() {
     //noinspection StringBufferReplaceableByString
     StringBuilder sb = new StringBuilder(80);
     sb.append("FindCount exeMicros[").append(executionTimeMicros)
       .append("] rows[").append(rowCount)
       .append("] type[").append(desc.fullName())
-      .append("] predicates[").append(predicates.getLogWhereSql())
+      .append("] predicates[").append(predicates.logWhereSql())
       .append("] bind[").append(bindLog).append("]");
 
     return sb.toString();
@@ -66,14 +66,14 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer
   /**
    * Return the bind log.
    */
-  public String getBindLog() {
+  public String bindLog() {
     return bindLog;
   }
 
   /**
    * Return the generated sql.
    */
-  public String getGeneratedSql() {
+  public String generatedSql() {
     return sql;
   }
 
@@ -87,7 +87,7 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer
   public int findCount() throws SQLException {
     long startNano = System.nanoTime();
     try {
-      SpiTransaction t = getTransaction();
+      SpiTransaction t = transaction();
       profileOffset = t.profileOffset();
       Connection conn = t.getInternalConnection();
       lock.lock();
@@ -119,7 +119,7 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer
     }
   }
 
-  private SpiTransaction getTransaction() {
+  private SpiTransaction transaction() {
     return request.transaction();
   }
 
@@ -135,12 +135,12 @@ final class CQueryRowCount implements SpiProfileTransactionEvent, CancelableQuer
 
   @Override
   public void profile() {
-    getTransaction()
+    transaction()
       .profileStream()
       .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.getProfileId());
   }
 
-  Set<String> getDependentTables() {
+  Set<String> dependentTables() {
     return queryPlan.dependentTables();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
index 20ad3fb44..edd8b348f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java
@@ -47,14 +47,14 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery
   /**
    * Return the bind log.
    */
-  public String getBindLog() {
+  public String bindLog() {
     return bindLog;
   }
 
   /**
    * Return the generated sql.
    */
-  public String getGeneratedSql() {
+  public String generatedSql() {
     return sql;
   }
 
@@ -64,7 +64,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery
   public int execute() throws SQLException {
     long startNano = System.nanoTime();
     try {
-      SpiTransaction t = getTransaction();
+      SpiTransaction t = transaction();
       profileOffset = t.profileOffset();
       Connection conn = t.getInternalConnection();
       lock.lock();
@@ -97,7 +97,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery
     return executionTimeMicros;
   }
 
-  private SpiTransaction getTransaction() {
+  private SpiTransaction transaction() {
     return request.transaction();
   }
 
@@ -111,7 +111,7 @@ final class CQueryUpdate implements SpiProfileTransactionEvent, CancelableQuery
 
   @Override
   public void profile() {
-    getTransaction()
+    transaction()
       .profileStream()
       .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.getProfileId());
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index 63fa76d92..f4611617c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -94,7 +94,7 @@ final class DefaultDbSqlContext implements DbSqlContext {
   }
 
   @Override
-  public BeanProperty[] getEncryptedProps() {
+  public BeanProperty[] encryptedProps() {
     if (encryptedProps == null) {
       return null;
     }
@@ -125,13 +125,13 @@ final class DefaultDbSqlContext implements DbSqlContext {
     sb.append(" ").append(type);
     boolean addAsOfOnClause = false;
     if (draftSupport != null) {
-      appendTable(table, draftSupport.getDraftTable(table));
+      appendTable(table, draftSupport.draftTable(table));
     } else if (!historyQuery) {
       sb.append(" ").append(table).append(" ");
     } else {
       // check if there is an associated history table and if so
       // use the unionAll view - we expect an additional predicate to match
-      String asOfView = historySupport.getAsOfView(table);
+      String asOfView = historySupport.asOfView(table);
       appendTable(table, asOfView);
       if (asOfView != null) {
         if (historySupport.isStandardsBased()) {
@@ -161,7 +161,7 @@ final class DefaultDbSqlContext implements DbSqlContext {
       }
     }
     if (addAsOfOnClause) {
-      sb.append(" and ").append(historySupport.getAsOfPredicate(a2));
+      sb.append(" and ").append(historySupport.asOfPredicate(a2));
       asOfTableCount++;
     }
     if (extraWhere != null && !extraWhere.isEmpty()) {
@@ -191,17 +191,17 @@ final class DefaultDbSqlContext implements DbSqlContext {
   }
 
   @Override
-  public String getTableAlias(String prefix) {
-    return alias.getTableAlias(prefix);
+  public String tableAlias(String prefix) {
+    return alias.tableAlias(prefix);
   }
 
   @Override
-  public String getTableAliasManyWhere(String prefix) {
-    return alias.getTableAliasManyWhere(prefix);
+  public String tableAliasManyWhere(String prefix) {
+    return alias.tableAliasManyWhere(prefix);
   }
 
   @Override
-  public String getRelativePrefix(String propName) {
+  public String relativePrefix(String propName) {
     return currentPrefix == null ? propName : currentPrefix + "." + propName;
   }
 
@@ -209,7 +209,7 @@ final class DefaultDbSqlContext implements DbSqlContext {
   public void pushTableAlias(String prefix) {
     prefixStack.push(currentPrefix);
     currentPrefix = prefix;
-    tableAliasStack.push(getTableAlias(prefix));
+    tableAliasStack.push(tableAlias(prefix));
   }
 
   @Override
@@ -227,7 +227,7 @@ final class DefaultDbSqlContext implements DbSqlContext {
   @Override
   public void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType, String manyWhere) {
     // replace ${ta} placeholder with the real table alias...
-    String tableAlias = manyWhere == null ? tableAliasStack.peek() : getTableAliasManyWhere(manyWhere);
+    String tableAlias = manyWhere == null ? tableAliasStack.peek() : tableAliasManyWhere(manyWhere);
     String converted = sqlFormulaJoin.replace(tableAliasPlaceHolder, tableAlias);
     if (formulaJoins == null) {
       formulaJoins = new HashSet<>();
@@ -272,10 +272,10 @@ final class DefaultDbSqlContext implements DbSqlContext {
   public void appendHistorySysPeriod() {
     String tableAlias = tableAliasStack.peek();
     sb.append(COMMA);
-    sb.append(historySupport.getSysPeriodLower(tableAlias));
+    sb.append(historySupport.sysPeriodLower(tableAlias));
     appendColumnAlias();
     sb.append(COMMA);
-    sb.append(historySupport.getSysPeriodUpper(tableAlias));
+    sb.append(historySupport.sysPeriodUpper(tableAlias));
     appendColumnAlias();
   }
 
@@ -325,7 +325,7 @@ final class DefaultDbSqlContext implements DbSqlContext {
   }
 
   @Override
-  public String getContent() {
+  public String content() {
     String s = sb.toString();
     sb = new StringBuilder(STRING_BUILDER_INITIAL_CAPACITY);
     return s;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index 71e13330e..b4ce3a696 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -48,9 +48,7 @@ import java.util.stream.Stream;
 final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQueryFetch {
 
   private static final FetchConfig FETCH_CACHE = FetchConfig.ofCache();
-
   private static final FetchConfig FETCH_QUERY = FetchConfig.ofQuery();
-
   private static final FetchConfig FETCH_LAZY = FetchConfig.ofLazy();
 
   private OrmQueryDetail detail = new OrmQueryDetail();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
index 44b84a6a5..047b9f696 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java
@@ -26,11 +26,8 @@ import java.util.function.Predicate;
 public final class DefaultRelationalQueryEngine implements RelationalQueryEngine {
 
   private final Binder binder;
-
   private final String dbTrueValue;
-
   private final boolean binaryOptimizedUUID;
-
   private final TimedMetricMap timedMetricMap;
 
   public DefaultRelationalQueryEngine(Binder binder, String dbTrueValue, boolean binaryOptimizedUUID) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java
index 6fdeedd43..1b7859038 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/ExtraJoin.java
@@ -10,7 +10,7 @@ public final class ExtraJoin {
     this.containsMany = containsMany;
   }
 
-  public STreePropertyAssoc getProperty() {
+  public STreePropertyAssoc property() {
     return property;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
index cb9f6f560..f763341f8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java
@@ -15,19 +15,13 @@ import java.util.concurrent.locks.ReentrantLock;
 public final class LimitOffsetPagedList<T> implements PagedList<T> {
 
   private final transient SpiEbeanServer server;
-
   private final transient ReentrantLock lock = new ReentrantLock();
-
   private final SpiQuery<T> query;
-
   private final int firstRow;
-
   private final int maxRows;
 
   private int foregroundTotalRowCount = -1;
-
   private Future<Integer> futureRowCount;
-
   private List<T> list;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java
index 2a0313ff3..2c5c7c4b4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java
@@ -15,7 +15,7 @@ public class NativeSqlQueryPlanKey implements CQueryPlanKey {
 
   @Override
   public String toString() {
-    return getPartialKey();
+    return partialKey();
   }
 
   @Override
@@ -29,7 +29,7 @@ public class NativeSqlQueryPlanKey implements CQueryPlanKey {
    * can be used as a short form proxy for the actual sql.
    */
   @Override
-  public String getPartialKey() {
+  public String partialKey() {
     return hashCode() + "_n";
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java
index 52e661b10..2f564a5af 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/OrderVersionDesc.java
@@ -17,7 +17,6 @@ final class OrderVersionDesc implements Comparator<Version<?>>, Serializable {
 
   @Override
   public int compare(Version<?> o1, Version<?> o2) {
-
     Timestamp v1 = o1.getStart();
     if (v1 == null) {
       return 1;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java
index ff5acb76c..912075e58 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java
@@ -19,11 +19,11 @@ public final class QueryFutureIds<T> extends BaseFuture<List<Object>> implements
     this.call = call;
   }
 
-  public FutureTask<List<Object>> getFutureTask() {
+  public FutureTask<List<Object>> futureTask() {
     return futureTask;
   }
 
-  public Transaction getTransaction() {
+  public Transaction transaction() {
     return call.transaction;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java
index 34264ffcf..bd232c91f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java
@@ -23,11 +23,11 @@ public final class QueryFutureList<T> extends BaseFuture<List<T>> implements Fut
     this.call = call;
   }
 
-  public FutureTask<List<T>> getFutureTask() {
+  public FutureTask<List<T>> futureTask() {
     return futureTask;
   }
 
-  public Transaction getTransaction() {
+  public Transaction transaction() {
     return call.transaction;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java
index 832653f1d..28b66a198 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java
@@ -17,11 +17,11 @@ public final class QueryFutureRowCount<T> extends BaseFuture<Integer> implements
     this.call = call;
   }
 
-  public FutureTask<Integer> getFutureTask() {
+  public FutureTask<Integer> futureTask() {
     return futureTask;
   }
 
-  public Transaction getTransaction() {
+  public Transaction transaction() {
     return call.transaction;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
index b24a57e04..77546dee6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java
@@ -21,7 +21,7 @@ final class RawSqlQueryPlanKey implements CQueryPlanKey {
 
   @Override
   public String toString() {
-    return getPartialKey() + ":r";
+    return partialKey() + ":r";
   }
 
   @Override
@@ -35,7 +35,7 @@ final class RawSqlQueryPlanKey implements CQueryPlanKey {
    * can be used as a short form proxy for the actual sql.
    */
   @Override
-  public String getPartialKey() {
+  public String partialKey() {
     return hashCode() + "_0";
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
index d7ff3016d..ca6f2ba67 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssocOne.java
@@ -23,5 +23,5 @@ public interface STreePropertyAssocOne extends STreePropertyAssoc {
   /**
    * Return the property value as an entity bean from the parent.
    */
-  EntityBean getValueAsEntityBean(EntityBean parentBean);
+  EntityBean valueAsEntityBean(EntityBean parentBean);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java
index 12e14abbf..449b65926 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java
@@ -136,10 +136,8 @@ public interface STreeType {
 
   /**
    * Mark the bean as deleted by setting the softDelete property to true.
-   *
    * This works also, if there is only a virtual softDelete property computed by a formula.
-   *
-   * If there is no softdelete property, it sets the lazyLoadFailure flag in EBI.
+   * If there is no soft delete property, it sets the lazyLoadFailure flag in EBI.
    */
   void markAsDeleted(EntityBean bean);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java
index 8ad0d8a39..ba2e4a584 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlJoinType.java
@@ -30,7 +30,7 @@ public enum SqlJoinType {
    * Return the actual SQL join literal taking into account the current join type and the 'default
    * join type as per deployment cardinality and optionality'.
    */
-  public String getLiteral(SqlJoinType deploymentJoinType) {
+  public String literal(SqlJoinType deploymentJoinType) {
     if (this == SqlJoinType.AUTO) {
       return deploymentJoinType.literal;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
index d055b94c9..126e9ce7a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java
@@ -88,33 +88,33 @@ final class SqlTree {
     return list;
   }
 
-  String getDistinctOn() {
+  String distinctOn() {
     return distinctOn;
   }
 
   /**
    * Return the String for the actual SQL.
    */
-  String getSelectSql() {
+  String selectSql() {
     assert selectSql != null : "selectSql was null";
     return selectSql;
   }
 
-  String getFromSql() {
+  String fromSql() {
     return fromSql;
   }
 
   /**
    * Return the groupBy clause.
    */
-  String getGroupBy() {
+  String groupBy() {
     return groupBy;
   }
 
   /**
    * Return the where clause for inheritance.
    */
-  String getInheritanceWhereSql() {
+  String inheritanceWhereSql() {
     return inheritanceWhereSql;
   }
 
@@ -122,7 +122,7 @@ final class SqlTree {
    * Return the property that is associated with the many. There can only be one
    * per SqlSelect. This can be null.
    */
-  STreePropertyAssocMany getManyProperty() {
+  STreePropertyAssocMany manyProperty() {
     return manyProperty;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
index a3661e816..367b67685 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
@@ -89,7 +89,7 @@ final class SqlTreeAlias {
       for (String propJoin : embeddedPropertyJoins) {
         String[] split = SplitName.split(propJoin);
         // the table alias of the parent path
-        String alias = getTableAlias(split[0]);
+        String alias = tableAlias(split[0]);
         aliasMap.put(propJoin, alias);
       }
     }
@@ -109,7 +109,7 @@ final class SqlTreeAlias {
   /**
    * Return the table alias for a given property name.
    */
-  String getTableAlias(String prefix) {
+  String tableAlias(String prefix) {
     if (prefix == null) {
       return rootTableAlias;
     } else {
@@ -124,7 +124,7 @@ final class SqlTreeAlias {
   /**
    * Return an alias using "Many where joins".
    */
-  String getTableAliasManyWhere(String prefix) {
+  String tableAliasManyWhere(String prefix) {
     if (prefix == null) {
       return rootTableAlias;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index faf4a2a5a..a018b081f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -104,8 +104,8 @@ public final class SqlTreeBuilder {
     this.distinctOnPlatform = builder.isPlatformDistinctOn();
     this.distinctNoLobs = builder.isPlatformDistinctNoLobs();
     String fromForUpdate = builder.fromForUpdate(query);
-    CQueryHistorySupport historySupport = builder.getHistorySupport(query);
-    CQueryDraftSupport draftSupport = builder.getDraftSupport(query);
+    CQueryHistorySupport historySupport = builder.historySupport(query);
+    CQueryDraftSupport draftSupport = builder.draftSupport(query);
     String colAlias = subQuery ? null : columnAliasPrefix;
     this.ctx = new DefaultDbSqlContext(alias, colAlias, historySupport, draftSupport, fromForUpdate);
   }
@@ -129,7 +129,7 @@ public final class SqlTreeBuilder {
       inheritanceWhereSql = buildWhereClause();
       groupBy = buildGroupByClause();
       distinctOn = buildDistinctOn();
-      encryptedProps = ctx.getEncryptedProps();
+      encryptedProps = ctx.encryptedProps();
       query.incrementAsOfTableCount(ctx.asOfTableCount());
     }
 
@@ -146,7 +146,7 @@ public final class SqlTreeBuilder {
       return "1";
     }
     rootNode.appendSelect(ctx, subQuery);
-    return trimComma(ctx.getContent());
+    return trimComma(ctx.content());
   }
 
   private String buildGroupByClause() {
@@ -155,7 +155,7 @@ public final class SqlTreeBuilder {
     }
     ctx.startGroupBy();
     rootNode.appendGroupBy(ctx, subQuery);
-    return trimComma(ctx.getContent());
+    return trimComma(ctx.content());
   }
 
   private String buildDistinctOn() {
@@ -164,8 +164,8 @@ public final class SqlTreeBuilder {
     }
     ctx.startGroupBy();
     rootNode.appendDistinctOn(ctx, subQuery);
-    String idCols = trimComma(ctx.getContent());
-    return idCols == null ? null : mergeOnDistinct(idCols, predicates.getDbOrderBy());
+    String idCols = trimComma(ctx.content());
+    return idCols == null ? null : mergeOnDistinct(idCols, predicates.dbOrderBy());
   }
 
   static String mergeOnDistinct(String idCols, String dbOrderBy) {
@@ -201,7 +201,7 @@ public final class SqlTreeBuilder {
       return "Not Used";
     }
     rootNode.appendWhere(ctx);
-    return ctx.getContent();
+    return ctx.content();
   }
 
   private String buildFromClause() {
@@ -209,14 +209,14 @@ public final class SqlTreeBuilder {
       return "Not Used";
     }
     rootNode.appendFrom(ctx, SqlJoinType.AUTO);
-    return ctx.getContent();
+    return ctx.content();
   }
 
   private void buildRoot(STreeType desc) {
     rootNode = buildSelectChain(null, null, desc, null);
     if (!rawSql) {
       alias.addJoin(queryDetail.getFetchPaths(), desc);
-      alias.addJoin(predicates.getPredicateIncludes(), desc);
+      alias.addJoin(predicates.predicateIncludes(), desc);
       alias.addManyWhereJoins(manyWhereJoins.getPropertyNames());
       // build set of table alias
       alias.buildAlias();
@@ -348,7 +348,7 @@ public final class SqlTreeBuilder {
     if (rawSql) {
       return;
     }
-    Set<String> predicateIncludes = predicates.getPredicateIncludes();
+    Set<String> predicateIncludes = predicates.predicateIncludes();
     if (predicateIncludes == null) {
       return;
     }
@@ -360,7 +360,7 @@ public final class SqlTreeBuilder {
 
     // remove ManyWhereJoins from the predicateIncludes
     predicateIncludes.removeAll(manyWhereJoins.getPropertyNames());
-    predicateIncludes.addAll(predicates.getOrderByIncludes());
+    predicateIncludes.addAll(predicates.orderByIncludes());
 
     // look for predicateIncludes that are not in selectIncludes and add
     // them as extra joins to the query
@@ -641,7 +641,7 @@ public final class SqlTreeBuilder {
         SqlTreeNodeExtraJoin root = findExtraJoinRoot(includeProp, extraJoin);
         // register the root because these are the only ones we
         // return back.
-        rootRegister.put(root.getName(), root);
+        rootRegister.put(root.name(), root);
       }
     }
 
@@ -653,7 +653,7 @@ public final class SqlTreeBuilder {
       if (extra == null) {
         return null;
       } else {
-        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, extra.getProperty(), extra.isContainsMany(), temporalMode);
+        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, extra.property(), extra.isContainsMany(), temporalMode);
         joinRegister.put(propertyName, extraJoin);
         return extraJoin;
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoad.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoad.java
index c5ac129b1..d2fa59c56 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoad.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoad.java
@@ -23,6 +23,6 @@ interface SqlTreeLoad {
   /**
    * Return the reader for the single attribute query.
    */
-  ScalarDataReader<?> getSingleAttributeReader();
+  ScalarDataReader<?> singleAttributeReader();
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java
index 48b476d33..a542fc89d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java
@@ -73,14 +73,14 @@ class SqlTreeLoadBean implements SqlTreeLoad {
   }
 
   @Override
-  public final ScalarDataReader<?> getSingleAttributeReader() {
+  public final ScalarDataReader<?> singleAttributeReader() {
     if (properties == null || properties.length == 0) {
       // if we have no property ask first children (in a distinct select with join)
       if (children.length == 0) {
         // expected to be a findIds query
         return desc.idBinder().getBeanProperty();
       }
-      return children[0].getSingleAttributeReader();
+      return children[0].singleAttributeReader();
     }
     if (properties[0] instanceof STreePropertyAssocOne) {
       STreePropertyAssocOne assocOne = (STreePropertyAssocOne)properties[0];
@@ -208,7 +208,7 @@ class SqlTreeLoadBean implements SqlTreeLoad {
       localBean = null;
       // ... but there may exist as reference bean in parent which has to be marked as deleted.
       if (parentBean != null && nodeBeanProp instanceof STreePropertyAssocOne) {
-        contextBean = ((STreePropertyAssocOne)nodeBeanProp).getValueAsEntityBean(parentBean);
+        contextBean = ((STreePropertyAssocOne)nodeBeanProp).valueAsEntityBean(parentBean);
         if (contextBean != null) {
           desc.markAsDeleted(contextBean);
         }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
index a09e7ad41..8e8c23167 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
@@ -94,7 +94,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     this.disableLazyLoad = disableLazyLoad || !readIdNormal || desc.isRawSqlBased();
     this.readOnly = readOnly;
     this.partialObject = props.isPartialObject();
-    this.properties = props.getProps();
+    this.properties = props.props();
     this.children = myChildren == null ? Collections.emptyList() : myChildren;
     this.pathMap = createPathMap(prefix, desc);
   }
@@ -248,7 +248,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
         if (ctx.length() > 0) {
           ctx.append(" and");
         }
-        ctx.append(" ").append(ctx.getTableAlias(prefix)).append(".");
+        ctx.append(" ").append(ctx.tableAlias(prefix)).append(".");
         ctx.append(inheritInfo.getWhere());
       }
     }
@@ -263,7 +263,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
       if (ctx.length() > 0) {
         ctx.append(" and");
       }
-      String ta = ctx.getTableAlias(prefix);
+      String ta = ctx.tableAlias(prefix);
       ctx.append(" ").append(extraWhere.replace("${ta}", ta));
     }
   }
@@ -280,7 +280,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
     ctx.pushJoin(prefix);
     ctx.pushTableAlias(prefix);
 
-    baseTableAlias = ctx.getTableAlias(prefix);
+    baseTableAlias = ctx.tableAlias(prefix);
     // join and return SqlJoinType to use for child joins
     joinType = appendFromBaseTable(ctx, joinType);
     for (STreeProperty property : properties) {
@@ -325,7 +325,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
        appendJoinDiscriminator(ctx);
     }
     if (desc.isSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) {
-      ctx.append(" and ").append(desc.softDeletePredicate(ctx.getTableAlias(prefix)));
+      ctx.append(" and ").append(desc.softDeletePredicate(ctx.tableAlias(prefix)));
     }
     return sqlJoinType;
   }
@@ -335,9 +335,9 @@ class SqlTreeNodeBean implements SqlTreeNode {
       STreePropertyAssocMany manyProp = (STreePropertyAssocMany) nodeBeanProp;
       if (manyProp.hasJoinTable()) {
 
-        String alias = ctx.getTableAlias(prefix);
+        String alias = ctx.tableAlias(prefix);
         String[] split = SplitName.split(prefix);
-        String parentAlias = ctx.getTableAlias(split[0]);
+        String parentAlias = ctx.tableAlias(split[0]);
         String alias2 = alias + "z_";
 
         // adding the additional join to the intersection table
@@ -354,7 +354,7 @@ class SqlTreeNodeBean implements SqlTreeNode {
 
   void appendJoinDiscriminator(DbSqlContext ctx) {
     if (inheritInfo.getWhere() == null) return;
-    String alias = ctx.getTableAlias(prefix);
+    String alias = ctx.tableAlias(prefix);
     ctx.append(" and ").append(alias).append(".").append(inheritInfo.getWhere());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index 5547d1c92..9b8806406 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -85,7 +85,7 @@ final class SqlTreeNodeExtraJoin implements SqlTreeNode {
     return manyJoin;
   }
 
-  public String getName() {
+  public String name() {
     return prefix;
   }
 
@@ -115,9 +115,9 @@ final class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
         manyToMany = true;
 
-        String alias = ctx.getTableAlias(prefix);
+        String alias = ctx.tableAlias(prefix);
         String[] split = SplitName.split(prefix);
-        String parentAlias = ctx.getTableAlias(split[0]);
+        String parentAlias = ctx.tableAlias(split[0]);
         String alias2 = alias + "z_";
 
         TableJoin manyToManyJoin = manyProp.intersectionTableJoin();
@@ -146,7 +146,7 @@ final class SqlTreeNodeExtraJoin implements SqlTreeNode {
       }
       joinType = assocBeanProperty.addJoin(joinType, prefix, ctx);
       if (!oneToOneExported && assocBeanProperty.isTargetSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) {
-        ctx.append(" and ").append(assocBeanProperty.softDeletePredicate(ctx.getTableAlias(prefix)));
+        ctx.append(" and ").append(assocBeanProperty.softDeletePredicate(ctx.tableAlias(prefix)));
       }
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
index cb2ba54e7..325f58cea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java
@@ -73,7 +73,6 @@ final class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
    */
   @Override
   public void appendFrom(DbSqlContext ctx, SqlJoinType currentJoinType) {
-
     // always use the join type as per this many where join
     // (OUTER for disjunction and otherwise INNER)
     appendFromBaseTable(ctx, manyJoinType);
@@ -84,9 +83,8 @@ final class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
    * intersection table if this is a ManyToMany node.
    */
   private void appendFromBaseTable(DbSqlContext ctx, SqlJoinType joinType) {
-
-    String alias = ctx.getTableAliasManyWhere(prefix);
-    String parentAlias = ctx.getTableAliasManyWhere(parentPrefix);
+    String alias = ctx.tableAliasManyWhere(prefix);
+    String parentAlias = ctx.tableAliasManyWhere(parentPrefix);
 
     if (nodeBeanProp instanceof STreePropertyAssocOne) {
       nodeBeanProp.addJoin(joinType, parentAlias, alias, ctx);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreePlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreePlan.java
index 7a0e929ef..03343b336 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreePlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreePlan.java
@@ -16,7 +16,7 @@ final class SqlTreePlan {
     this.dependentTables = dependentTables;
   }
 
-  SqlTreeRoot getRootNode() {
+  SqlTreeRoot rootNode() {
     return (SqlTreeRoot)rootNode;
   }
 
@@ -24,11 +24,11 @@ final class SqlTreePlan {
    * Return the property that is associated with the many. There can only be one
    * per SqlSelect. This can be null.
    */
-  STreePropertyAssocMany getManyProperty() {
+  STreePropertyAssocMany manyProperty() {
     return manyProperty;
   }
 
-  STreeProperty[] getEncryptedProps() {
+  STreeProperty[] encryptedProps() {
     return encryptedProps;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
index 806af5ef6..acc0cfae7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeProperties.java
@@ -53,7 +53,7 @@ public final class SqlTreeProperties {
     }
   }
 
-  public STreeProperty[] getProps() {
+  public STreeProperty[] props() {
     return propsList.toArray(new STreeProperty[0]);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeRoot.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeRoot.java
index 64938bc22..e9a927197 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeRoot.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeRoot.java
@@ -29,6 +29,6 @@ interface SqlTreeRoot {
   /**
    * Return a Scalar single attribute reader based on the first property.
    */
-  ScalarDataReader<?> getSingleAttributeReader();
+  ScalarDataReader<?> singleAttributeReader();
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
index 3ce478c92..f58ca42f0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java
@@ -33,7 +33,7 @@ final class OrmQueryPlanKey implements CQueryPlanKey {
   }
 
   @Override
-  public String getPartialKey() {
+  public String partialKey() {
     return description;
   }
 
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java
index 27663c6f3..9d7360e44 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java
@@ -30,7 +30,7 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase {
     FutureRowCount<Customer> futureRowCount = query.findFutureCount();
 
     QueryFutureRowCount<Customer> internalRowCount = (QueryFutureRowCount<Customer>) futureRowCount;
-    Transaction t = internalRowCount.getTransaction();
+    Transaction t = internalRowCount.transaction();
 
     try {
       futureRowCount.get();
@@ -57,7 +57,7 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase {
     FutureIds<Customer> futureIds = query.findFutureIds();
 
     QueryFutureIds<Customer> internalFuture = (QueryFutureIds<Customer>) futureIds;
-    Transaction t = internalFuture.getTransaction();
+    Transaction t = internalFuture.transaction();
 
     try {
       internalFuture.get();
@@ -85,7 +85,7 @@ public class TestFutureRowCountErrorHandling extends BaseTestCase {
     FutureList<Customer> futureList = query.findFutureList();
 
     QueryFutureList<Customer> internalFuture = (QueryFutureList<Customer>) futureList;
-    Transaction t = internalFuture.getTransaction();
+    Transaction t = internalFuture.transaction();
 
     try {
       internalFuture.get();

From 348535ec6cb05f0b50df3f9f4db3d091d81a4ba0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 15:35:17 +1200
Subject: [PATCH 015/127] Bump to 13.8.0-SNAPSHOT

---
 composites/ebean-clickhouse/pom.xml | 10 +++++-----
 composites/ebean-cockroach/pom.xml  | 10 +++++-----
 composites/ebean-db2/pom.xml        | 10 +++++-----
 composites/ebean-h2/pom.xml         | 10 +++++-----
 composites/ebean-hana/pom.xml       | 10 +++++-----
 composites/ebean-mariadb/pom.xml    | 10 +++++-----
 composites/ebean-mysql/pom.xml      | 10 +++++-----
 composites/ebean-nuodb/pom.xml      | 10 +++++-----
 composites/ebean-oracle/pom.xml     | 10 +++++-----
 composites/ebean-postgres/pom.xml   | 10 +++++-----
 composites/ebean-sqlite/pom.xml     | 10 +++++-----
 composites/ebean-sqlserver/pom.xml  | 10 +++++-----
 composites/ebean-yugabyte/pom.xml   | 10 +++++-----
 composites/ebean/pom.xml            | 10 +++++-----
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  6 +++---
 ebean-bom/pom.xml                   | 30 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 14 +++++++-------
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 10 +++++-----
 ebean-kotlin/pom.xml                |  6 +++---
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 +++++-----
 ebean-redis/pom.xml                 | 12 ++++++------
 ebean-test/pom.xml                  | 10 +++++-----
 kotlin-querybean-generator/pom.xml  | 10 +++++-----
 platforms/all/pom.xml               | 28 +++++++++++++--------------
 platforms/clickhouse/pom.xml        |  4 ++--
 platforms/db2/pom.xml               |  4 ++--
 platforms/h2/pom.xml                |  4 ++--
 platforms/hana/pom.xml              |  4 ++--
 platforms/hsqldb/pom.xml            |  4 ++--
 platforms/mariadb/pom.xml           |  6 +++---
 platforms/mysql/pom.xml             |  4 ++--
 platforms/nuodb/pom.xml             |  4 ++--
 platforms/oracle/pom.xml            |  4 ++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  4 ++--
 platforms/sqlanywhere/pom.xml       |  4 ++--
 platforms/sqlite/pom.xml            |  4 ++--
 platforms/sqlserver/pom.xml         |  4 ++--
 pom.xml                             |  2 +-
 querybean-generator/pom.xml         |  2 +-
 tests/test-java16/pom.xml           |  6 +++---
 tests/test-kotlin/pom.xml           |  4 ++--
 48 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 5af91d8b0..5c6d4b80c 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index ab97f9642..a370b6e56 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 3718fd183..11dc42d94 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 8918b1a3e..b8e885d60 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 31619dbdf..c07fc19e8 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index f3a5c357b..87b0f9100 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 0e9219f31..3ad64f295 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 67d293d1e..589c49259 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index cf9a9224c..61b6df847 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index c08967655..67f18f41f 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 8149565f9..fd0fe16b6 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 9ab1a547a..2317e1add 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 9a0b0c8ea..280f859df 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index e30c463f9..ddee85d39 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/pom.xml b/composites/pom.xml
index 3a32d4775..eecebf0f5 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index df62cb7f4..d327e113a 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index a8b20c069..327581e1b 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 5bf38eaee..366d0f4d1 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -78,88 +78,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.7.1-SNAPSHOT</version>
+        <version>13.8.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 872fb9730..37fb07572 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index e25218321..2973d7175 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index ee7c5167a..98f69cab3 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index ad21feb30..fa5529a14 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 1dbde4ab0..f4e13e3b5 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <scm>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index beff65f2f..5e7f254f9 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 7a081ae49..ced911279 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index cac8be938..7c29de344 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 6504cb0d3..4d5e639c1 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 9d55b07df..62baa62cb 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 58e945099..906cdb775 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index ed24b9b41..a7dadef67 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,67 +14,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index b1c8e47f4..f95a6f861 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 7c333eccd..8d499a357 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 14c088cff..411ade3b5 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 743dda8d1..105d904d1 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index fc178a807..5702c5b87 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 8e787eff9..47445a9ad 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,13 +14,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 32246ed82..8b78a359a 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 3f869453f..05bf274e0 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 28d039f11..a3fb1aaed 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 0cc56ea4a..9585201b8 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index d52441362..6d2c4f38c 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 22f864d01..17bde5f11 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 687b754ce..0c68262ff 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 6a8cccee3..c0bab3246 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index 28013be22..07b19ae2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.7.1-SNAPSHOT</version>
+  <version>13.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 2c02eb01e..61a903aeb 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-SNAPSHOT</version>
+    <version>13.8.0-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index e8b583983..a07b97694 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.7.1-SNAPSHOT</version>
+              <version>13.8.0-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 5cdb74b8f..573f384d2 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-SNAPSHOT</version>
+      <version>13.8.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From bc5cf0e326c092c8cdf66aa723cec765a07dad0c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 15:36:48 +1200
Subject: [PATCH 016/127] Bump to ebean-agent 13.8.0 (no effective change)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 07b19ae2c..4db69b4cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.7.0</ebean-agent.version>
-    <ebean-maven-plugin.version>13.7.0</ebean-maven-plugin.version>
+    <ebean-agent.version>13.8.0</ebean-agent.version>
+    <ebean-maven-plugin.version>13.8.0</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

From ab1a49abeebe8f523ffede848a21ff69fd7ed504 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 15:42:55 +1200
Subject: [PATCH 017/127] Include ebean-types and persistence-api in BOM

---
 ebean-api/pom.xml |  4 ++--
 ebean-bom/pom.xml | 11 +++++++++++
 pom.xml           |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index d327e113a..ee90c3e46 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>persistence-api</artifactId>
-      <version>3.0</version>
+      <version>${ebean-persistence-api.version}</version>
     </dependency>
 
     <dependency>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-types</artifactId>
-      <version>3.0</version>
+      <version>${ebean-types.version}</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 366d0f4d1..d332568c6 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -18,12 +18,23 @@
 
       <!-- dependencies external to this ebean.git build -->
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>persistence-api</artifactId>
+        <version>${ebean-persistence-api.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-annotation</artifactId>
         <version>${ebean-annotation.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-types</artifactId>
+        <version>${ebean-types.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
diff --git a/pom.xml b/pom.xml
index 4db69b4cc..c2ba9165a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,8 @@
     <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
     <jackson.version>2.13.2</jackson.version>
     <h2database.version>2.1.212</h2database.version>
+    <ebean-persistence-api.version>3.0</ebean-persistence-api.version>
+    <ebean-types.version>3.0</ebean-types.version>
     <ebean-annotation.version>8.2</ebean-annotation.version>
     <ebean-ddl-runner.version>2.2</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>

From a027c630b1822a25889a9606c7b898b8d91facba Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 16:04:25 +1200
Subject: [PATCH 018/127] [maven-release-plugin] prepare release
 ebean-parent-13.8.0

---
 composites/ebean-clickhouse/pom.xml | 14 ++++++++-----
 composites/ebean-cockroach/pom.xml  | 14 ++++++++-----
 composites/ebean-db2/pom.xml        | 14 ++++++++-----
 composites/ebean-h2/pom.xml         | 14 ++++++++-----
 composites/ebean-hana/pom.xml       | 14 ++++++++-----
 composites/ebean-mariadb/pom.xml    | 14 ++++++++-----
 composites/ebean-mysql/pom.xml      | 14 ++++++++-----
 composites/ebean-nuodb/pom.xml      | 14 ++++++++-----
 composites/ebean-oracle/pom.xml     | 14 ++++++++-----
 composites/ebean-postgres/pom.xml   | 14 ++++++++-----
 composites/ebean-sqlite/pom.xml     | 14 ++++++++-----
 composites/ebean-sqlserver/pom.xml  | 14 ++++++++-----
 composites/ebean-yugabyte/pom.xml   | 14 ++++++++-----
 composites/ebean/pom.xml            | 14 ++++++++-----
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 30 +++++++++++++--------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 10 ++++-----
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 ++++++++++++++++-------------
 platforms/clickhouse/pom.xml        |  8 ++++++--
 platforms/db2/pom.xml               |  8 ++++++--
 platforms/h2/pom.xml                |  8 ++++++--
 platforms/hana/pom.xml              |  8 ++++++--
 platforms/hsqldb/pom.xml            |  8 ++++++--
 platforms/mariadb/pom.xml           | 10 ++++++---
 platforms/mysql/pom.xml             |  8 ++++++--
 platforms/nuodb/pom.xml             |  8 ++++++--
 platforms/oracle/pom.xml            |  8 ++++++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++++++--
 platforms/sqlanywhere/pom.xml       |  8 ++++++--
 platforms/sqlite/pom.xml            |  8 ++++++--
 platforms/sqlserver/pom.xml         |  8 ++++++--
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 45 files changed, 294 insertions(+), 182 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 5c6d4b80c..d0345f4b9 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index a370b6e56..9b0fdafd8 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 11dc42d94..070b8630f 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index b8e885d60..8f69badf8 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index c07fc19e8..b340974fa 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 87b0f9100..1fb9cc8fa 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 3ad64f295..49f2a6c47 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 589c49259..623ab07f5 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 61b6df847..841c9f792 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 67f18f41f..9dec9d227 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index fd0fe16b6..bdb9c4263 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 2317e1add..ec05a6226 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 280f859df..ede706cfd 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index ddee85d39..99f9d3150 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index eecebf0f5..9189a617e 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index ee90c3e46..74bcd2a19 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 327581e1b..c809eb6f3 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.8.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index d332568c6..13ece1d86 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,88 +89,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.8.0-SNAPSHOT</version>
+        <version>13.8.0</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 37fb07572..08f3280f4 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 2973d7175..c5ff92a86 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.8.0</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 98f69cab3..fe80d9989 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index fa5529a14..105dc85f7 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index f4e13e3b5..705782ea2 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.8.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index ced911279..9860b6a15 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 7c29de344..2ea8c03d8 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 4d5e639c1..c425969ed 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 62baa62cb..5675fa240 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 906cdb775..bc212dfa8 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index a7dadef67..945203b4d 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,68 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index f95a6f861..86946cbc6 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 8d499a357..01be657eb 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 411ade3b5..bd097a854 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,4 +34,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 105d904d1..687f31cbf 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 5702c5b87..fb554caad 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 47445a9ad..3e959817f 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,14 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 8b78a359a..8013d3588 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 05bf274e0..46364aa9c 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index a3fb1aaed..99e1f415c 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 9585201b8..8cc98dfac 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 6d2c4f38c..2ec4a1dcc 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 17bde5f11..dae95c725 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 0c68262ff..0cdd08fe2 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index c0bab3246..5ebed7eb4 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.0</tag>
+  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index c2ba9165a..5d1c524ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.8.0-SNAPSHOT</version>
+  <version>13.8.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.8.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 61a903aeb..fa5d97dc7 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.0</version>
   </parent>
 
   <name>querybean generator</name>

From f827a292ffd6c7599403f8018a03ae84690d7c30 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 16:04:31 +1200
Subject: [PATCH 019/127] [maven-release-plugin] prepare for next development
 iteration

---
 composites/ebean-clickhouse/pom.xml | 14 +++++--------
 composites/ebean-cockroach/pom.xml  | 14 +++++--------
 composites/ebean-db2/pom.xml        | 14 +++++--------
 composites/ebean-h2/pom.xml         | 14 +++++--------
 composites/ebean-hana/pom.xml       | 14 +++++--------
 composites/ebean-mariadb/pom.xml    | 14 +++++--------
 composites/ebean-mysql/pom.xml      | 14 +++++--------
 composites/ebean-nuodb/pom.xml      | 14 +++++--------
 composites/ebean-oracle/pom.xml     | 14 +++++--------
 composites/ebean-postgres/pom.xml   | 14 +++++--------
 composites/ebean-sqlite/pom.xml     | 14 +++++--------
 composites/ebean-sqlserver/pom.xml  | 14 +++++--------
 composites/ebean-yugabyte/pom.xml   | 14 +++++--------
 composites/ebean/pom.xml            | 14 +++++--------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 30 +++++++++++++--------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 10 ++++-----
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 +++++++++++++----------------
 platforms/clickhouse/pom.xml        |  8 ++------
 platforms/db2/pom.xml               |  8 ++------
 platforms/h2/pom.xml                |  8 ++------
 platforms/hana/pom.xml              |  8 ++------
 platforms/hsqldb/pom.xml            |  8 ++------
 platforms/mariadb/pom.xml           | 10 +++------
 platforms/mysql/pom.xml             |  8 ++------
 platforms/nuodb/pom.xml             |  8 ++------
 platforms/oracle/pom.xml            |  8 ++------
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++------
 platforms/sqlanywhere/pom.xml       |  8 ++------
 platforms/sqlite/pom.xml            |  8 ++------
 platforms/sqlserver/pom.xml         |  8 ++------
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 45 files changed, 182 insertions(+), 294 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index d0345f4b9..1e8d82489 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 9b0fdafd8..2950decd7 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 070b8630f..a64cb0539 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 8f69badf8..e338b1cda 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index b340974fa..7b6877a4b 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 1fb9cc8fa..21d25d57c 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 49f2a6c47..8fccac180 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 623ab07f5..02236b1e0 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 841c9f792..c8b84dfb0 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 9dec9d227..9451cd305 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index bdb9c4263..6fb5f7f6f 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index ec05a6226..3d57702da 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index ede706cfd..e043e36db 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 99f9d3150..d2a0e18cd 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 9189a617e..5d0892f77 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 74bcd2a19..c2fe306be 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index c809eb6f3..e4e5d8eed 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.8.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 13ece1d86..e67c3c9f3 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,88 +89,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.8.0</version>
+        <version>13.8.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 08f3280f4..7cece551f 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index c5ff92a86..12cfd5c72 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.8.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index fe80d9989..b2d0a7b79 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 105dc85f7..1e5e9ba87 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 705782ea2..0973886bc 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.8.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 9860b6a15..5e00d8e38 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 2ea8c03d8..59a5320c8 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index c425969ed..f716a18d9 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 5675fa240..068a8b705 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index bc212dfa8..9bb408ca9 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 945203b4d..21ab14e0a 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,68 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 86946cbc6..6cd83c906 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 01be657eb..280c11930 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index bd097a854..b8013788c 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,8 +34,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 687f31cbf..e211fa257 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index fb554caad..3d25d9f07 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 3e959817f..eee5fdbbd 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 8013d3588..7e196c053 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 46364aa9c..77430ce13 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 99e1f415c..dbe111589 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 8cc98dfac..9369ff4ac 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 2ec4a1dcc..ac2b678ae 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index dae95c725..0773557c7 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 0cdd08fe2..84f95beaa 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 5ebed7eb4..8cd92a10f 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.0</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.0</tag>
-  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 5d1c524ab..85ab5a776 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.8.0</version>
+  <version>13.8.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.8.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index fa5d97dc7..b48111966 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 8632aef26839ddf66e77207df21ce5bf3c07e562 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 16:49:39 +1200
Subject: [PATCH 020/127] Add missing final modifier on methods of query bean
 types

---
 .../java/io/ebean/typequery/PBaseDate.java    |  4 +-
 .../java/io/ebean/typequery/PBaseNumber.java  | 14 +++---
 .../java/io/ebean/typequery/PBaseString.java  | 22 +++++-----
 .../java/io/ebean/typequery/PByteArray.java   |  3 +-
 .../java/io/ebean/typequery/PSqlDate.java     |  1 -
 .../java/io/ebean/typequery/TQAssocBean.java  | 43 +++++++++----------
 .../java/io/ebean/typequery/TQProperty.java   | 10 ++---
 .../io/ebean/typequery/TQPropertyBase.java    |  4 +-
 8 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseDate.java
index fa4631247..740e4f2d2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseDate.java
@@ -32,7 +32,7 @@ public abstract class PBaseDate<R, D extends Comparable> extends PBaseCompareabl
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R after(D value) {
+  public final R after(D value) {
     expr().gt(_name, value);
     return _root;
   }
@@ -43,7 +43,7 @@ public abstract class PBaseDate<R, D extends Comparable> extends PBaseCompareabl
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R before(D value) {
+  public final R before(D value) {
     expr().lt(_name, value);
     return _root;
   }
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseNumber.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseNumber.java
index 2c54bb6db..3f1de62d9 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseNumber.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseNumber.java
@@ -34,7 +34,7 @@ public abstract class PBaseNumber<R,T extends Comparable> extends PBaseCompareab
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R equalTo(int value) {
+  public final R equalTo(int value) {
     expr().eq(_name, value);
     return _root;
   }
@@ -45,7 +45,7 @@ public abstract class PBaseNumber<R,T extends Comparable> extends PBaseCompareab
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R greaterThan(int value) {
+  public final R greaterThan(int value) {
     expr().gt(_name, value);
     return _root;
   }
@@ -56,7 +56,7 @@ public abstract class PBaseNumber<R,T extends Comparable> extends PBaseCompareab
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R lessThan(int value) {
+  public final R lessThan(int value) {
     expr().lt(_name, value);
     return _root;
   }
@@ -68,7 +68,7 @@ public abstract class PBaseNumber<R,T extends Comparable> extends PBaseCompareab
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R eq(int value) {
+  public final R eq(int value) {
     expr().eq(_name, value);
     return _root;
   }
@@ -79,7 +79,7 @@ public abstract class PBaseNumber<R,T extends Comparable> extends PBaseCompareab
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R gt(int value) {
+  public final R gt(int value) {
     expr().gt(_name, value);
     return _root;
   }
@@ -90,7 +90,7 @@ public abstract class PBaseNumber<R,T extends Comparable> extends PBaseCompareab
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R lt(int value) {
+  public final R lt(int value) {
     expr().lt(_name, value);
     return _root;
   }
@@ -102,7 +102,7 @@ public abstract class PBaseNumber<R,T extends Comparable> extends PBaseCompareab
    * @param upper the upper bind value
    * @return the root query bean instance
    */
-  public R between(int lower, int upper) {
+  public final R between(int lower, int upper) {
     expr().between(_name, lower, upper);
     return _root;
   }
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java
index b985842e4..a0f3643d5 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBaseString.java
@@ -54,7 +54,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R ieq(String value) {
+  public final R ieq(String value) {
     expr().ieq(_name, value);
     return _root;
   }
@@ -65,7 +65,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R iequalTo(String value) {
+  public final R iequalTo(String value) {
     expr().ieq(_name, value);
     return _root;
   }
@@ -76,7 +76,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R like(String value) {
+  public final R like(String value) {
     expr().like(_name, value);
     return _root;
   }
@@ -87,7 +87,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R startsWith(String value) {
+  public final R startsWith(String value) {
     expr().startsWith(_name, value);
     return _root;
   }
@@ -98,7 +98,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R endsWith(String value) {
+  public final R endsWith(String value) {
     expr().endsWith(_name, value);
     return _root;
   }
@@ -109,7 +109,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R contains(String value) {
+  public final R contains(String value) {
     expr().contains(_name, value);
     return _root;
   }
@@ -120,7 +120,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R ilike(String value) {
+  public final R ilike(String value) {
     expr().ilike(_name, value);
     return _root;
   }
@@ -131,7 +131,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R istartsWith(String value) {
+  public final R istartsWith(String value) {
     expr().istartsWith(_name, value);
     return _root;
   }
@@ -142,7 +142,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R iendsWith(String value) {
+  public final R iendsWith(String value) {
     expr().iendsWith(_name, value);
     return _root;
   }
@@ -153,7 +153,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    * @param value the equal to bind value
    * @return the root query bean instance
    */
-  public R icontains(String value) {
+  public final R icontains(String value) {
     expr().icontains(_name, value);
     return _root;
   }
@@ -166,7 +166,7 @@ public abstract class PBaseString<R,T> extends PBaseCompareable<R, String> {
    *
    * @param value the match expression
    */
-  public R match(String value) {
+  public final R match(String value) {
     expr().match(_name, value);
     return _root;
   }
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PByteArray.java b/ebean-querybean/src/main/java/io/ebean/typequery/PByteArray.java
index 222215887..d2bc50353 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PByteArray.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PByteArray.java
@@ -5,7 +5,8 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PByteArray<R> extends PBaseValueEqual<R, byte[]> {
+public final class PByteArray<R> extends PBaseValueEqual<R, byte[]> {
+
   /**
    * Construct with a property name and root instance.
    *
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java
index b239dbc34..a935c9212 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java
@@ -7,7 +7,6 @@ import java.sql.Date;
  *
  * @param <R> the root query bean type
  */
-
 public final class PSqlDate<R> extends PBaseDate<R,Date> {
 
   /**
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
index d5843a612..194dcd4f4 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java
@@ -44,7 +44,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   /**
    * Eagerly fetch this association fetching all the properties.
    */
-  public R fetch() {
+  public final R fetch() {
     ((TQRootBean) _root).query().fetch(_name);
     return _root;
   }
@@ -52,7 +52,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   /**
    * Eagerly fetch this association using a "query join".
    */
-  public R fetchQuery() {
+  public final R fetchQuery() {
     ((TQRootBean) _root).query().fetchQuery(_name);
     return _root;
   }
@@ -61,7 +61,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    * Eagerly fetch this association using L2 bean cache.
    * Cache misses are populated via fetchQuery().
    */
-  public R fetchCache() {
+  public final R fetchCache() {
     ((TQRootBean) _root).query().fetchCache(_name);
     return _root;
   }
@@ -69,7 +69,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   /**
    * Use lazy loading for fetching this association.
    */
-  public R fetchLazy() {
+  public final R fetchLazy() {
     ((TQRootBean) _root).query().fetchLazy(_name);
     return _root;
   }
@@ -77,7 +77,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   /**
    * Eagerly fetch this association with the properties specified.
    */
-  public R fetch(String properties) {
+  public final R fetch(String properties) {
     ((TQRootBean) _root).query().fetch(_name, properties);
     return _root;
   }
@@ -85,7 +85,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   /**
    * Eagerly fetch this association using a "query join" with the properties specified.
    */
-  public R fetchQuery(String properties) {
+  public final R fetchQuery(String properties) {
     ((TQRootBean) _root).query().fetchQuery(_name, properties);
     return _root;
   }
@@ -94,7 +94,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    * Eagerly fetch this association using L2 cache with the properties specified.
    * Cache misses are populated via  fetchQuery().
    */
-  public R fetchCache(String properties) {
+  public final R fetchCache(String properties) {
     ((TQRootBean) _root).query().fetchCache(_name, properties);
     return _root;
   }
@@ -103,7 +103,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    * Deprecated in favor of fetch().
    */
   @Deprecated
-  public R fetchAll() {
+  public final R fetchAll() {
     return fetch();
   }
 
@@ -140,7 +140,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   }
 
   @SafeVarargs
-  private final R fetchWithProperties(FetchConfig config, TQProperty<?>... props) {
+  private R fetchWithProperties(FetchConfig config, TQProperty<?>... props) {
     spiQuery().fetchProperties(_name, properties(props), config);
     return _root;
   }
@@ -148,21 +148,21 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   /**
    * Fetch using the nested FetchGroup.
    */
-  public R fetch(FetchGroup<T> nestedGroup) {
+  public final R fetch(FetchGroup<T> nestedGroup) {
     return fetchNested(nestedGroup, FETCH_DEFAULT);
   }
 
   /**
    * Fetch query using the nested FetchGroup.
    */
-  public R fetchQuery(FetchGroup<T> nestedGroup) {
+  public final R fetchQuery(FetchGroup<T> nestedGroup) {
     return fetchNested(nestedGroup, FETCH_QUERY);
   }
 
   /**
    * Fetch cache using the nested FetchGroup.
    */
-  public R fetchCache(FetchGroup<T> nestedGroup) {
+  public final R fetchCache(FetchGroup<T> nestedGroup) {
     return fetchNested(nestedGroup, FETCH_CACHE);
   }
 
@@ -177,7 +177,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   }
 
   @SafeVarargs
-  private final Set<String> properties(TQProperty<?>... props) {
+  private Set<String> properties(TQProperty<?>... props) {
     Set<String> set = new LinkedHashSet<>();
     for (TQProperty<?> prop : props) {
       set.add(prop.propertyName());
@@ -188,7 +188,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   /**
    * Is equal to by ID property.
    */
-  public R eq(T other) {
+  public final R eq(T other) {
     expr().eq(_name, other);
     return _root;
   }
@@ -196,14 +196,14 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   /**
    * Is equal to by ID property.
    */
-  public R equalTo(T other) {
+  public final R equalTo(T other) {
     return eq(other);
   }
 
   /**
    * Is not equal to by ID property.
    */
-  public R ne(T other) {
+  public final R ne(T other) {
     expr().ne(_name, other);
     return _root;
   }
@@ -211,15 +211,14 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
   /**
    * Is not equal to by ID property.
    */
-  public R notEqualTo(T other) {
+  public final R notEqualTo(T other) {
     return ne(other);
   }
 
   /**
    * Apply a filter when fetching these beans.
    */
-  public R filterMany(ExpressionList<T> filter) {
-
+  public final R filterMany(ExpressionList<T> filter) {
     @SuppressWarnings("unchecked")
     ExpressionList<T> expressionList = (ExpressionList<T>) expr().filterMany(_name);
     expressionList.addAll(filter);
@@ -254,7 +253,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    * @param expressions The expressions including and, or, not etc with ? and ?1 bind params.
    * @param params      The bind parameter values
    */
-  public R filterMany(String expressions, Object... params) {
+  public final R filterMany(String expressions, Object... params) {
     expr().filterMany(_name, expressions, params);
     return _root;
   }
@@ -268,7 +267,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    * This expression only works on OneToMany and ManyToMany properties.
    * </p>
    */
-  public R isEmpty() {
+  public final R isEmpty() {
     expr().isEmpty(_name);
     return _root;
   }
@@ -282,7 +281,7 @@ public abstract class TQAssocBean<T, R> extends TQProperty<R> {
    * This expression only works on OneToMany and ManyToMany properties.
    * </p>
    */
-  public R isNotEmpty() {
+  public final R isNotEmpty() {
     expr().isNotEmpty(_name);
     return _root;
   }
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQProperty.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQProperty.java
index fac9efa56..364452832 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQProperty.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQProperty.java
@@ -38,21 +38,21 @@ public class TQProperty<R> {
   /**
    * Internal method to return the underlying expression list.
    */
-  protected ExpressionList<?> expr() {
-    return ((TQRootBean) _root).peekExprList();
+  protected final ExpressionList<?> expr() {
+    return ((TQRootBean<?,?>) _root).peekExprList();
   }
 
   /**
    * Return the property name.
    */
-  protected String propertyName() {
+  protected final String propertyName() {
     return _name;
   }
 
   /**
    * Is null.
    */
-  public R isNull() {
+  public final R isNull() {
     expr().isNull(_name);
     return _root;
   }
@@ -60,7 +60,7 @@ public class TQProperty<R> {
   /**
    * Is not null.
    */
-  public R isNotNull() {
+  public final R isNotNull() {
     expr().isNotNull(_name);
     return _root;
   }
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQPropertyBase.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQPropertyBase.java
index a6b8030a0..83a23e6ab 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQPropertyBase.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQPropertyBase.java
@@ -27,7 +27,7 @@ public class TQPropertyBase<R> extends TQProperty<R> {
   /**
    * Order by ascending on this property.
    */
-  public R asc() {
+  public final R asc() {
     expr().order().asc(_name);
     return _root;
   }
@@ -35,7 +35,7 @@ public class TQPropertyBase<R> extends TQProperty<R> {
   /**
    * Order by descending on this property.
    */
-  public R desc() {
+  public final R desc() {
     expr().order().desc(_name);
     return _root;
   }

From 2563d52ecfa47c8172939a7a28badd6eca1e8207 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 16:52:10 +1200
Subject: [PATCH 021/127] Fix versions after release

---
 ebean-kotlin/pom.xml      | 6 +++---
 tests/test-java16/pom.xml | 6 +++---
 tests/test-kotlin/pom.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index 5e7f254f9..1804821cc 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.0-SNAPSHOT</version>
+    <version>13.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index a07b97694..6d67f544b 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.8.0-SNAPSHOT</version>
+              <version>13.8.1-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 573f384d2..5ff6af755 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.0-SNAPSHOT</version>
+      <version>13.8.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From a23f241fff2d01c743e3a862eb34f1f2db7e5199 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 18 Aug 2022 22:44:31 +1200
Subject: [PATCH 022/127] Use AppLog and System.Logger for logging rather than
 slf4j-api

The avaje-applog-slf4j dependency means this is still using
slf4j-api for implementation. Remove that dependency and
service load the desired implementation.
---
 ebean-api/pom.xml                             |  32 ++--
 .../src/main/java/io/ebean/DbContext.java     |   8 +-
 .../src/main/java/io/ebean/EbeanVersion.java  |  20 ++-
 .../config/dbplatform/DatabasePlatform.java   |  25 ++-
 .../dbplatform/SequenceIdGenerator.java       |  13 +-
 .../java/io/ebean/event/ShutdownManager.java  |  20 +--
 .../io/ebean/text/csv/DefaultCsvCallback.java |  15 +-
 .../main/java/io/ebean/util/JdbcClose.java    |  16 +-
 ebean-api/src/main/java/module-info.java      |   3 +-
 .../service/DefaultAutoTuneService.java       |  28 ++--
 .../service/ProfileOriginNodeUsage.java       |  10 +-
 .../java/io/ebeaninternal/api/CoreLog.java    |   7 +-
 .../io/ebeaninternal/api/LoadManyRequest.java |   9 +-
 .../server/cache/DefaultCacheHolder.java      |  12 +-
 .../server/cache/DefaultServerCache.java      |  12 +-
 .../cache/DefaultServerCacheManager.java      |  14 +-
 .../changelog/DefaultChangeLogListener.java   |  10 +-
 .../server/cluster/ClusterManager.java        |  10 +-
 .../server/core/BeanRequest.java              |   4 +-
 .../server/core/DatabasePlatformFactory.java  |   5 +-
 .../server/core/DefaultBeanLoader.java        |   8 +-
 .../server/core/DefaultContainer.java         |  15 +-
 .../server/core/DefaultQueryPlanListener.java |   9 +-
 .../server/core/DefaultServer.java            |  79 ++--------
 .../server/core/DefaultSlowQueryListener.java |   9 +-
 .../server/core/InternalConfigXmlMap.java     |   3 +-
 .../server/core/InternalConfiguration.java    |  13 +-
 .../server/core/OrmQueryRequest.java          |   4 +-
 .../core/bootup/BootupClassPathSearch.java    |   7 +-
 .../server/core/bootup/BootupClasses.java     |   8 +-
 .../server/core/bootup/ManifestReader.java    |   8 +-
 .../server/deploy/BeanDescriptor.java         |  17 +-
 .../deploy/BeanDescriptorCacheHelp.java       | 146 +++++++++---------
 .../server/deploy/BeanDescriptorManager.java  |  30 ++--
 .../server/deploy/BeanFinderManager.java      |   7 +-
 .../server/deploy/BeanProperty.java           |   3 +-
 .../server/deploy/BeanPropertyAssoc.java      |   3 +-
 .../server/deploy/BeanPropertyAssocMany.java  |   7 +-
 .../deploy/BeanQueryAdapterManager.java       |   4 +-
 .../server/deploy/BeanTable.java              |   4 +-
 .../deploy/PersistControllerManager.java      |   4 +-
 .../server/deploy/PersistListenerManager.java |   4 +-
 .../server/deploy/PostConstructManager.java   |   4 +-
 .../server/deploy/PostLoadManager.java        |   4 +-
 .../deploy/meta/DeployBeanPropertyLists.java  |   4 +-
 .../deploy/parse/AnnotationAssocOnes.java     |   5 +-
 .../server/deploy/parse/AnnotationClass.java  |   4 +-
 .../deploy/parse/DeployCreateProperties.java  |   9 +-
 .../server/dto/DtoMetaBuilder.java            |   5 +-
 .../executor/DaemonExecutorService.java       |  15 +-
 .../executor/DaemonScheduleThreadPool.java    |  14 +-
 .../executor/DefaultBackgroundExecutor.java   |  25 ++-
 .../server/idgen/UuidV1IdGenerator.java       |  56 +++----
 .../server/idgen/UuidV1RndIdGenerator.java    |   9 +-
 .../server/logger/DLoggerFactory.java         |   4 +-
 .../server/logger/DSpiLogger.java             |  15 +-
 .../server/persist/BatchedPstmt.java          |   5 +-
 .../ebeaninternal/server/persist/Binder.java  |   3 +-
 .../server/persist/DefaultPersister.java      |  30 ++--
 .../server/persist/SaveManyBase.java          |   3 +-
 .../server/persist/SaveManyBeans.java         |   2 +-
 .../server/persist/dml/DmlHandler.java        |   4 +-
 .../io/ebeaninternal/server/query/CQuery.java |   8 +-
 .../server/query/CQueryEngine.java            |   7 +-
 .../query/CQueryFetchSingleAttribute.java     |   4 +-
 .../server/query/CQueryPlan.java              |   4 +-
 .../server/query/CQueryPlanManager.java       |   3 +-
 .../server/query/CQueryPredicates.java        |   4 +-
 .../server/query/QueryPlanLoggerExplain.java  |   4 +-
 .../server/query/QueryPlanLoggerOracle.java   |   4 +-
 .../server/query/QueryPlanLoggerPostgres.java |   4 +-
 .../query/QueryPlanLoggerSqlServer.java       |   6 +-
 .../server/query/SqlTreeBuilder.java          |  33 ++--
 .../readaudit/DefaultReadAuditLogger.java     |  20 +--
 .../transaction/DefaultProfileHandler.java    |  27 ++--
 .../ImplicitReadOnlyTransaction.java          |   3 +-
 .../server/transaction/JdbcTransaction.java   |  16 +-
 .../transaction/JtaTransactionManager.java    |  22 +--
 .../transaction/PostCommitProcessing.java     |   8 +-
 .../server/transaction/TableModState.java     |  26 ++--
 .../transaction/TransactionManager.java       |  16 +-
 .../ebeaninternal/server/type/DataBind.java   |  16 +-
 .../server/type/DefaultTypeManager.java       |  24 ++-
 .../server/type/ScalarTypeFile.java           |   5 +-
 ebean-core/src/main/java/module-info.java     |   1 -
 .../dbmigration/DdlGenerator.java             |  10 +-
 .../dbmigration/DefaultDbMigration.java       |  14 +-
 .../dbmigration/model/MTable.java             |   8 +-
 .../dbmigration/model/MigrationModel.java     |   9 +-
 .../dbmigration/model/PlatformDdlWriter.java  |   8 +-
 .../extraddl/model/ExtraDdlXmlReader.java     |   8 +-
 .../test/java/io/localtest/BaseTestCase.java  |  12 +-
 ebean-externalmapping-xml/pom.xml             |   7 -
 .../xmlmapping/InternalConfigXmlRead.java     |   7 -
 .../src/main/java/module-info.java            |   1 -
 ebean-postgis/pom.xml                         |   8 -
 .../main/java/io/ebean/redis/RedisCache.java  |  18 ++-
 .../io/ebean/redis/RedisCacheFactory.java     |  58 +++----
 .../ebean/redis/topic/DaemonTopicRunner.java  |  14 +-
 ebean-test/pom.xml                            |   7 +-
 .../io/ebean/test/CapturingLoggerFactory.java |  19 +--
 .../test/config/AutoConfigureForTesting.java  |  10 +-
 .../io/ebean/test/config/platform/Config.java |   8 +-
 .../config/platform/PlatformAutoConfig.java   |  14 +-
 .../config/provider/ProviderAutoConfig.java   |  10 +-
 ebean-test/src/main/java/module-info.java     |   2 +-
 .../ebean/platform/h2/H2HistoryTrigger.java   |  17 +-
 pom.xml                                       |   7 -
 108 files changed, 668 insertions(+), 758 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index c2fe306be..325b0a70a 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -13,15 +13,17 @@
 
   <dependencies>
 
-    <!--
-    Projects are expected to explicit depend on version
-    of slf4j that they want to use
-    -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.36</version>
-      <scope>provided</scope>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-applog</artifactId>
+      <version>1.0</version>
+    </dependency>
+
+    <!-- exclude avaje-applog-slf4j to direct logging to something else -->
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-applog-slf4j</artifactId>
+      <version>1.0</version>
     </dependency>
 
     <dependency>
@@ -30,12 +32,6 @@
       <version>2.2</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-applog-slf4j</artifactId>
-      <version>1.0</version>
-    </dependency>
-
     <!--
     Class retention Nonnull and Nullable annotations
     to assist with IDE auto-completion with Ebean API
@@ -70,6 +66,14 @@
       <version>${ebean-datasource.version}</version>
     </dependency>
 
+    <!-- Support MdcBackgroundExecutorWrapper -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.36</version>
+      <optional>true</optional>
+    </dependency>
+
     <!-- Jackson core used internally by Ebean -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/ebean-api/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java
index 3ce395cf7..c098f079a 100644
--- a/ebean-api/src/main/java/io/ebean/DbContext.java
+++ b/ebean-api/src/main/java/io/ebean/DbContext.java
@@ -2,10 +2,9 @@ package io.ebean;
 
 import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.datasource.DataSourceConfigurationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
+import java.lang.System.Logger.Level;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
@@ -15,7 +14,8 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 final class DbContext {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean");
+  private static final System.Logger log = EbeanVersion.log;
+
   static {
     EbeanVersion.getVersion();
   }
@@ -52,7 +52,7 @@ final class DbContext {
       throw new DataSourceConfigurationException(msg, e);
 
     } catch (Throwable e) {
-      log.error("Error trying to create the default Database", e);
+      log.log(Level.ERROR, "Error trying to create the default Database", e);
       throw new RuntimeException(e);
     }
   }
diff --git a/ebean-api/src/main/java/io/ebean/EbeanVersion.java b/ebean-api/src/main/java/io/ebean/EbeanVersion.java
index c47a546c0..7eaf5a52a 100644
--- a/ebean-api/src/main/java/io/ebean/EbeanVersion.java
+++ b/ebean-api/src/main/java/io/ebean/EbeanVersion.java
@@ -1,9 +1,12 @@
 package io.ebean;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.avaje.applog.AppLog;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.lang.System.Logger.Level;
 import java.util.Properties;
 
 /**
@@ -13,7 +16,7 @@ import java.util.Properties;
  */
 public final class EbeanVersion {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean");
+  public static final System.Logger log = AppLog.getLogger("io.ebean");
 
   /**
    * Maintain the minimum ebean-agent version manually based on required ebean-agent bug fixes.
@@ -21,6 +24,7 @@ public final class EbeanVersion {
   private static final int MIN_AGENT_MAJOR_VERSION = 12;
   private static final int MIN_AGENT_MINOR_VERSION = 12;
   private static String version = "unknown";
+
   static {
     readVersion();
     checkAgentVersion();
@@ -32,12 +36,12 @@ public final class EbeanVersion {
         if (in != null) {
           try (LineNumberReader reader = new LineNumberReader(new InputStreamReader(in))) {
             version = reader.readLine();
-            log.info("ebean version: {}", version);
+            log.log(Level.INFO, "ebean version: {0}", version);
           }
         }
       }
     } catch (IOException e) {
-      log.warn("Could not determine ebean version: {}", e.getMessage());
+      log.log(Level.WARNING, "Could not determine ebean version: {0}", e.getMessage());
     }
   }
 
@@ -49,13 +53,13 @@ public final class EbeanVersion {
           String agentVersion = readVersion(in);
           if (agentVersion != null) {
             if (checkMinAgentVersion(agentVersion)) {
-              log.error("Expected minimum ebean-agent version {}.{}.0 but we have {}, please update the ebean-agent", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, agentVersion);
+              log.log(Level.ERROR, "Expected minimum ebean-agent version {0}.{1}.0 but we have {2}, please update the ebean-agent", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, agentVersion);
             }
           }
         }
       }
     } catch (IOException e) {
-      log.warn("Could not check minimum ebean-agent version {}.{}.0 required due to - {}", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, e.getMessage());
+      log.log(Level.WARNING, "Could not check minimum ebean-agent version {0}.{1}.0 required due to - {2}", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, e.getMessage());
     }
   }
 
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 20b7ccd00..53d416372 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -1,32 +1,25 @@
 package io.ebean.config.dbplatform;
 
 import io.ebean.BackgroundExecutor;
+import io.ebean.EbeanVersion;
 import io.ebean.Query;
-import io.ebean.annotation.PartitionMode;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.config.CustomDbTypeMapping;
 import io.ebean.config.PlatformConfig;
 import io.ebean.util.JdbcClose;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
+import java.lang.System.Logger.Level;
+import java.sql.*;
 
 /**
  * Database platform specific settings.
  */
 public class DatabasePlatform {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean");
+  private static final System.Logger log = EbeanVersion.log;
 
   /**
    * Behavior used when ending a query only transaction (at read committed isolation level).
@@ -60,7 +53,7 @@ public class DatabasePlatform {
    * Can we use native java time API objects in
    * {@link ResultSet#getObject(int, Class)} and
    * {@link PreparedStatement#setObject(int, Object)}.
-   *
+   * <p>
    * Not all drivers (DB2 e.g.) will support this.
    */
   protected boolean supportsNativeJavaTime = true;
@@ -165,7 +158,7 @@ public class DatabasePlatform {
    * want to use quoted identifiers for. The backticks get converted to the
    * appropriate characters in convertQuotedIdentifiers
    */
-  private static final char[] QUOTED_IDENTIFIERS = new char[] { '"', '\'', '[', ']', '`' };
+  private static final char[] QUOTED_IDENTIFIERS = new char[]{'"', '\'', '[', ']', '`'};
 
   /**
    * The non-escaped like clause (to stop slash being escaped on some platforms).
@@ -666,7 +659,7 @@ public class DatabasePlatform {
         if (isQuote(dbName.charAt(dbName.length() - 1))) {
           return openQuote + dbName.substring(1, dbName.length() - 1) + closeQuote;
         } else {
-          log.error("Missing backquote on [" + dbName + "]");
+          log.log(Level.ERROR, "Missing backquote on [" + dbName + "]");
         }
       } else if (allQuotedIdentifiers) {
         return openQuote + dbName + closeQuote;
@@ -729,7 +722,7 @@ public class DatabasePlatform {
 
   protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
     // silently assume the database does not support the "for update" clause.
-    log.info("it seems your database does not support the 'for update' clause");
+    log.log(Level.INFO, "it seems your database does not support the 'for update' clause");
     return sql;
   }
 
@@ -763,7 +756,7 @@ public class DatabasePlatform {
     if (!schemaExists(dbSchema, connection)) {
       Statement query = connection.createStatement();
       try {
-        log.debug("create schema:{}", dbSchema);
+        log.log(Level.DEBUG, "create schema:{0}", dbSchema);
         query.executeUpdate("create schema " + dbSchema);
       } finally {
         JdbcClose.close(query);
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
index 10e8c924b..658c5e94e 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
@@ -1,13 +1,13 @@
 package io.ebean.config.dbplatform;
 
+import io.avaje.applog.AppLog;
 import io.ebean.BackgroundExecutor;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
+import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -24,7 +24,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
-  protected static final Logger log = LoggerFactory.getLogger("io.ebean.SEQ");
+  protected static final System.Logger log = AppLog.getLogger("io.ebean.SEQ");
 
   private final ReentrantLock lock = new ReentrantLock();
   protected final String seqName;
@@ -120,7 +120,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
   protected void loadInBackground(final int requestSize) {
     if (currentlyBackgroundLoading.get()) {
       // skip as already background loading
-      log.debug("... skip background sequence load (another load in progress)");
+      log.log(Level.DEBUG, "... skip background sequence load (another load in progress)");
       return;
     }
     currentlyBackgroundLoading.set(true);
@@ -152,9 +152,6 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
       resultSet = statement.executeQuery();
 
       List<Long> newIds = readIds(resultSet, requestSize);
-      if (log.isTraceEnabled()) {
-        log.trace("seq:{} loaded:{} sql:{}", seqName, newIds.size(), sql);
-      }
       if (newIds.isEmpty()) {
         throw new PersistenceException("Always expecting more than 1 row from " + sql);
       }
@@ -164,7 +161,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     } catch (SQLException e) {
       if (e.getMessage().contains("Database is already closed")) {
         String msg = "Error getting SEQ when DB shutting down " + e.getMessage();
-        log.error(msg);
+        log.log(Level.ERROR, msg);
         System.out.println(msg);
         return Collections.emptyList();
       } else {
diff --git a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
index 4341c5cfd..2547ee542 100644
--- a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
+++ b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
@@ -1,10 +1,10 @@
 package io.ebean.event;
 
 import io.ebean.Database;
+import io.ebean.EbeanVersion;
 import io.ebean.service.SpiContainer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -20,13 +20,14 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public final class ShutdownManager {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean");
+  private static final System.Logger log = EbeanVersion.log;
   private static final ReentrantLock lock = new ReentrantLock();
   private static final List<Database> databases = new ArrayList<>();
   private static final ShutdownHook shutdownHook = new ShutdownHook();
 
   private static boolean stopping;
   private static SpiContainer container;
+
   static {
     // Register the Shutdown hook
     registerShutdownHook();
@@ -120,8 +121,8 @@ public final class ShutdownManager {
         // Already run shutdown...
         return;
       }
-      if (log.isDebugEnabled()) {
-        log.debug("Ebean shutting down");
+      if (log.isLoggable(Level.DEBUG)) {
+        log.log(Level.DEBUG, "Ebean shutting down");
       }
       stopping = true;
       deregisterShutdownHook();
@@ -133,7 +134,7 @@ public final class ShutdownManager {
           Runnable r = (Runnable) ClassUtil.newInstance(shutdownRunner);
           r.run();
         } catch (Exception e) {
-          log.error("Error running custom shutdown runnable", e);
+          log.log(Level.ERROR, "Error running custom shutdown runnable", e);
         }
       }
 
@@ -147,7 +148,7 @@ public final class ShutdownManager {
         try {
           server.shutdown();
         } catch (Exception ex) {
-          log.error("Error executing shutdown runnable", ex);
+          log.log(Level.ERROR, "Error executing shutdown runnable", ex);
           ex.printStackTrace();
         }
       }
@@ -165,10 +166,10 @@ public final class ShutdownManager {
     while (drivers.hasMoreElements()) {
       Driver driver = drivers.nextElement();
       try {
-        log.info("De-registering jdbc driver: " + driver);
+        log.log(Level.INFO, "De-registering jdbc driver: " + driver);
         DriverManager.deregisterDriver(driver);
       } catch (SQLException e) {
-        log.error("Error de-registering driver " + driver, e);
+        log.log(Level.ERROR, "Error de-registering driver " + driver, e);
       }
     }
   }
@@ -204,6 +205,7 @@ public final class ShutdownManager {
     private ShutdownHook() {
       super("EbeanHook");
     }
+
     @Override
     public void run() {
       ShutdownManager.shutdown();
diff --git a/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java b/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
index cec104355..d2e6d3f98 100644
--- a/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
+++ b/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
@@ -1,9 +1,10 @@
 package io.ebean.text.csv;
 
 import io.ebean.Database;
+import io.ebean.EbeanVersion;
 import io.ebean.Transaction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.lang.System.Logger.Level;
 
 /**
  * Provides the default implementation of CsvCallback.
@@ -20,7 +21,7 @@ import org.slf4j.LoggerFactory;
  */
 public class DefaultCsvCallback<T> implements CsvCallback<T> {
 
-  private static final Logger log = LoggerFactory.getLogger(DefaultCsvCallback.class);
+  private static final System.Logger log = EbeanVersion.log;
 
   /**
    * The transaction to use (if not using CsvCallback).
@@ -128,7 +129,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
     // related beans (e.g. customer -> customer.billingAddress
     server.save(bean, transaction);
     if (logInfoFrequency > 0 && (row % logInfoFrequency == 0)) {
-      log.debug("processed {} rows", row);
+      log.log(Level.DEBUG, "processed {0} rows", row);
     }
   }
 
@@ -139,7 +140,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
   public void end(int row) {
     commitTransactionIfCreated();
     exeTime = System.currentTimeMillis() - startTime;
-    log.info("Csv finished, rows[{}] exeMillis[{}]", row, exeTime);
+    log.log(Level.INFO, "Csv finished, rows[{0}] exeMillis[{1}]", row, exeTime);
   }
 
   /**
@@ -160,7 +161,6 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
       transaction = server.beginTransaction();
       createdTransaction = true;
       if (persistBatchSize > 1) {
-        log.debug("Creating transaction, batchSize[{}]", persistBatchSize);
         transaction.setBatchMode(true);
         transaction.setBatchSize(persistBatchSize);
         transaction.setGetGeneratedKeys(false);
@@ -168,7 +168,6 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
         // explicitly turn off JDBC batching in case
         // is has been turned on globally
         transaction.setBatchMode(false);
-        log.debug("Creating transaction with no JDBC batching");
       }
     }
   }
@@ -180,7 +179,6 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
   protected void commitTransactionIfCreated() {
     if (createdTransaction) {
       transaction.commit();
-      log.debug("Committed transaction");
     }
   }
 
@@ -191,7 +189,6 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
   protected void rollbackTransactionIfCreated(Throwable e) {
     if (createdTransaction) {
       transaction.rollback(e);
-      log.debug("Rolled back transaction");
     }
   }
 
diff --git a/ebean-api/src/main/java/io/ebean/util/JdbcClose.java b/ebean-api/src/main/java/io/ebean/util/JdbcClose.java
index a1d04536e..b450db79a 100644
--- a/ebean-api/src/main/java/io/ebean/util/JdbcClose.java
+++ b/ebean-api/src/main/java/io/ebean/util/JdbcClose.java
@@ -1,8 +1,8 @@
 package io.ebean.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.ebean.EbeanVersion;
 
+import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -13,7 +13,7 @@ import java.sql.Statement;
  */
 public final class JdbcClose {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean");
+  private static final System.Logger log = EbeanVersion.log;
 
   /**
    * Close the resultSet logging if an error occurs.
@@ -24,7 +24,7 @@ public final class JdbcClose {
         statement.close();
       }
     } catch (SQLException e) {
-      log.warn("Error closing statement", e);
+      log.log(Level.WARNING, "Error closing statement", e);
     }
   }
 
@@ -37,7 +37,7 @@ public final class JdbcClose {
         resultSet.close();
       }
     } catch (SQLException e) {
-      log.warn("Error closing resultSet", e);
+      log.log(Level.WARNING, "Error closing resultSet", e);
     }
   }
 
@@ -50,7 +50,7 @@ public final class JdbcClose {
         connection.close();
       }
     } catch (SQLException e) {
-      log.warn("Error closing connection", e);
+      log.log(Level.WARNING, "Error closing connection", e);
     }
   }
 
@@ -63,7 +63,7 @@ public final class JdbcClose {
         connection.rollback();
       }
     } catch (SQLException e) {
-      log.warn("Error on connection rollback", e);
+      log.log(Level.WARNING, "Error on connection rollback", e);
     }
   }
 
@@ -76,7 +76,7 @@ public final class JdbcClose {
         stmt.cancel();
       }
     } catch (SQLException e) {
-      log.warn("Error on cancelling statement", e);
+      log.log(Level.WARNING, "Error on cancelling statement", e);
     }
   }
 }
diff --git a/ebean-api/src/main/java/module-info.java b/ebean-api/src/main/java/module-info.java
index 7c8453cea..e5128fb5f 100644
--- a/ebean-api/src/main/java/module-info.java
+++ b/ebean-api/src/main/java/module-info.java
@@ -15,8 +15,9 @@ module io.ebean.api {
   requires transitive persistence.api;
   requires transitive io.ebean.annotation;
   requires transitive io.ebean.datasource.api;
-  requires transitive org.slf4j;
+  requires transitive io.avaje.applog;
 
+  requires static org.slf4j;
   requires static io.ebean.types;
   requires static com.fasterxml.jackson.core;
   requires static com.fasterxml.jackson.databind;
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
index b8d302f23..be43c42af 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.autotune.service;
 
+import io.avaje.applog.AppLog;
 import io.ebean.config.AutoTuneConfig;
 import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.SpiEbeanServer;
@@ -7,12 +8,11 @@ import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.autotune.AutoTuneService;
 import io.ebeaninternal.server.autotune.model.Autotune;
 import io.ebeaninternal.server.autotune.model.Origin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.System.Logger.Level;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -21,7 +21,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class DefaultAutoTuneService implements AutoTuneService {
 
-  private static final Logger logger = LoggerFactory.getLogger(DefaultAutoTuneService.class);
+  private static final System.Logger logger = AppLog.getLogger(DefaultAutoTuneService.class);
 
   private final ReentrantLock lock = new ReentrantLock();
 
@@ -111,7 +111,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
         if (stream != null) {
           loadAutoTuneProfiling(AutoTuneXmlReader.read(stream));
         } else {
-          logger.warn("AutoTune file {} not found - no initial automatic query tuning", tuningFile);
+          logger.log(Level.WARNING, "AutoTune file {0} not found - no initial automatic query tuning", tuningFile);
         }
       } catch (IOException e) {
         throw new IllegalStateException("Error on auto close of " + tuningFile, e);
@@ -120,7 +120,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
   }
 
   private void loadAutoTuneProfiling(Autotune profiling) {
-    logger.info("AutoTune loading {} tuning entries", profiling.getOrigin().size());
+    logger.log(Level.INFO, "AutoTune loading {0} tuning entries", profiling.getOrigin().size());
     for (Origin origin : profiling.getOrigin()) {
       queryTuner.put(origin);
     }
@@ -141,17 +141,17 @@ public class DefaultAutoTuneService implements AutoTuneService {
         event.process();
         if (event.isEmpty()) {
           long exeMillis = System.currentTimeMillis() - start;
-          logger.debug("No query tuning updates for server:{} executionMillis:{}", serverName, exeMillis);
+          logger.log(Level.DEBUG, "No query tuning updates for server:{0} executionMillis:{1}", serverName, exeMillis);
 
         } else {
           // report the query tuning changes that have been made
           runtimeChangeCount += event.getChangeCount();
           event.writeFile(profilingFile + "-" + serverName + "-update");
           long exeMillis = System.currentTimeMillis() - start;
-          logger.info("query tuning updates - new:{} diff:{} for server:{} executionMillis:{}", event.getNewCount(), event.getDiffCount(), serverName, exeMillis);
+          logger.log(Level.INFO, "query tuning updates - new:{0} diff:{1} for server:{2} executionMillis:{3}", event.getNewCount(), event.getDiffCount(), serverName, exeMillis);
         }
       } catch (Throwable e) {
-        logger.error("Error collecting or applying automatic query tuning", e);
+        logger.log(Level.ERROR, "Error collecting or applying automatic query tuning", e);
       }
     } finally {
       lock.unlock();
@@ -172,11 +172,11 @@ public class DefaultAutoTuneService implements AutoTuneService {
         AutoTuneDiffCollection event = new AutoTuneDiffCollection(profiling, queryTuner, false);
         event.process();
         if (event.isEmpty()) {
-          logger.info("No new or diff entries for profiling server:{}", serverName);
+          logger.log(Level.INFO, "No new or diff entries for profiling server:{0}", serverName);
 
         } else {
           event.writeFile(profilingFile + "-" + serverName);
-          logger.info("writing new:{} diff:{} profiling entries for server:{}", event.getNewCount(), event.getDiffCount(), serverName);
+          logger.log(Level.INFO, "writing new:{0} diff:{1} profiling entries for server:{2}", event.getNewCount(), event.getDiffCount(), serverName);
         }
       }
     } finally {
@@ -196,7 +196,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
   private void outputAllTuning() {
 
     if (runtimeChangeCount == 0) {
-      logger.info("no runtime query tuning changes for server:{}", serverName);
+      logger.log(Level.INFO, "no runtime query tuning changes for server:{0}", serverName);
 
     } else {
       AutoTuneAllCollection event = new AutoTuneAllCollection(queryTuner);
@@ -205,12 +205,12 @@ public class DefaultAutoTuneService implements AutoTuneService {
       if (existingTuning.exists()) {
         // rename the existing autotune.xml file (appending 'now')
         if (!existingTuning.renameTo(new File(tuningFile + "." + AutoTuneXmlWriter.now()))) {
-          logger.warn("Failed to rename autotune file [{}]", tuningFile);
+          logger.log(Level.WARNING, "Failed to rename autotune file [{0}]", tuningFile);
         }
       }
 
       event.writeFile(tuningFile, false);
-      logger.info("query tuning detected [{}] changes, writing all [{}] tuning entries for server:{}", runtimeChangeCount, size, serverName);
+      logger.log(Level.INFO, "query tuning detected [{0}] changes, writing all [{1}] tuning entries for server:{2}", runtimeChangeCount, size, serverName);
     }
   }
 
@@ -279,7 +279,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
     } catch (InterruptedException e) {
       // restore the interrupted status
       Thread.currentThread().interrupt();
-      logger.warn("Error while sleeping after System.gc() request.", e);
+      logger.log(Level.WARNING, "Error while sleeping after System.gc() request.", e);
     }
   }
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
index c5a3c17db..fb9007ebf 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.autotune.service;
 
+import io.avaje.applog.AppLog;
 import io.ebean.bean.NodeUsageCollector;
 import io.ebean.text.PathProperties;
 import io.ebean.util.SplitName;
@@ -7,9 +8,8 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
 import io.ebeaninternal.server.el.ElPropertyValue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
@@ -19,7 +19,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class ProfileOriginNodeUsage {
 
-  private static final Logger logger = LoggerFactory.getLogger(ProfileOriginNodeUsage.class);
+  private static final System.Logger logger = AppLog.getLogger(ProfileOriginNodeUsage.class);
 
   private final ReentrantLock lock = new ReentrantLock();
 
@@ -45,7 +45,7 @@ public class ProfileOriginNodeUsage {
       if (path != null) {
         ElPropertyValue elGetValue = rootDesc.elGetValue(path);
         if (elGetValue == null) {
-          logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name());
+          logger.log(Level.WARNING, "AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name());
           return;
         } else {
           BeanProperty beanProperty = elGetValue.beanProperty();
@@ -61,7 +61,7 @@ public class ProfileOriginNodeUsage {
       for (String propName : aggregateUsed) {
         BeanProperty beanProp = desc.findPropertyFromPath(propName);
         if (beanProp == null) {
-          logger.warn("AutoTune: Can't find property[" + propName + "] for " + desc.name());
+          logger.log(Level.WARNING, "AutoTune: Can't find property[" + propName + "] for " + desc.name());
 
         } else {
           if (beanProp.isId()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/CoreLog.java b/ebean-core/src/main/java/io/ebeaninternal/api/CoreLog.java
index cfbf56283..85b491d15 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/CoreLog.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/CoreLog.java
@@ -1,13 +1,12 @@
 package io.ebeaninternal.api;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.avaje.applog.AppLog;
 
 /**
  * Common loggers used in ebean-core.
  */
 public final class CoreLog {
 
-  public static final Logger log = LoggerFactory.getLogger("io.ebean.core");
-  public static final Logger internal = LoggerFactory.getLogger("io.ebean.internal");
+  public static final System.Logger log = AppLog.getLogger("io.ebean.core");
+  public static final System.Logger internal = AppLog.getLogger("io.ebean.internal");
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
index dcbc3c32b..b2956f1d2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
@@ -7,17 +7,18 @@ import io.ebeaninternal.server.core.BindPadding;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import org.slf4j.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Request for loading Associated Many Beans.
  */
 public final class LoadManyRequest extends LoadRequest {
 
-  private static final Logger log = CoreLog.log;
+  private static final System.Logger log = CoreLog.log;
 
   private final List<BeanCollection<?>> batch;
   private final LoadManyBuffer loadContext;
@@ -113,10 +114,10 @@ public final class LoadManyRequest extends LoadRequest {
     // in the +query or +lazy load due to no rows (predicates)
     for (BeanCollection<?> bc : batch) {
       if (bc.checkEmptyLazyLoad()) {
-        if (log.isDebugEnabled()) {
+        if (log.isLoggable(DEBUG)) {
           EntityBean ownerBean = bc.getOwnerBean();
           Object parentId = desc.getId(ownerBean);
-          log.debug("BeanCollection after lazy load was empty. type:" + ownerBean.getClass().getName() + " id:" + parentId + " owner:" + ownerBean);
+          log.log(DEBUG, "BeanCollection after lazy load was empty. type:" + ownerBean.getClass().getName() + " id:" + parentId + " owner:" + ownerBean);
         }
       } else if (loadCache && many.isUseCache()) {
         desc.cacheManyPropPut(many, bc, desc.getId(bc.getOwnerBean()));
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index ad3faa749..cf6a02089 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.cache;
 
+import io.avaje.applog.AppLog;
 import io.ebean.annotation.Cache;
 import io.ebean.annotation.CacheBeanTuning;
 import io.ebean.annotation.CacheQueryTuning;
@@ -7,9 +8,8 @@ import io.ebean.cache.*;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.util.AnnotationUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
@@ -20,7 +20,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 final class DefaultCacheHolder {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.ALL");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.cache.ALL");
 
   private final ReentrantLock lock = new ReentrantLock();
   private final ConcurrentHashMap<String, ServerCache> allCaches = new ConcurrentHashMap<>();
@@ -89,7 +89,7 @@ final class DefaultCacheHolder {
   }
 
   void clearAll() {
-    log.debug("clearAll");
+    log.log(Level.DEBUG, "clearAll");
     for (ServerCache serverCache : allCaches.values()) {
       serverCache.clear();
     }
@@ -97,7 +97,7 @@ final class DefaultCacheHolder {
 
 
   public void clear(String name) {
-    log.debug("clear {}", name);
+    log.log(Level.DEBUG, "clear {0}", name);
     clearIfExists(key(name, ServerCacheType.QUERY));
     clearIfExists(key(name, ServerCacheType.BEAN));
     clearIfExists(key(name, ServerCacheType.NATURAL_KEY));
@@ -112,7 +112,7 @@ final class DefaultCacheHolder {
   private void clearIfExists(String fullKey) {
     ServerCache cache = allCaches.get(fullKey);
     if (cache != null) {
-      log.trace("clear cache {}", fullKey);
+      log.log(Level.TRACE, "clear cache {0}", fullKey);
       cache.clear();
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index f3b49fd2e..e5bfd2628 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -1,15 +1,15 @@
 package io.ebeaninternal.server.cache;
 
+import io.avaje.applog.AppLog;
 import io.ebean.BackgroundExecutor;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheStatistics;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.metric.CountMetric;
 import io.ebean.metric.MetricFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
+import java.lang.System.Logger.Level;
 import java.lang.ref.SoftReference;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -25,7 +25,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class DefaultServerCache implements ServerCache {
 
-  protected static final Logger logger = LoggerFactory.getLogger(DefaultServerCache.class);
+  protected static final System.Logger logger = AppLog.getLogger(DefaultServerCache.class);
 
   /**
    * Compare by last access time (for LRU eviction).
@@ -287,13 +287,13 @@ public class DefaultServerCache implements ServerCache {
         evictCount.add(trimmedByGC);
         evictCount.add(trimmedByTTL);
         evictCount.add(trimmedByLRU);
-        if (logger.isTraceEnabled()) {
+        if (logger.isLoggable(Level.TRACE)) {
           long exeMicros = TimeUnit.MICROSECONDS.convert(System.nanoTime() - startNanos, TimeUnit.NANOSECONDS);
-          logger.trace("Executed trim of cache {} in [{}]millis idle[{}] timeToLive[{}] accessTime[{}] gc[{}]",
+          logger.log(Level.TRACE, "Executed trim of cache {0} in [{1}]millis idle[{2}] timeToLive[{3}] accessTime[{4}] gc[{5}]",
             name, exeMicros, trimmedByIdle, trimmedByTTL, trimmedByLRU, trimmedByGC);
         }
       } catch (Throwable e) {
-        logger.warn("Error during trim of DefaultServerCache [" + name + "]. Cache might be bigger than desired.", e);
+        logger.log(Level.WARNING, "Error during trim of DefaultServerCache [" + name + "]. Cache might be bigger than desired.", e);
       }
     } finally {
       lock.unlock();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
index 00f551da8..6142f6d50 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.cache;
 
+import io.avaje.applog.AppLog;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheRegion;
 import io.ebean.cache.ServerCacheType;
@@ -7,9 +8,8 @@ import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.SpiCacheRegion;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.deploy.DCacheRegion;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.util.*;
 
 /**
@@ -17,7 +17,7 @@ import java.util.*;
  */
 public final class DefaultServerCacheManager implements SpiCacheManager {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.REGION");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.cache.REGION");
 
   private final Map<String, SpiCacheRegion> regionMap = new HashMap<>();
   private final ClusterManager clusterManager;
@@ -65,23 +65,23 @@ public final class DefaultServerCacheManager implements SpiCacheManager {
           enabled.add(region.name());
           if (!region.isEnabled()) {
             region.setEnabled(true);
-            log.debug("Cache region[{}] enabled", region.name());
+            log.log(Level.DEBUG, "Cache region[{0}] enabled", region.name());
           }
         } else {
           disabled.add(region.name());
           if (region.isEnabled()) {
             region.setEnabled(false);
-            log.debug("Cache region[{}] disabled", region.name());
+            log.log(Level.DEBUG, "Cache region[{0}] disabled", region.name());
           }
         }
       }
-      log.info("Cache regions enabled:{} disabled:{}", enabled, disabled);
+      log.log(Level.INFO, "Cache regions enabled:{0} disabled:{1}", enabled, disabled);
     }
   }
 
   @Override
   public void setAllRegionsEnabled(boolean enabled) {
-    log.debug("All cache regions enabled[{}]", enabled);
+    log.log(Level.DEBUG, "All cache regions enabled[{0}]", enabled);
     for (SpiCacheRegion region : regionMap.values()) {
       region.setEnabled(enabled);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
index 597d87df0..c85edd315 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.changelog;
 
+import io.avaje.applog.AppLog;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeSet;
@@ -7,10 +8,9 @@ import io.ebean.event.changelog.ChangeType;
 import io.ebean.plugin.Plugin;
 import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.CoreLog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.StringWriter;
+import java.lang.System.Logger.Level;
 import java.util.Properties;
 
 /**
@@ -21,7 +21,7 @@ public final class DefaultChangeLogListener implements ChangeLogListener, Plugin
   /**
    * The named logger we send the change set payload to. Can be externally configured as desired.
    */
-  private static final Logger changeLog = LoggerFactory.getLogger("io.ebean.ChangeLog");
+  private static final System.Logger changeLog = AppLog.getLogger("io.ebean.ChangeLog");
 
   /**
    * Used to build the JSON.
@@ -65,9 +65,9 @@ public final class DefaultChangeLogListener implements ChangeLogListener, Plugin
       try {
         StringWriter writer = new StringWriter(getBufferSize(beanChange));
         jsonBuilder.writeBeanJson(writer, beanChange, changeSet);
-        changeLog.info(writer.toString());
+        changeLog.log(Level.INFO, writer.toString());
       } catch (Exception e) {
-        CoreLog.log.error("Exception logging beanChange " + beanChange, e);
+        CoreLog.log.log(Level.ERROR, "Exception logging beanChange " + beanChange, e);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
index b273c031a..4af7e1fce 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
@@ -1,11 +1,11 @@
 package io.ebeaninternal.server.cluster;
 
+import io.avaje.applog.AppLog;
 import io.ebean.Database;
 import io.ebean.config.ContainerConfig;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
@@ -16,7 +16,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class ClusterManager implements ServerLookup {
 
-  private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
+  private static final System.Logger clusterLogger = AppLog.getLogger("io.ebean.Cluster");
 
   private final ReentrantLock lock = new ReentrantLock();
 
@@ -112,8 +112,8 @@ public class ClusterManager implements ServerLookup {
    */
   public void broadcast(RemoteTransactionEvent event) {
     if (broadcast != null) {
-      if (clusterLogger.isDebugEnabled()) {
-        clusterLogger.debug("sending: {}", event);
+      if (clusterLogger.isLoggable(Level.DEBUG)) {
+        clusterLogger.log(Level.DEBUG, "sending: {0}", event);
       }
       broadcast.broadcast(event);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
index 45fe5ff14..6d68210bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
@@ -6,6 +6,8 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 
+import java.lang.System.Logger.Level;
+
 /**
  * Base class for find and persist requests.
  */
@@ -61,7 +63,7 @@ public abstract class BeanRequest {
         // Just log this and carry on. A previous exception has been
         // thrown and if this rollback throws exception it likely means
         // that the connection is broken (and the dataSource and db will cleanup)
-        CoreLog.log.error("Error trying to rollback a transaction (after a prior exception thrown)", e);
+        CoreLog.log.log(Level.ERROR, "Error trying to rollback a transaction (after a prior exception thrown)", e);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 407ebcaf8..265e71cba 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -8,6 +8,7 @@ import io.ebeaninternal.api.DbOffline;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
+import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
@@ -38,7 +39,7 @@ public class DatabasePlatformFactory {
     try {
       String offlinePlatform = DbOffline.getPlatform();
       if (offlinePlatform != null) {
-        CoreLog.log.info("offline platform [{}]", offlinePlatform);
+        CoreLog.log.log(Level.INFO, "offline platform [{0}]", offlinePlatform);
         return byDatabaseName(offlinePlatform);
       }
       if (config.getDatabasePlatformName() != null) {
@@ -87,7 +88,7 @@ public class DatabasePlatformFactory {
     String dbProductName = metaData.getDatabaseProductName().toLowerCase();
     final int majorVersion = metaData.getDatabaseMajorVersion();
     final int minorVersion = metaData.getDatabaseMinorVersion();
-    CoreLog.log.debug("platform for productName[{}] version[{}.{}]", dbProductName, majorVersion, minorVersion);
+    CoreLog.log.log(Level.DEBUG, "platform for productName[{0}] version[{1}.{2}]", dbProductName, majorVersion, minorVersion);
     for (DatabasePlatformProvider provider : providers) {
       if (provider.matchByProductName(dbProductName)) {
         return provider.create(majorVersion, minorVersion, metaData, connection);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 5bdf93a34..7cd82edeb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -12,9 +12,9 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
-import org.slf4j.Logger;
 
 import javax.persistence.EntityNotFoundException;
+import java.lang.System.Logger.Level;
 import java.util.List;
 import java.util.Set;
 
@@ -23,7 +23,7 @@ import java.util.Set;
  */
 final class DefaultBeanLoader {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final DefaultServer server;
   private final boolean onIterateUseExtraTxn;
@@ -108,8 +108,8 @@ final class DefaultBeanLoader {
     server.findOne(query, null);
     if (beanCollection != null) {
       if (beanCollection.checkEmptyLazyLoad()) {
-        if (log.isDebugEnabled()) {
-          log.debug("BeanCollection after load was empty. Owner:" + beanCollection.getOwnerBean());
+        if (log.isLoggable(Level.DEBUG)) {
+          log.log(Level.DEBUG, "BeanCollection after load was empty. Owner:" + beanCollection.getOwnerBean());
         }
       } else if (useManyIdCache) {
         parentDesc.cacheManyPropPut(many, beanCollection, parentId);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 5b8499661..eb1cb1fe2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.core;
 
 import io.ebean.config.*;
-import io.ebean.config.EntityClassRegister;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.ShutdownManager;
 import io.ebean.service.SpiContainer;
@@ -13,9 +12,9 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
-import org.slf4j.Logger;
 
 import javax.persistence.PersistenceException;
+import java.lang.System.Logger.Level;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -28,7 +27,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public final class DefaultContainer implements SpiContainer {
 
-  private static final Logger log = CoreLog.log;
+  private static final System.Logger log = CoreLog.log;
 
   private final ReentrantLock lock = new ReentrantLock();
   private final ClusterManager clusterManager;
@@ -108,7 +107,7 @@ public final class DefaultContainer implements SpiContainer {
         startServer(online, server);
       }
       DbOffline.reset();
-      log.info("Started database[{}] platform[{}] in {}ms", config.getName(), config.getDatabasePlatform().getPlatform(), System.currentTimeMillis() - start);
+      log.log(Level.INFO, "Started database[{0}] platform[{1}] in {2}ms", config.getName(), config.getDatabasePlatform().getPlatform(), System.currentTimeMillis() - start);
       return server;
     } finally {
       lock.unlock();
@@ -137,7 +136,7 @@ public final class DefaultContainer implements SpiContainer {
   private void checkMissingModulePathProvides() {
     URL servicesFile = ClassLoader.getSystemResource("META-INF/services/io.ebean.config.EntityClassRegister");
     if (servicesFile != null) {
-      log.error("module-info.java is probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause. EntityClassRegister exists but was not service loaded.");
+      log.log(Level.ERROR, "module-info.java is probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause. EntityClassRegister exists but was not service loaded.");
     }
   }
 
@@ -201,7 +200,7 @@ public final class DefaultContainer implements SpiContainer {
     DatabasePlatform platform = config.getDatabasePlatform();
     if (platform == null) {
       if (config.getTenantMode().isDynamicDataSource()) {
-        throw new IllegalStateException("DatabasePlatform must be explicitly set on DatabaseConfig for TenantMode "+config.getTenantMode());
+        throw new IllegalStateException("DatabasePlatform must be explicitly set on DatabaseConfig for TenantMode " + config.getTenantMode());
       }
       // automatically determine the platform
       platform = new DatabasePlatformFactory().create(config);
@@ -215,7 +214,7 @@ public final class DefaultContainer implements SpiContainer {
    */
   private void setDataSource(DatabaseConfig config) {
     if (isOfflineMode(config)) {
-      log.debug("... DbOffline using platform [{}]", DbOffline.getPlatform());
+      log.log(Level.DEBUG, "... DbOffline using platform [{0}]", DbOffline.getPlatform());
     } else {
       InitDataSource.init(config);
     }
@@ -251,7 +250,7 @@ public final class DefaultContainer implements SpiContainer {
     }
     try (Connection connection = config.getDataSource().getConnection()) {
       if (connection.getAutoCommit()) {
-        log.warn("DataSource [{}] has autoCommit defaulting to true!", config.getName());
+        log.log(Level.WARNING, "DataSource [{0}] has autoCommit defaulting to true!", config.getName());
       }
       return true;
     } catch (SQLException ex) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
index f748e7f2b..039324072 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultQueryPlanListener.java
@@ -1,23 +1,24 @@
 package io.ebeaninternal.server.core;
 
+import io.avaje.applog.AppLog;
 import io.ebean.config.QueryPlanCapture;
 import io.ebean.config.QueryPlanListener;
 import io.ebean.meta.MetaQueryPlan;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import static java.lang.System.Logger.Level.INFO;
 
 final class DefaultQueryPlanListener implements QueryPlanListener {
 
   static final QueryPlanListener INSTANT = new DefaultQueryPlanListener();
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.QUERYPLAN");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.QUERYPLAN");
 
   @Override
   public void process(QueryPlanCapture capture) {
     // better to log this in JSON form?
     String dbName = capture.database().name();
     for (MetaQueryPlan plan : capture.plans()) {
-      log.info("queryPlan  db:{} label:{} queryTimeMicros:{} loc:{} sql:{} bind:{} plan:{}",
+      log.log(INFO, "queryPlan  db:{0} label:{1} queryTimeMicros:{2} loc:{3} sql:{4} bind:{5} plan:{6}",
         dbName, plan.label(), plan.queryTimeMicros(), plan.profileLocation(),
         plan.sql(), plan.bind(), plan.plan());
     }
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 b42381956..b6b498b0d 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
@@ -2,49 +2,11 @@ package io.ebeaninternal.server.core;
 
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
-import io.ebean.AutoTune;
-import io.ebean.BackgroundExecutor;
-import io.ebean.BeanState;
-import io.ebean.CallableSql;
-import io.ebean.DocumentStore;
-import io.ebean.DtoQuery;
-import io.ebean.ExpressionFactory;
-import io.ebean.ExpressionList;
-import io.ebean.ExtendedServer;
-import io.ebean.Filter;
-import io.ebean.FutureIds;
-import io.ebean.FutureList;
-import io.ebean.FutureRowCount;
-import io.ebean.MergeOptions;
-import io.ebean.MergeOptionsBuilder;
-import io.ebean.PagedList;
-import io.ebean.PersistenceContextScope;
-import io.ebean.ProfileLocation;
-import io.ebean.Query;
-import io.ebean.QueryIterator;
-import io.ebean.RowConsumer;
-import io.ebean.RowMapper;
-import io.ebean.ScriptRunner;
-import io.ebean.SqlQuery;
-import io.ebean.SqlRow;
-import io.ebean.SqlUpdate;
-import io.ebean.Transaction;
-import io.ebean.TransactionCallback;
-import io.ebean.TxScope;
-import io.ebean.Update;
-import io.ebean.UpdateQuery;
-import io.ebean.ValuePair;
-import io.ebean.Version;
+import io.ebean.*;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.TxIsolation;
-import io.ebean.bean.BeanCollection;
-import io.ebean.bean.BeanLoader;
-import io.ebean.bean.CallOrigin;
-import io.ebean.bean.EntityBean;
-import io.ebean.bean.EntityBeanIntercept;
-import io.ebean.bean.PersistenceContext;
+import io.ebean.bean.*;
 import io.ebean.bean.PersistenceContext.WithOption;
-import io.ebean.bean.SingleBeanLoader;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.common.CopyOnFirstWriteList;
 import io.ebean.config.*;
@@ -53,11 +15,7 @@ import io.ebean.event.BeanPersistController;
 import io.ebean.event.ShutdownManager;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
-import io.ebean.meta.MetaInfoManager;
-import io.ebean.meta.MetaQueryPlan;
-import io.ebean.meta.MetricVisitor;
-import io.ebean.meta.QueryPlanInit;
-import io.ebean.meta.QueryPlanRequest;
+import io.ebean.meta.*;
 import io.ebean.migration.auto.AutoMigrationRunner;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.Plugin;
@@ -78,21 +36,8 @@ import io.ebeaninternal.server.dto.DtoBeanDescriptor;
 import io.ebeaninternal.server.dto.DtoBeanManager;
 import io.ebeaninternal.server.el.ElFilter;
 import io.ebeaninternal.server.grammer.EqlParser;
-import io.ebeaninternal.server.query.CQuery;
-import io.ebeaninternal.server.query.CQueryEngine;
-import io.ebeaninternal.server.query.CallableQueryCount;
-import io.ebeaninternal.server.query.CallableQueryIds;
-import io.ebeaninternal.server.query.CallableQueryList;
-import io.ebeaninternal.server.query.DtoQueryEngine;
-import io.ebeaninternal.server.query.LimitOffsetPagedList;
-import io.ebeaninternal.server.query.QueryFutureIds;
-import io.ebeaninternal.server.query.QueryFutureList;
-import io.ebeaninternal.server.query.QueryFutureRowCount;
-import io.ebeaninternal.server.querydefn.DefaultDtoQuery;
-import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
-import io.ebeaninternal.server.querydefn.DefaultOrmUpdate;
-import io.ebeaninternal.server.querydefn.DefaultRelationalQuery;
-import io.ebeaninternal.server.querydefn.DefaultUpdateQuery;
+import io.ebeaninternal.server.query.*;
+import io.ebeaninternal.server.querydefn.*;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 import io.ebeaninternal.server.text.csv.TCsvReader;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
@@ -101,12 +46,12 @@ import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.util.ParamTypeHelper;
 import io.ebeaninternal.util.ParamTypeHelper.TypeInfo;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
-import org.slf4j.Logger;
 
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
+import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -129,7 +74,7 @@ import static java.util.stream.StreamSupport.stream;
 @NonNullApi
 public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final ReentrantLock lock = new ReentrantLock();
   private final DatabaseConfig config;
@@ -386,7 +331,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (config.isQueryPlanCapture()) {
       long secs = config.getQueryPlanCapturePeriodSecs();
       if (secs > 10) {
-        log.info("capture query plan enabled, every {}secs", secs);
+        log.log(Level.INFO, "capture query plan enabled, every {0}secs", secs);
         backgroundExecutor.scheduleWithFixedDelay(this::collectQueryPlans, secs, secs, TimeUnit.SECONDS);
       }
     }
@@ -434,7 +379,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Shutdown the services like threads and DataSource.
    */
   private void shutdownInternal(boolean shutdownDataSource, boolean deregisterDriver) {
-    log.trace("shutting down instance {}", serverName);
+    log.log(Level.TRACE, "shutting down instance {0}", serverName);
     if (shutdown) {
       // already shutdown
       return;
@@ -463,7 +408,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       try {
         plugin.shutdown();
       } catch (Exception e) {
-        log.error("Error when shutting down plugin", e);
+        log.log(Level.ERROR, "Error when shutting down plugin", e);
       }
     }
   }
@@ -2038,7 +1983,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return desc(bean.getClass()).getId(eb);
   }
 
-  private  <T> BeanDescriptor<T> desc(Class<T> beanClass) {
+  private <T> BeanDescriptor<T> desc(Class<T> beanClass) {
     BeanDescriptor<T> desc = descriptorManager.descriptor(beanClass);
     if (desc == null) {
       throw new PersistenceException(beanClass.getName() + " is NOT an Entity Bean registered with this server?");
@@ -2130,7 +2075,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
             try {
               serverCacheManager.clearLocal(Class.forName(cache));
             } catch (Exception e) {
-              log.error("Error clearing local cache for type " + cache, e);
+              log.log(Level.ERROR, "Error clearing local cache for type " + cache, e);
             }
           }
         }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java
index 64c813213..6dc42b211 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSlowQueryListener.java
@@ -1,17 +1,18 @@
 package io.ebeaninternal.server.core;
 
+import io.avaje.applog.AppLog;
 import io.ebean.bean.ObjectGraphNode;
 import io.ebean.config.SlowQueryEvent;
 import io.ebean.config.SlowQueryListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import static java.lang.System.Logger.Level.WARNING;
 
 /**
  * Default slow query listener implementation that logs a warning message.
  */
 final class DefaultSlowQueryListener implements SlowQueryListener {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.SlowQuery");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.SlowQuery");
 
   @Override
   public void process(SlowQueryEvent event) {
@@ -20,6 +21,6 @@ final class DefaultSlowQueryListener implements SlowQueryListener {
     if (node != null) {
       firstStack = node.getOriginQueryPoint().getTopElement();
     }
-    log.warn("Slow query warning - millis:{} rows:{} caller[{}] sql[{}]", event.getTimeMillis(), event.getRowCount(), firstStack, event.getSql());
+    log.log(WARNING, "Slow query warning - millis:{0} rows:{1} caller[{2}] sql[{3}]", event.getTimeMillis(), event.getRowCount(), firstStack, event.getSql());
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
index 826cc3471..4bd2545ed 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
@@ -6,6 +6,7 @@ import io.ebeaninternal.xmapping.api.XmapDto;
 import io.ebeaninternal.xmapping.api.XmapEbean;
 import io.ebeaninternal.xmapping.api.XmapRawSql;
 
+import java.lang.System.Logger.Level;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -55,7 +56,7 @@ final class InternalConfigXmlMap {
     try {
       dtoClass = Class.forName(dto.getClazz(), false, classLoader);
     } catch (Exception e) {
-      CoreLog.internal.error("Could not load dto bean class " + dto.getClazz() + " for ebean xml entry");
+      CoreLog.internal.log(Level.ERROR, "Could not load dto bean class " + dto.getClazz() + " for ebean xml entry");
       return;
     }
     DtoNamedQueries namedQueries = dtoNamedQueries.computeIfAbsent(dtoClass, aClass -> new DtoNamedQueries());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index e6944a9e9..c8b7f8810 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -56,8 +56,8 @@ import io.ebeanservice.docstore.api.DocStoreFactory;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.none.NoneDocStoreFactory;
-import org.slf4j.Logger;
 
+import java.lang.System.Logger.Level;
 import java.util.*;
 
 /**
@@ -66,7 +66,7 @@ import java.util.*;
  */
 public final class InternalConfiguration {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final TableModState tableModState;
   private final boolean online;
@@ -246,7 +246,7 @@ public final class InternalConfiguration {
    */
   ReadAuditLogger getReadAuditLogger() {
     ReadAuditLogger found = bootupClasses.getReadAuditLogger();
-    return plugin(found != null ? found : jacksonCorePresent? new DefaultReadAuditLogger(): null);
+    return plugin(found != null ? found : jacksonCorePresent ? new DefaultReadAuditLogger() : null);
   }
 
   /**
@@ -433,7 +433,7 @@ public final class InternalConfiguration {
       externalTransactionManager = new JtaTransactionManager();
     }
     if (externalTransactionManager != null) {
-      log.info("Using Transaction Manager [" + externalTransactionManager.getClass() + "]");
+      log.log(Level.INFO, "Using Transaction Manager {0}", externalTransactionManager.getClass());
       return new ExternalTransactionScopeManager(externalTransactionManager);
     } else {
       return new DefaultTransactionScopeManager();
@@ -523,7 +523,7 @@ public final class InternalConfiguration {
       if (iterator.hasNext()) {
         // use the cacheFactory (via classpath service loader)
         plugin = iterator.next();
-        log.debug("using ServerCacheFactory {}", plugin.getClass());
+        log.log(Level.DEBUG, "using ServerCacheFactory {0}", plugin.getClass());
       } else {
         // use the built in default l2 caching which is local cache based
         localL2Caching = true;
@@ -605,6 +605,7 @@ public final class InternalConfiguration {
 
   private static class NoopDdl implements SpiDdlGenerator {
     private final boolean ddlRun;
+
     NoopDdl(boolean ddlRun) {
       this.ddlRun = ddlRun;
     }
@@ -612,7 +613,7 @@ public final class InternalConfiguration {
     @Override
     public void execute(boolean online) {
       if (online && ddlRun) {
-        CoreLog.log.error("Configured to run DDL but ebean-ddl-generator is not in the classpath (or ebean-test in the test classpath?)");
+        CoreLog.log.log(Level.ERROR, "Configured to run DDL but ebean-ddl-generator is not in the classpath (or ebean-test in the test classpath?)");
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 695960f6b..23df28e38 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -24,6 +24,8 @@ import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Wraps the objects involved in executing a Query.
  */
@@ -244,7 +246,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
         // Just log this and carry on. A previous exception has been
         // thrown and if this rollback throws exception it likely means
         // that the connection is broken (and the dataSource and db will cleanup)
-        CoreLog.log.error("Error trying to rollback a transaction (after a prior exception thrown)", e);
+        CoreLog.log.log(ERROR, "Error trying to rollback a transaction (after a prior exception thrown)", e);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
index 1c378cbf9..031c87688 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
@@ -4,8 +4,8 @@ import io.avaje.classpath.scanner.ClassPathScanner;
 import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.ClassPathScanners;
-import org.slf4j.Logger;
 
+import java.lang.System.Logger.Level;
 import java.util.List;
 import java.util.Set;
 
@@ -14,7 +14,7 @@ import java.util.Set;
  */
 public class BootupClassPathSearch {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final List<String> packages;
   private final List<ClassPathScanner> scanners;
@@ -42,7 +42,6 @@ public class BootupClassPathSearch {
    * Search the classPath for the classes we are interested in.
    */
   private BootupClasses getBootupClasses() {
-
     try {
       BootupClasses bc = new BootupClasses();
 
@@ -59,7 +58,7 @@ public class BootupClassPathSearch {
       }
 
       long searchTime = System.currentTimeMillis() - st;
-      log.debug("Classpath search entities[{}] searchTime[{}] in packages[{}]", bc.getEntities().size(), searchTime, packages);
+      log.log(Level.DEBUG, "Classpath search entities[{0}] searchTime[{1}] in packages[{2}]", bc.getEntities().size(), searchTime, packages);
       return bc;
 
     } catch (Exception ex) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
index 3fc4bbb95..b3f777c6f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
@@ -13,12 +13,12 @@ import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.CoreLog;
-import org.slf4j.Logger;
 
 import javax.persistence.AttributeConverter;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.lang.System.Logger.Level;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -31,7 +31,7 @@ import java.util.function.Predicate;
  */
 public class BootupClasses implements Predicate<Class<?>> {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final List<Class<?>> embeddableList = new ArrayList<>();
   private final List<Class<?>> entityList = new ArrayList<>();
@@ -205,13 +205,13 @@ public class BootupClasses implements Predicate<Class<?>> {
     try {
       return cls.getConstructor().newInstance();
     } catch (NoSuchMethodException e) {
-      log.debug("Ignore/expected - no default constructor: " +e.getMessage());
+      log.log(Level.DEBUG, "Ignore/expected - no default constructor: " + e.getMessage());
       return null;
 
     } catch (Exception e) {
       if (logOnException) {
         // not expected but we log and carry on
-        log.error("Error creating " + cls, e);
+        log.log(Level.ERROR, "Error creating " + cls, e);
         return null;
 
       } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
index d9a651293..a9dbf21ab 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
@@ -3,10 +3,10 @@ package io.ebeaninternal.server.core.bootup;
 import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.util.UrlHelper;
-import org.slf4j.Logger;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.System.Logger.Level;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -20,7 +20,7 @@ import java.util.jar.Manifest;
  */
 class ManifestReader {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final Set<String> packageSet = new HashSet<>();
   private final ClassLoader classLoader;
@@ -55,7 +55,6 @@ class ManifestReader {
    * Read all the specific manifest files and return the set of packages containing type query beans.
    */
   private Set<String> read(ClassLoader classLoader, String resourcePath) {
-
     try {
       Enumeration<URL> resources = classLoader.getResources(resourcePath);
       while (resources.hasMoreElements()) {
@@ -64,7 +63,7 @@ class ManifestReader {
         }
       }
     } catch (IOException e) {
-      log.warn("Error reading " + resourcePath + " manifest resources", e);
+      log.log(Level.WARNING, "Error reading " + resourcePath + " manifest resources", e);
     }
     return packageSet;
   }
@@ -73,7 +72,6 @@ class ManifestReader {
    * Read the entity packages from the manifest.
    */
   private void read(Manifest manifest) throws IOException {
-
     Attributes attributes = manifest.getMainAttributes();
     String agentOnlyUse = attributes.getValue("agent-use-only");
     if (agentOnlyUse == null || !"true".equalsIgnoreCase(agentOnlyUse.trim())) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 2ba7bf20b..4fd54268f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -54,11 +54,11 @@ import io.ebeanservice.docstore.api.DocStoreUpdates;
 import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.mapping.DocumentMapping;
-import org.slf4j.Logger;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.lang.System.Logger.Level;
 import java.lang.reflect.Modifier;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -74,7 +74,7 @@ import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
  */
 public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   public enum EntityType {
     ORM, EMBEDDED, VIEW, SQL, DOC
@@ -494,9 +494,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    * as they are used to get the imported and exported properties.
    */
   void initialiseId(BeanDescriptorInitContext initContext) {
-    if (log.isTraceEnabled()) {
-      log.trace("BeanDescriptor initialise " + fullName);
-    }
     if (draftable) {
       initContext.addDraft(baseTable, draftTable);
     }
@@ -795,7 +792,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
       changeJson.flush();
       return beanChange(ChangeType.UPDATE, request.beanId(), changeJson.newJson(), changeJson.oldJson());
     } catch (RuntimeException e) {
-      log.error("Failed to write ChangeLog entry for update", e);
+      log.log(Level.ERROR, "Failed to write ChangeLog entry for update", e);
       return null;
     }
   }
@@ -811,7 +808,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
       jsonWriter.flush();
       return beanChange(ChangeType.INSERT, request.beanId(), writer.toString(), null);
     } catch (IOException e) {
-      log.error("Failed to write ChangeLog entry for insert", e);
+      log.log(Level.ERROR, "Failed to write ChangeLog entry for insert", e);
       return null;
     }
   }
@@ -2291,11 +2288,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   private ElComparator<T> createPropertyComparator(SortByClause.Property sortProp) {
     ElPropertyValue elGetValue = elGetValue(sortProp.getName());
     if (elGetValue == null) {
-      log.error("Sort property [" + sortProp + "] not found in " + beanType + ". Cannot sort.");
+      log.log(Level.ERROR, "Sort property [" + sortProp + "] not found in " + beanType + ". Cannot sort.");
       return new ElComparatorNoop<>();
     }
     if (elGetValue.isAssocMany()) {
-      log.error("Sort property [" + sortProp + "] in " + beanType + " is a many-property. Cannot sort.");
+      log.log(Level.ERROR, "Sort property [" + sortProp + "] in " + beanType + " is a many-property. Cannot sort.");
       return new ElComparatorNoop<>();
     }
     Boolean nullsHigh = sortProp.getNullsHigh();
@@ -2771,7 +2768,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   public void markAsDeleted(EntityBean bean) {
     if (softDeleteProperty == null) {
       Object id = getId(bean);
-      log.info("(Lazy) loading unsuccessful for type:{} id:{} - expecting when bean has been deleted", name(), id);
+      log.log(Level.INFO, "(Lazy) loading unsuccessful for type:{0} id:{1} - expecting when bean has been deleted", name(), id);
       bean._ebean_getIntercept().setLazyLoadFailure(id);
     } else {
       softDeleteValue(bean);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 725a850e2..4e0c39b39 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
+import io.avaje.applog.AppLog;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
@@ -13,10 +14,9 @@ import io.ebeaninternal.server.core.CacheOptions;
 import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.lang.System.Logger.Level;
 import java.util.*;
 
 /**
@@ -26,12 +26,12 @@ import java.util.*;
  */
 final class BeanDescriptorCacheHelp<T> {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
-  private static final Logger queryLog = LoggerFactory.getLogger("io.ebean.cache.QUERY");
-  private static final Logger beanLog = LoggerFactory.getLogger("io.ebean.cache.BEAN");
-  private static final Logger manyLog = LoggerFactory.getLogger("io.ebean.cache.COLL");
-  private static final Logger natLog = LoggerFactory.getLogger("io.ebean.cache.NATKEY");
+  private static final System.Logger queryLog = AppLog.getLogger("io.ebean.cache.QUERY");
+  private static final System.Logger beanLog = AppLog.getLogger("io.ebean.cache.BEAN");
+  private static final System.Logger manyLog = AppLog.getLogger("io.ebean.cache.COLL");
+  private static final System.Logger natLog = AppLog.getLogger("io.ebean.cache.NATKEY");
 
   private final BeanDescriptor<T> desc;
   private final SpiCacheManager cacheManager;
@@ -104,10 +104,10 @@ final class BeanDescriptorCacheHelp<T> {
   void deriveNotifyFlags() {
     cacheNotifyOnAll = (invalidateQueryCache || beanCache != null || queryCache != null);
     cacheNotifyOnDelete = !cacheNotifyOnAll && isNotifyOnDeletes();
-    if (log.isDebugEnabled()) {
+    if (log.isLoggable(Level.DEBUG)) {
       if (cacheNotifyOnAll || cacheNotifyOnDelete) {
         String notifyMode = cacheNotifyOnAll ? "All" : "Delete";
-        log.debug("l2 caching on {} - beanCaching:{} queryCaching:{} notifyMode:{} ",
+        log.log(Level.DEBUG, "l2 caching on {0} - beanCaching:{1} queryCaching:{2} notifyMode:{3} ",
           desc.fullName(), isBeanCaching(), isQueryCaching(), notifyMode);
       }
     }
@@ -178,8 +178,8 @@ final class BeanDescriptorCacheHelp<T> {
    */
   void queryCacheClear() {
     if (queryCache != null) {
-      if (queryLog.isDebugEnabled()) {
-        queryLog.debug("   CLEAR {}", cacheName);
+      if (queryLog.isLoggable(Level.DEBUG)) {
+        queryLog.log(Level.DEBUG, "   CLEAR {0}", cacheName);
       }
       queryCache.clear();
     }
@@ -202,11 +202,11 @@ final class BeanDescriptorCacheHelp<T> {
       throw new IllegalStateException("No query cache enabled on " + desc + ". Need explicit @Cache(enableQueryCache=true)");
     }
     Object queryResult = queryCache.get(id);
-    if (queryLog.isDebugEnabled()) {
+    if (queryLog.isLoggable(Level.DEBUG)) {
       if (queryResult == null) {
-        queryLog.debug("   GET {}({}) - cache miss", cacheName, id);
+        queryLog.log(Level.DEBUG, "   GET {0}({1}) - cache miss", cacheName, id);
       } else {
-        queryLog.debug("   GET {}({}) - hit", cacheName, id);
+        queryLog.log(Level.DEBUG, "   GET {0}({1}) - hit", cacheName, id);
       }
     }
     return queryResult;
@@ -219,8 +219,8 @@ final class BeanDescriptorCacheHelp<T> {
     if (queryCache == null) {
       throw new IllegalStateException("No query cache enabled on " + desc + ". Need explicit @Cache(enableQueryCache=true)");
     }
-    if (queryLog.isDebugEnabled()) {
-      queryLog.debug("   PUT {}({})", cacheName, id);
+    if (queryLog.isLoggable(Level.DEBUG)) {
+      queryLog.log(Level.DEBUG, "   PUT {0}({1})", cacheName, id);
     }
     queryCache.put(id, entry);
   }
@@ -228,16 +228,16 @@ final class BeanDescriptorCacheHelp<T> {
 
   void manyPropRemove(String propertyName, Object parentId) {
     ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, propertyName);
-    if (manyLog.isTraceEnabled()) {
-      manyLog.trace("   REMOVE {}({}).{}", cacheName, parentId, propertyName);
+    if (manyLog.isLoggable(Level.TRACE)) {
+      manyLog.log(Level.TRACE, "   REMOVE {0}({1}).{2}", cacheName, parentId, propertyName);
     }
     collectionIdsCache.remove(parentId);
   }
 
   void manyPropClear(String propertyName) {
     ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, propertyName);
-    if (manyLog.isDebugEnabled()) {
-      manyLog.debug("   CLEAR {}(*).{} ", cacheName, propertyName);
+    if (manyLog.isLoggable(Level.DEBUG)) {
+      manyLog.log(Level.DEBUG, "   CLEAR {0}(*).{1} ", cacheName, propertyName);
     }
     collectionIdsCache.clear();
   }
@@ -249,11 +249,11 @@ final class BeanDescriptorCacheHelp<T> {
     ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, propertyName);
     CachedManyIds entry = (CachedManyIds) collectionIdsCache.get(parentId);
     if (entry == null) {
-      if (manyLog.isTraceEnabled()) {
-        manyLog.trace("   GET {}({}).{} - cache miss", cacheName, parentId, propertyName);
+      if (manyLog.isLoggable(Level.TRACE)) {
+        manyLog.log(Level.TRACE, "   GET {0}({1}).{2} - cache miss", cacheName, parentId, propertyName);
       }
-    } else if (manyLog.isDebugEnabled()) {
-      manyLog.debug("   GET {}({}).{} - hit", cacheName, parentId, propertyName);
+    } else if (manyLog.isLoggable(Level.DEBUG)) {
+      manyLog.log(Level.DEBUG, "   GET {0}({1}).{2} - hit", cacheName, parentId, propertyName);
     }
     return entry;
   }
@@ -303,12 +303,12 @@ final class BeanDescriptorCacheHelp<T> {
           changes.put(many.name(), asJson);
 
           CachedBeanData newData = data.update(changes, data.getVersion());
-          if (beanLog.isDebugEnabled()) {
-            beanLog.debug("   UPDATE {}({})  changes:{}", cacheName, parentId, changes);
+          if (beanLog.isLoggable(Level.DEBUG)) {
+            beanLog.log(Level.DEBUG, "   UPDATE {0}({1})  changes:{2}", cacheName, parentId, changes);
           }
           beanCache.put(parentId, newData);
         } catch (IOException e) {
-          log.error("Error updating L2 cache", e);
+          log.log(Level.ERROR, "Error updating L2 cache", e);
         }
       }
     } else {
@@ -321,8 +321,8 @@ final class BeanDescriptorCacheHelp<T> {
 
   void cachePutManyIds(Object parentId, String manyName, CachedManyIds entry) {
     ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, manyName);
-    if (manyLog.isDebugEnabled()) {
-      manyLog.debug("   PUT {}({}).{} - ids:{}", cacheName, parentId, manyName, entry);
+    if (manyLog.isLoggable(Level.DEBUG)) {
+      manyLog.log(Level.DEBUG, "   PUT {0}({1}).{2} - ids:{3}", cacheName, parentId, manyName, entry);
     }
     collectionIdsCache.put(parentId, entry);
   }
@@ -353,8 +353,8 @@ final class BeanDescriptorCacheHelp<T> {
       return new BeanCacheResult<>();
     }
     Map<Object, Object> beanDataMap = beanCache.getAll(keys);
-    if (beanLog.isTraceEnabled()) {
-      beanLog.trace("   MGET {}({}) - hits:{}", cacheName, ids, beanDataMap.keySet());
+    if (beanLog.isLoggable(Level.TRACE)) {
+      beanLog.log(Level.TRACE, "   MGET {0}({1}) - hits:{2}", cacheName, ids, beanDataMap.keySet());
     }
     BeanCacheResult<T> result = new BeanCacheResult<>();
     for (Map.Entry<Object, Object> entry : beanDataMap.entrySet()) {
@@ -375,8 +375,8 @@ final class BeanDescriptorCacheHelp<T> {
 
     // naturalKey -> Id map
     Map<Object, Object> naturalKeyMap = naturalKeyCache.getAll(keys);
-    if (natLog.isTraceEnabled()) {
-      natLog.trace(" MLOOKUP {}({}) - hits:{}", cacheName, keys, naturalKeyMap);
+    if (natLog.isLoggable(Level.TRACE)) {
+      natLog.log(Level.TRACE, " MLOOKUP {0}({1}) - hits:{2}", cacheName, keys, naturalKeyMap);
     }
 
     BeanCacheResult<T> result = new BeanCacheResult<>();
@@ -392,8 +392,8 @@ final class BeanDescriptorCacheHelp<T> {
 
     Set<Object> ids = new HashSet<>(naturalKeyMap.values());
     Map<Object, Object> beanDataMap = beanCache.getAll(ids);
-    if (beanLog.isTraceEnabled()) {
-      beanLog.trace("   MGET {}({}) - hits:{}", cacheName, ids, beanDataMap.keySet());
+    if (beanLog.isLoggable(Level.TRACE)) {
+      beanLog.log(Level.TRACE, "   MGET {0}({1}) - hits:{2}", cacheName, ids, beanDataMap.keySet());
     }
     // process the hits into beans etc
     for (Map.Entry<Object, Object> entry : beanDataMap.entrySet()) {
@@ -437,8 +437,8 @@ final class BeanDescriptorCacheHelp<T> {
    */
   void beanCacheClear() {
     if (beanCache != null) {
-      if (beanLog.isDebugEnabled()) {
-        beanLog.debug("   CLEAR {}", cacheName);
+      if (beanLog.isLoggable(Level.DEBUG)) {
+        beanLog.log(Level.DEBUG, "   CLEAR {0}", cacheName);
       }
       beanCache.clear();
     }
@@ -507,14 +507,14 @@ final class BeanDescriptorCacheHelp<T> {
         }
       }
     }
-    if (beanLog.isDebugEnabled()) {
-      beanLog.debug("   MPUT {}({})", cacheName, map.keySet());
+    if (beanLog.isLoggable(Level.DEBUG)) {
+      beanLog.log(Level.DEBUG, "   MPUT {0}({1})", cacheName, map.keySet());
     }
     getBeanCache().putAll(map);
 
     if (natKeys != null && !natKeys.isEmpty()) {
-      if (natLog.isDebugEnabled()) {
-        natLog.debug(" MPUT {}({}, {})", cacheName, naturalKey, natKeys.keySet());
+      if (natLog.isLoggable(Level.DEBUG)) {
+        natLog.log(Level.DEBUG, " MPUT {0}({1}, {2})", cacheName, naturalKey, natKeys.keySet());
       }
       naturalKeyCache.putAll(natKeys);
     }
@@ -526,15 +526,15 @@ final class BeanDescriptorCacheHelp<T> {
   void beanCachePutDirect(EntityBean bean) {
     CachedBeanData beanData = beanExtractData(desc, bean);
     String key = desc.cacheKeyForBean(bean);
-    if (beanLog.isDebugEnabled()) {
-      beanLog.debug("   PUT {}({}) data:{}", cacheName, key, beanData);
+    if (beanLog.isLoggable(Level.DEBUG)) {
+      beanLog.log(Level.DEBUG, "   PUT {0}({1}) data:{2}", cacheName, key, beanData);
     }
     getBeanCache().put(key, beanData);
     if (naturalKey != null) {
       String naturalKey = calculateNaturalKey(beanData);
       if (naturalKey != null) {
-        if (natLog.isDebugEnabled()) {
-          natLog.debug(" PUT {}({}, {})", cacheName, naturalKey, key);
+        if (natLog.isLoggable(Level.DEBUG)) {
+          natLog.log(Level.DEBUG, " PUT {0}({1}, {2})", cacheName, naturalKey, key);
         }
         naturalKeyCache.put(naturalKey, key);
       }
@@ -575,13 +575,13 @@ final class BeanDescriptorCacheHelp<T> {
   private T beanCacheGetInternal(String key, Boolean readOnly, PersistenceContext context) {
     CachedBeanData data = (CachedBeanData) getBeanCache().get(key);
     if (data == null) {
-      if (beanLog.isTraceEnabled()) {
-        beanLog.trace("   GET {}({}) - cache miss", cacheName, key);
+      if (beanLog.isLoggable(Level.TRACE)) {
+        beanLog.log(Level.TRACE, "   GET {0}({1}) - cache miss", cacheName, key);
       }
       return null;
     }
-    if (beanLog.isTraceEnabled()) {
-      beanLog.trace("   GET {}({}) - hit", cacheName, key);
+    if (beanLog.isLoggable(Level.TRACE)) {
+      beanLog.log(Level.TRACE, "   GET {0}({1}) - hit", cacheName, key);
     }
     return convertToBean(key, readOnly, context, data);
   }
@@ -591,8 +591,8 @@ final class BeanDescriptorCacheHelp<T> {
     if (cacheSharableBeans && !Boolean.FALSE.equals(readOnly)) {
       Object bean = data.getSharableBean();
       if (bean != null) {
-        if (beanLog.isTraceEnabled()) {
-          beanLog.trace("   GET {}({}) - hit shared bean", cacheName, id);
+        if (beanLog.isLoggable(Level.TRACE)) {
+          beanLog.log(Level.TRACE, "   GET {0}({1}) - hit shared bean", cacheName, id);
         }
         if (desc.isReadAuditing()) {
           desc.readAuditBean("l2", "", bean);
@@ -680,8 +680,8 @@ final class BeanDescriptorCacheHelp<T> {
    */
   void beanCacheApplyInvalidate(Collection<String> keys) {
     if (beanCache != null) {
-      if (beanLog.isDebugEnabled()) {
-        beanLog.debug("   MREMOVE {}({})", cacheName, keys);
+      if (beanLog.isLoggable(Level.DEBUG)) {
+        beanLog.log(Level.DEBUG, "   MREMOVE {0}({1})", cacheName, keys);
       }
       beanCache.removeAll(new HashSet<>(keys));
     }
@@ -700,8 +700,8 @@ final class BeanDescriptorCacheHelp<T> {
     }
 
     Map<Object, Object> hits = getBeanCache().getAll(ebis.keySet());
-    if (beanLog.isTraceEnabled()) {
-      beanLog.trace("   MLOAD {}({}) - got hits ({})", cacheName, ebis.keySet(), hits.size());
+    if (beanLog.isLoggable(Level.TRACE)) {
+      beanLog.log(Level.TRACE, "   MLOAD {0}({1}) - got hits ({2})", cacheName, ebis.keySet(), hits.size());
     }
 
     Set<EntityBeanIntercept> loaded = new HashSet<>();
@@ -713,19 +713,19 @@ final class BeanDescriptorCacheHelp<T> {
       CachedBeanData cacheData = (CachedBeanData) hit.getValue();
 
       if (lazyLoadProperty > -1 && !cacheData.isLoaded(propertyName)) {
-        if (beanLog.isTraceEnabled()) {
-          beanLog.trace("   load {}({}) - cache miss on property({})", cacheName, key, propertyName);
+        if (beanLog.isLoggable(Level.TRACE)) {
+          beanLog.log(Level.TRACE, "   load {0}({1}) - cache miss on property({2})", cacheName, key, propertyName);
         }
       } else {
         CachedBeanDataToBean.load(desc, ebi.getOwner(), cacheData, context);
         loaded.add(ebi);
-        if (beanLog.isDebugEnabled()) {
-          beanLog.debug("   load {}({}) - hit", cacheName, key);
+        if (beanLog.isLoggable(Level.DEBUG)) {
+          beanLog.log(Level.DEBUG, "   load {0}({1}) - hit", cacheName, key);
         }
       }
     }
-    if (!ebis.isEmpty() && beanLog.isTraceEnabled()) {
-      beanLog.trace("   load {}({}) - cache miss", cacheName, ebis.keySet());
+    if (!ebis.isEmpty() && beanLog.isLoggable(Level.TRACE)) {
+      beanLog.log(Level.TRACE, "   load {0}({1}) - cache miss", cacheName, ebis.keySet());
     }
     return loaded;
   }
@@ -736,21 +736,21 @@ final class BeanDescriptorCacheHelp<T> {
   boolean beanCacheLoad(EntityBean bean, EntityBeanIntercept ebi, String key, PersistenceContext context) {
     CachedBeanData cacheData = (CachedBeanData) getBeanCache().get(key);
     if (cacheData == null) {
-      if (beanLog.isTraceEnabled()) {
-        beanLog.trace("   LOAD {}({}) - cache miss", cacheName, key);
+      if (beanLog.isLoggable(Level.TRACE)) {
+        beanLog.log(Level.TRACE, "   LOAD {0}({1}) - cache miss", cacheName, key);
       }
       return false;
     }
     int lazyLoadProperty = ebi.getLazyLoadPropertyIndex();
     if (lazyLoadProperty > -1 && !cacheData.isLoaded(ebi.getLazyLoadProperty())) {
-      if (beanLog.isTraceEnabled()) {
-        beanLog.trace("   LOAD {}({}) - cache miss on property({})", cacheName, key, ebi.getLazyLoadProperty());
+      if (beanLog.isLoggable(Level.TRACE)) {
+        beanLog.log(Level.TRACE, "   LOAD {0}({1}) - cache miss on property({2})", cacheName, key, ebi.getLazyLoadProperty());
       }
       return false;
     }
     CachedBeanDataToBean.load(desc, bean, cacheData, context);
-    if (beanLog.isDebugEnabled()) {
-      beanLog.debug("   LOAD {}({}) - hit", cacheName, key);
+    if (beanLog.isLoggable(Level.DEBUG)) {
+      beanLog.log(Level.DEBUG, "   LOAD {0}({1}) - hit", cacheName, key);
     }
     return true;
   }
@@ -874,8 +874,8 @@ final class BeanDescriptorCacheHelp<T> {
     if (existingData != null) {
       long currentVersion = existingData.getVersion();
       if (version > 0 && version < currentVersion) {
-        if (beanLog.isDebugEnabled()) {
-          beanLog.debug("   REMOVE {}({}) - version conflict old:{} new:{}", cacheName, key, currentVersion, version);
+        if (beanLog.isLoggable(Level.DEBUG)) {
+          beanLog.log(Level.DEBUG, "   REMOVE {0}({1}) - version conflict old:{2} new:{3}", cacheName, key, currentVersion, version);
         }
         cache.remove(key);
       } else {
@@ -883,16 +883,16 @@ final class BeanDescriptorCacheHelp<T> {
           version = currentVersion;
         }
         CachedBeanData newData = existingData.update(changes, version);
-        if (beanLog.isDebugEnabled()) {
-          beanLog.debug("   UPDATE {}({})  changes:{}", cacheName, key, changes);
+        if (beanLog.isLoggable(Level.DEBUG)) {
+          beanLog.log(Level.DEBUG, "   UPDATE {0}({1})  changes:{2}", cacheName, key, changes);
         }
         cache.put(key, newData);
       }
       if (updateNaturalKey) {
         Object oldKey = calculateNaturalKey(existingData);
         if (oldKey != null) {
-          if (natLog.isDebugEnabled()) {
-            natLog.debug(".. update {} REMOVE({}) - old key for ({})", cacheName, oldKey, key);
+          if (natLog.isLoggable(Level.DEBUG)) {
+            natLog.log(Level.DEBUG, ".. update {0} REMOVE({1}) - old key for ({2})", cacheName, oldKey, key);
           }
           naturalKeyCache.remove(oldKey);
         }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 82f29361c..0074b550a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -41,13 +41,13 @@ import io.ebeaninternal.xmapping.api.XmapNamedQuery;
 import io.ebeaninternal.xmapping.api.XmapRawSql;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
 import io.ebeanservice.docstore.api.DocStoreFactory;
-import org.slf4j.Logger;
 
 import javax.persistence.MappedSuperclass;
 import javax.persistence.PersistenceException;
 import javax.persistence.Transient;
 import javax.sql.DataSource;
 import java.io.Serializable;
+import java.lang.System.Logger.Level;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.*;
@@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit;
  */
 public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTypeManager {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private static final BeanDescComparator beanDescComparator = new BeanDescComparator();
   public static final String JAVA_LANG_RECORD = "java.lang.Record";
@@ -309,7 +309,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     } catch (BeanNotEnhancedException e) {
       throw e;
     } catch (RuntimeException e) {
-      log.error("Error in deployment", e);
+      log.log(Level.ERROR, "Error in deployment", e);
       throw e;
     }
   }
@@ -332,13 +332,13 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     try {
       entityClass = Class.forName(entityClassName, false, classLoader);
     } catch (Exception e) {
-      log.error("Could not load entity bean class " + entityClassName + " for ebean.xml entry");
+      log.log(Level.ERROR, "Could not load entity bean class " + entityClassName + " for ebean.xml entry");
       return;
     }
 
     DeployBeanInfo<?> info = deployInfoMap.get(entityClass);
     if (info == null) {
-      log.error("No entity bean for ebean.xml entry " + entityClassName);
+      log.log(Level.ERROR, "No entity bean for ebean.xml entry " + entityClassName);
 
     } else {
       for (XmapRawSql sql : entityDeploy.getRawSql()) {
@@ -601,11 +601,11 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     int pc = postConstructManager.getRegisterCount();
     int lc = persistListenerManager.getRegisterCount();
     int fc = beanFinderManager.getRegisterCount();
-    log.debug("BeanPersistControllers[{}] BeanFinders[{}] BeanPersistListeners[{}] BeanQueryAdapters[{}] BeanPostLoaders[{}] BeanPostConstructors[{}]", cc, fc, lc, qa, pl, pc);
+    log.log(Level.DEBUG, "BeanPersistControllers[{0}] BeanFinders[{1}] BeanPersistListeners[{2}] BeanQueryAdapters[{3}] BeanPostLoaders[{4}] BeanPostConstructors[{5}]", cc, fc, lc, qa, pl, pc);
   }
 
   private void logStatus() {
-    log.debug("Entities[{}]", entityBeanCount);
+    log.log(Level.DEBUG, "Entities[{0}]", entityBeanCount);
   }
 
   /**
@@ -865,13 +865,13 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
         for (String possibleMappedBy : matchSet) {
           String possibleLower = possibleMappedBy.toLowerCase();
           if (possibleLower.contains(searchName)) {
-            // we have a match..
+            // we have a match
             prop.setMappedBy(possibleMappedBy);
-
-            String m = "Implicitly found mappedBy for " + targetDesc + "." + prop;
-            m += " by searching for [" + searchName + "] against " + matchSet;
-            log.debug(m);
-
+            if (log.isLoggable(Level.DEBUG)) {
+              String m = "Implicitly found mappedBy for " + targetDesc + "." + prop;
+              m += " by searching for [" + searchName + "] against " + matchSet;
+              log.log(Level.DEBUG, m);
+            }
             return true;
           }
         }
@@ -1207,12 +1207,12 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     final DeployIdentityMode identityMode = desc.getIdentityMode();
     if (identityMode.isSequence() && !dbIdentity.isSupportsSequence()) {
       // explicit sequence but not supported by the DatabasePlatform
-      log.info("Explicit sequence on " + desc.getFullName() + " but not supported by DB Platform - ignored");
+      log.log(Level.INFO, "Explicit sequence on {0} but not supported by DB Platform - ignored", desc.getFullName());
       identityMode.setIdType(IdType.AUTO);
     }
     if (identityMode.isIdentity() && !dbIdentity.isSupportsIdentity()) {
       // explicit identity but not supported by the DatabasePlatform
-      log.info("Explicit Identity on " + desc.getFullName() + " but not supported by DB Platform - ignored");
+      log.log(Level.INFO, "Explicit Identity on {0} but not supported by DB Platform - ignored", desc.getFullName());
       identityMode.setIdType(IdType.AUTO);
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java
index ecb99e8b1..5bcf1883f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFinderManager.java
@@ -4,16 +4,17 @@ import io.ebean.event.BeanFindController;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
-import org.slf4j.Logger;
 
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Default implementation for BeanFinderFactory.
  */
 final class BeanFinderManager {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final List<BeanFindController> list;
 
@@ -31,7 +32,7 @@ final class BeanFinderManager {
   void addFindControllers(DeployBeanDescriptor<?> deployDesc) {
     for (BeanFindController c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
-        log.debug("BeanFindController on[{}] {}", deployDesc.getFullName(), c.getClass().getName());
+        log.log(DEBUG, "BeanFindController on[{0}] {1}", deployDesc.getFullName(), c.getClass().getName());
         deployDesc.setBeanFinder(c);
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 4d5e98916..a119ddb90 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -44,6 +44,7 @@ import javax.persistence.PersistenceException;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.lang.System.Logger.Level;
 import java.lang.reflect.Field;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -1433,7 +1434,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
           objValue = null;
           String msg = "Error trying to use Jackson ObjectMapper to read transient property "
             + fullName() + " - consider marking this property with @JsonIgnore";
-          CoreLog.log.error(msg, e);
+          CoreLog.log.log(Level.ERROR, msg, e);
         }
       }
       if (jsonDeserialize) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 147f623a1..c2bd2bb4d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -27,6 +27,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.support.DocStructure;
 
 import javax.persistence.PersistenceException;
+import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -432,7 +433,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
     if (!idProp.isEmbedded()) {
       // simple single scalar id
       if (cols.length != 1) {
-        CoreLog.log.error("No Imported Id column for [" + idProp + "] in table [" + join.getTable() + "]");
+        CoreLog.log.log(Level.ERROR, "No Imported Id column for [" + idProp + "] in table [" + join.getTable() + "]");
         return null;
       } else {
         BeanProperty[] idProps = {idProp};
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 2afae6a9d..fab75feea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -24,6 +24,7 @@ import io.ebeaninternal.server.query.SqlBeanLoad;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.lang.System.Logger.Level;
 import java.util.*;
 
 /**
@@ -667,7 +668,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
         }
       } catch (PersistenceException e) {
         // not found as individual scalar properties
-        CoreLog.log.error("Could not find a exported property?", e);
+        CoreLog.log.log(Level.ERROR, "Could not find a exported property?", e);
       }
     } else {
       if (idProp != null) {
@@ -962,7 +963,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
         setValue(bean, collection);
       }
     } catch (Exception e) {
-      CoreLog.log.error("Error setting value from L2 cache", e);
+      CoreLog.log.log(Level.ERROR, "Error setting value from L2 cache", e);
     }
   }
 
@@ -975,7 +976,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
       }
       return jsonWriteCollection(collection);
     } catch (Exception e) {
-      CoreLog.log.error("Error building value element collection json for L2 cache", e);
+      CoreLog.log.log(Level.ERROR, "Error building value element collection json for L2 cache", e);
       return null;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
index 45bced3a2..6eb8d20e3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanQueryAdapterManager.java
@@ -7,6 +7,8 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Default implementation for creating BeanControllers.
  */
@@ -28,7 +30,7 @@ final class BeanQueryAdapterManager {
   void addQueryAdapter(DeployBeanDescriptor<?> deployDesc) {
     for (BeanQueryAdapter c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
-        CoreLog.internal.debug("BeanQueryAdapter on[{}] {}", deployDesc.getFullName(), c.getClass().getName());
+        CoreLog.internal.log(DEBUG, "BeanQueryAdapter on[{0}] {1}", deployDesc.getFullName(), c.getClass().getName());
         deployDesc.addQueryAdapter(c);
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
index 0a503314d..80bed8585 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
@@ -6,6 +6,8 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanTable;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 
+import java.lang.System.Logger.Level;
+
 
 /**
  * Used for associated beans in place of a BeanDescriptor. This is done to avoid
@@ -105,7 +107,7 @@ public final class BeanTable {
     if (complexKey) {
       // just to copy the column name rather than prefix with the foreignKeyPrefix.
       // I think that with complex keys this is the more common approach.
-      CoreLog.internal.debug("On table[{}] foreign key column [{}]", baseTable, lc);
+      CoreLog.internal.log(Level.DEBUG, "On table[{0}] foreign key column [{1}]", baseTable, lc);
       fk = lc;
     }
     if (sqlFormulaSelect != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java
index 0497d7ef9..196e4be20 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistControllerManager.java
@@ -7,6 +7,8 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Default implementation for creating BeanControllers.
  */
@@ -28,7 +30,7 @@ final class PersistControllerManager {
   void addPersistControllers(DeployBeanDescriptor<?> deployDesc) {
     for (BeanPersistController c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
-        CoreLog.log.debug("BeanPersistController on[{}] {}", deployDesc.getFullName(), c.getClass().getName());
+        CoreLog.log.log(DEBUG, "BeanPersistController on[{0}] {1}", deployDesc.getFullName(), c.getClass().getName());
         deployDesc.addPersistController(c);
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java
index ec0fd3edb..5c771b026 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistListenerManager.java
@@ -7,6 +7,8 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Manages the assignment/registration of BeanPersistListener with their
  * respective DeployBeanDescriptor's.
@@ -29,7 +31,7 @@ final class PersistListenerManager {
   <T> void addPersistListeners(DeployBeanDescriptor<T> deployDesc) {
     for (BeanPersistListener listener : list) {
       if (listener.isRegisterFor(deployDesc.getBeanType())) {
-        CoreLog.log.debug("BeanPersistListener on[{}] {}", deployDesc.getFullName(), listener.getClass().getName());
+        CoreLog.log.log(DEBUG, "BeanPersistListener on[{0}] {1}", deployDesc.getFullName(), listener.getClass().getName());
         deployDesc.addPersistListener(listener);
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java
index 33b3a5f76..525a87fb3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostConstructManager.java
@@ -7,6 +7,8 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Default implementation for creating BeanControllers.
  */
@@ -28,7 +30,7 @@ final class PostConstructManager {
   void addPostConstructListeners(DeployBeanDescriptor<?> deployDesc) {
     for (BeanPostConstructListener c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
-        CoreLog.log.debug("BeanPostLoad on[{}] {}", deployDesc.getFullName(), c.getClass().getName());
+        CoreLog.log.log(DEBUG, "BeanPostLoad on[{0}] {1}", deployDesc.getFullName(), c.getClass().getName());
         deployDesc.addPostConstructListener(c);
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java
index babc69c76..1638c1682 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PostLoadManager.java
@@ -7,6 +7,8 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Default implementation for creating BeanControllers.
  */
@@ -28,7 +30,7 @@ final class PostLoadManager {
   void addPostLoad(DeployBeanDescriptor<?> deployDesc) {
     for (BeanPostLoad c : list) {
       if (c.isRegisterFor(deployDesc.getBeanType())) {
-        CoreLog.log.debug("BeanPostLoad on[{}] {}", deployDesc.getFullName(), c.getClass().getName());
+        CoreLog.log.log(DEBUG, "BeanPostLoad on[{0}] {1}", deployDesc.getFullName(), c.getClass().getName());
         deployDesc.addPostLoad(c);
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 4605a2d6b..e33dd310c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -11,6 +11,8 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * Helper object to classify BeanProperties into appropriate lists.
  */
@@ -222,7 +224,7 @@ public final class DeployBeanPropertyLists {
           if (versionProperty == null) {
             versionProperty = prop;
           } else {
-            CoreLog.internal.warn("Multiple @Version properties - property " + prop.fullName() + " not treated as a version property");
+            CoreLog.internal.log(WARNING, "Multiple @Version properties - property " + prop.fullName() + " not treated as a version property");
           }
         } else if (prop.isDraftDirty()) {
           draftDirty = prop;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index 18b087305..e37d9ea40 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -15,6 +15,7 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
 
 import javax.persistence.*;
+import java.lang.System.Logger.Level;
 
 /**
  * Read the deployment annotations for Associated One beans.
@@ -213,10 +214,10 @@ final class AnnotationAssocOnes extends AnnotationAssoc {
     prop.setPrimaryKeyJoin(true);
 
     if (!primaryKeyJoin.name().isEmpty()) {
-      CoreLog.internal.info("Automatically determining join columns for @PrimaryKeyJoinColumn - ignoring PrimaryKeyJoinColumn.name attribute [{}] on {}", primaryKeyJoin.name(), prop.getFullBeanName());
+      CoreLog.internal.log(Level.INFO, "Automatically determining join columns for @PrimaryKeyJoinColumn - ignoring PrimaryKeyJoinColumn.name attribute [{0}] on {1}", primaryKeyJoin.name(), prop.getFullBeanName());
     }
     if (!primaryKeyJoin.referencedColumnName().isEmpty()) {
-      CoreLog.internal.info("Automatically determining join columns for @PrimaryKeyJoinColumn - Ignoring PrimaryKeyJoinColumn.referencedColumnName attribute [{}] on {}", primaryKeyJoin.referencedColumnName(), prop.getFullBeanName());
+      CoreLog.internal.log(Level.INFO, "Automatically determining join columns for @PrimaryKeyJoinColumn - Ignoring PrimaryKeyJoinColumn.referencedColumnName attribute [{0}] on {1}", primaryKeyJoin.referencedColumnName(), prop.getFullBeanName());
     }
     BeanTable baseBeanTable = factory.beanTable(info.getDescriptor().getBeanType());
     String localPrimaryKey = baseBeanTable.getIdColumn();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index 956fa66c7..36fdc915f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -32,6 +32,8 @@ import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
+import java.lang.System.Logger.Level;
+
 import static io.ebean.util.AnnotationUtil.typeGet;
 
 /**
@@ -65,7 +67,7 @@ final class AnnotationClass extends AnnotationParser {
       Column column = override.column();
       DeployBeanProperty beanProperty = descriptor.getBeanProperty(propertyName);
       if (beanProperty == null) {
-        CoreLog.log.error("AttributeOverride property [" + propertyName + "] not found on " + descriptor.getFullName());
+        CoreLog.log.log(Level.ERROR, "AttributeOverride property [" + propertyName + "] not found on " + descriptor.getFullName());
       } else {
         readColumn(column, beanProperty);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index 426c92048..14579b621 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -11,6 +11,7 @@ import io.ebeaninternal.server.type.TypeManager;
 
 import javax.persistence.PersistenceException;
 import javax.persistence.Transient;
+import java.lang.System.Logger.Level;
 import java.lang.reflect.*;
 
 /**
@@ -84,7 +85,7 @@ public final class DeployCreateProperties {
             if (replaced != null && !replaced.isTransient()) {
               String msg = "Huh??? property " + prop.getFullBeanName() + " being defined twice";
               msg += " but replaced property was not transient? This is not expected?";
-              CoreLog.log.warn(msg);
+              CoreLog.log.log(Level.WARNING, msg);
             }
           }
         }
@@ -111,7 +112,7 @@ public final class DeployCreateProperties {
         return new DeployBeanPropertySimpleCollection(desc, targetType, manyType);
       }
     } catch (NullPointerException e) {
-      CoreLog.internal.debug("expected non-scalar type {}", e.getMessage());
+      CoreLog.internal.log(Level.DEBUG, "expected non-scalar type {0}", e.getMessage());
     }
     return new DeployBeanPropertyAssocMany(desc, targetType, manyType);
   }
@@ -132,7 +133,7 @@ public final class DeployCreateProperties {
           // not supporting this field (generic type used)
           return null;
         }
-        CoreLog.internal.warn("Could not find parameter type (via reflection) on " + desc.getFullName() + " " + field.getName());
+        CoreLog.internal.log(Level.WARNING, "Could not find parameter type (via reflection) on " + desc.getFullName() + " " + field.getName());
       }
       return createManyType(desc, targetType, manyType);
     }
@@ -151,7 +152,7 @@ public final class DeployCreateProperties {
       return new DeployBeanPropertyAssocOne(desc, propertyType);
 
     } catch (Exception e) {
-      CoreLog.log.error("Error with " + desc + " field:" + field.getName(), e);
+      CoreLog.log.log(Level.ERROR, "Error with " + desc + " field:" + field.getName(), e);
       return null;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
index 43acbf342..454bc65e1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.dto;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.type.TypeManager;
 
+import java.lang.System.Logger.Level;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -39,7 +40,7 @@ final class DtoMetaBuilder {
           final String name = propertyName(method.getName());
           properties.add(new DtoMetaProperty(typeManager, dtoType, method, name));
         } catch (Exception e) {
-          CoreLog.log.debug("exclude on " + dtoType + " method " + method, e);
+          CoreLog.log.log(Level.DEBUG, "exclude on " + dtoType + " method " + method, e);
         }
       }
     }
@@ -77,7 +78,7 @@ final class DtoMetaBuilder {
         constructorList.add(new DtoMetaConstructor(typeManager, constructor, dtoType));
       } catch (Exception e) {
         // we don't want that constructor
-        CoreLog.log.debug("exclude on " + dtoType + " constructor " + constructor, e);
+        CoreLog.log.log(Level.DEBUG, "exclude on " + dtoType + " constructor " + constructor, e);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonExecutorService.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonExecutorService.java
index af23a086d..de9b959ef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonExecutorService.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonExecutorService.java
@@ -1,9 +1,8 @@
 package io.ebeaninternal.server.executor;
 
+import io.avaje.applog.AppLog;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.lang.System.Logger.Level;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -14,7 +13,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 final class DaemonExecutorService {
 
-  private static final Logger logger = LoggerFactory.getLogger(DaemonExecutorService.class);
+  private static final System.Logger logger = AppLog.getLogger(DaemonExecutorService.class);
 
   private final ReentrantLock lock = new ReentrantLock(false);
   private final String namePrefix;
@@ -44,19 +43,19 @@ final class DaemonExecutorService {
     lock.lock();
     try {
       if (service.isShutdown()) {
-        logger.debug("DaemonExecutorService[{}] already shut down", namePrefix);
+        logger.log(Level.DEBUG, "DaemonExecutorService[{0}] already shut down", namePrefix);
         return;
       }
       try {
-        logger.debug("DaemonExecutorService[{}] shutting down...", namePrefix);
+        logger.log(Level.DEBUG, "DaemonExecutorService[{0}] shutting down...", namePrefix);
         service.shutdown();
         if (!service.awaitTermination(shutdownWaitSeconds, TimeUnit.SECONDS)) {
-          logger.info("DaemonExecutorService[{}] shut down timeout exceeded. Terminating running threads.", namePrefix);
+          logger.log(Level.INFO, "DaemonExecutorService[{0}] shut down timeout exceeded. Terminating running threads.", namePrefix);
           service.shutdownNow();
         }
 
       } catch (Exception e) {
-        logger.error("Error during shutdown of DaemonThreadPool[" + namePrefix + "]", e);
+        logger.log(Level.ERROR, "Error during shutdown of DaemonThreadPool[" + namePrefix + "]", e);
         e.printStackTrace();
       }
     } finally {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
index 98265905f..1a7c23b3e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.executor;
 
 import io.ebeaninternal.api.CoreLog;
-import org.slf4j.Logger;
 
+import java.lang.System.Logger.Level;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
@@ -12,7 +12,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor {
 
-  private static final Logger log = CoreLog.log;
+  private static final System.Logger log = CoreLog.log;
 
   private final ReentrantLock lock = new ReentrantLock();
   private final String namePrefix;
@@ -38,19 +38,19 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
     lock.lock();
     try {
       if (super.isShutdown()) {
-        log.debug("Already shutdown threadPool {}", namePrefix);
+        log.log(Level.DEBUG, "Already shutdown threadPool {0}", namePrefix);
         return;
       }
       try {
-        log.trace("shutting down threadPool {}", namePrefix);
+        log.log(Level.TRACE, "shutting down threadPool {0}", namePrefix);
         super.shutdown();
         if (!super.awaitTermination(shutdownWaitSeconds, TimeUnit.SECONDS)) {
-          log.info("Shutdown wait timeout exceeded. Terminating running threads for {}", namePrefix);
+          log.log(Level.INFO, "Shutdown wait timeout exceeded. Terminating running threads for {0}", namePrefix);
           super.shutdownNow();
         }
-        log.trace("shutdown complete for threadPool {}", namePrefix);
+        log.log(Level.TRACE, "shutdown complete for threadPool {0}", namePrefix);
       } catch (Exception e) {
-        log.error("Error during shutdown of threadPool " + namePrefix, e);
+        log.log(Level.ERROR, "Error during shutdown of threadPool " + namePrefix, e);
         e.printStackTrace();
       }
     } finally {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
index b4c13a8bd..ce0254a22 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
@@ -1,21 +1,20 @@
 package io.ebeaninternal.server.executor;
 
+import io.avaje.applog.AppLog;
 import io.avaje.lang.NonNullApi;
 import io.ebean.config.BackgroundExecutorWrapper;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
 
+import java.lang.System.Logger.Level;
 import java.util.concurrent.*;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * The default implementation of the BackgroundExecutor.
  */
 @NonNullApi
 public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.BackgroundExecutor");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.BackgroundExecutor");
 
   private final ScheduledExecutorService schedulePool;
   private final DaemonExecutorService pool;
@@ -28,7 +27,7 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
     this.schedulePool = new DaemonScheduleThreadPool(schedulePoolSize, shutdownWaitSeconds, namePrefix + "-periodic-");
     this.pool = new DaemonExecutorService(shutdownWaitSeconds, namePrefix);
     this.wrapper = wrapper;
-    log.debug("Created backgroundExecutor {} (schedulePoolSize={}, shutdownWaitSeconds={})", namePrefix, schedulePoolSize, shutdownWaitSeconds);
+    log.log(Level.DEBUG, "Created backgroundExecutor {0} (schedulePoolSize={1}, shutdownWaitSeconds={2})", namePrefix, schedulePoolSize, shutdownWaitSeconds);
   }
 
   /**
@@ -59,20 +58,20 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
    * This is used in methods that accepts a <code>Runnable</code> and return
    * either <code>void</code> or <code>ScheduledFuture</code>, as there is
    * normally no Future.get() call.
-   *
+   * <p>
    * Note: When submitting a <code>Callable</code>, you must check
    * <code>Future.get()</code> for exceptions.
    */
   private Runnable logExceptions(Runnable task) {
     long queued = System.nanoTime();
-    log.trace("Queued {}", task);
+    log.log(Level.TRACE, "Queued {0}", task);
     return () -> {
       try {
-        if (log.isTraceEnabled()) {
+        if (log.isLoggable(Level.TRACE)) {
           long start = System.nanoTime();
-          log.trace("Start {} (delay time {} us)", task, (start - queued) / 1000L);
+          log.log(Level.TRACE, "Start {0} (delay time {1} us)", task, (start - queued) / 1000L);
           task.run();
-          log.trace("Stop {} (exec time {} us)", task, (System.nanoTime() - start) / 1000L);
+          log.log(Level.TRACE, "Stop {0} (exec time {1} us)", task, (System.nanoTime() - start) / 1000L);
         } else {
           task.run();
         }
@@ -80,7 +79,7 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
         // log any exception here. Note they will not bubble up to the calling user
         // unless Future.get() is checked. (Which is almost never done on scheduled
         // background executions)
-        log.error("Error while executing the task {}", task, t);
+        log.log(Level.ERROR, "Error while executing the task " + task, t);
         throw t;
       }
     };
@@ -128,10 +127,10 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
 
   @Override
   public void shutdown() {
-    log.trace("BackgroundExecutor shutting down");
+    log.log(Level.TRACE, "BackgroundExecutor shutting down");
     schedulePool.shutdown();
     pool.shutdown();
-    log.debug("BackgroundExecutor stopped");
+    log.log(Level.DEBUG, "BackgroundExecutor stopped");
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
index 083e08df2..c7ae7e0d3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.idgen;
 
 import java.io.*;
+import java.lang.System.Logger.Level;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.*;
@@ -8,12 +9,11 @@ import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * IdGenerator for java util UUID.
- *
+ * <p>
  * It extends the UuidV1RndIdGenerator so that it can generate rfc4122 compliant Type 1 UUIDs.
- *
+ * <p>
  * This generator produces real Type 1 UUIDs (best for sqlserver) - You should use this generator only,
  * if you can guarantee, that mac addess is uniqe or specify 'ebean.uuidNodeId' in your config file.
- * 
  */
 public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
 
@@ -34,7 +34,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
    * Returns an instance for given file.
    */
   public static UuidV1IdGenerator getInstance(File file, String nodeId) {
-    return INSTANCES.computeIfAbsent(file, f ->new UuidV1IdGenerator(f, nodeId == null ? null : nodeId.toLowerCase()));
+    return INSTANCES.computeIfAbsent(file, f -> new UuidV1IdGenerator(f, nodeId == null ? null : nodeId.toLowerCase()));
   }
 
   /**
@@ -60,7 +60,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
 
   /**
    * Find hardware ID.
-   *
+   * <p>
    * We check all non-loopback networkinterfaces for valid hardwareAddresses
    * We prefer to take the first non virtual "up" device. If no device (with valid addr) is up,
    * we take the first down device.
@@ -71,21 +71,18 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
     while (e.hasMoreElements()) {
       NetworkInterface network = e.nextElement();
       try {
-        log.trace("Probing interface {}", network);
         if (!network.isLoopback()) {
           byte[] addr = network.getHardwareAddress();
           if (validAddr(addr)) {
             if (network.isUp() && !network.isVirtual()) {
-              log.debug("Using interface {}", network);
               return addr;
             } else if (fallbackAddr == null) {
-              log.debug("Using interface {} as fallback", network);
               fallbackAddr = addr;
             }
           }
         }
       } catch (SocketException ex) {
-        log.debug("Skipping {}", network, ex);
+        log.log(Level.DEBUG, "Skipping " + network, ex);
       }
     }
     return fallbackAddr;
@@ -98,7 +95,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
     if (addr != null && addr.length >= 6) { // valid addr has 6 bytes
       // check if vendor is != 0x000000 or 0xFFFFFF
       return (addr[0] != 0x00 && addr[1] != 0x00 && addr[2] != 0x00)
-          ||(addr[0] != 0xFF && addr[1] != 0xFF && addr[2] != 0xFF);
+        || (addr[0] != 0xFF && addr[1] != 0xFF && addr[2] != 0xFF);
     }
     return false;
   }
@@ -122,7 +119,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
         // See, if there is an alternative MAC address set.
         nodeId = parseAlternativeNodeId(altNodeId);
         restoreState();
-        log.info("Explicitly using ID {} to generate Type 1 UUIDs", getNodeIdentifier());
+        log.log(Level.INFO, "Explicitly using ID {0} to generate Type 1 UUIDs", getNodeIdentifier());
       }
       UUID uuid = nextId(null);
       long ts = timeStamp.get();
@@ -130,9 +127,9 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
       ts /= MILLIS_TO_UUID;
 
       saveState();
-      log.debug("Saved state: clockSeq {}, timestamp {}, uuid {}, stateFile: {})", clockSeq.get(), new Date(ts), uuid, stateFile);
+      log.log(Level.DEBUG, "Saved state: clockSeq {0}, timestamp {1}, uuid {2}, stateFile: {3})", clockSeq.get(), new Date(ts), uuid, stateFile);
     } catch (IOException e) {
-      log.error("There was a problem while detecting the nodeId. Falling back to random mode. Try using to specify 'ebean.uuidNodeId' property", e);
+      log.log(Level.ERROR, "There was a problem while detecting the nodeId. Falling back to random mode. Try using to specify 'ebean.uuidNodeId' property", e);
       useRandomMode();
     }
   }
@@ -141,7 +138,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
    * Tries to initialize the generator by retrieving the MAC address from
    * hardware. If there is no suitable network interface found, it will fall back
    * to "generate" mode.
-   * 
+   *
    * @throws IOException if state file is not readable or tryGenerateMode also
    *                     fails.
    */
@@ -149,16 +146,16 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
     try {
       nodeId = getHardwareId();
     } catch (IOException e) {
-      log.error("Error while reading MAC address. Fall back to 'generate' mode", e);
+      log.log(Level.ERROR, "Error while reading MAC address. Fall back to 'generate' mode", e);
       tryGenerateMode();
     }
 
     if (nodeId != null) {
       restoreState();
-      log.info("Using MAC {} to generate Type 1 UUIDs", getNodeIdentifier());
+      log.log(Level.INFO, "Using MAC {0} to generate Type 1 UUIDs", getNodeIdentifier());
       return;
     }
-    log.warn("No suitable network interface found. Fall back to 'generate' mode");
+    log.log(Level.WARNING, "No suitable network interface found. Fall back to 'generate' mode");
     tryGenerateMode();
   }
 
@@ -168,11 +165,11 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
    */
   private void tryGenerateMode() throws IOException {
     if (restoreState()) {
-      log.info("Using recently generated nodeId {} to generate Type 1 UUIDs", getNodeIdentifier());
+      log.log(Level.INFO, "Using recently generated nodeId {0} to generate Type 1 UUIDs", getNodeIdentifier());
     } else {
       // RFC 4.5 use random portion for node
       nodeId = super.getNodeIdBytes();
-      log.info("Using a newly generated nodeId {} to generate Type 1 UUIDs", getNodeIdentifier());
+      log.log(Level.INFO, "Using a newly generated nodeId {0} to generate Type 1 UUIDs", getNodeIdentifier());
     }
   }
 
@@ -183,7 +180,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
   private void useRandomMode() {
     canSaveState = false;
     nodeId = super.getNodeIdBytes();
-    log.info("Explicitly using a new random ID {} to generate Type 1 UUIDs", getNodeIdentifier());
+    log.log(Level.INFO, "Explicitly using a new random ID {0} to generate Type 1 UUIDs", getNodeIdentifier());
   }
 
   /**
@@ -206,7 +203,6 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
   private boolean restoreState() throws IOException {
     Properties prop = new Properties();
     if (!stateFile.exists()) {
-      log.debug("State file '{}' does not exist", stateFile);
       return false;
     }
     try (InputStream is = new FileInputStream(stateFile)) {
@@ -215,28 +211,27 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
 
     String propNodeId = prop.getProperty("nodeId");
     if (propNodeId == null || propNodeId.isEmpty()) {
-      log.warn("State file '{}' is incomplete", stateFile);
+      log.log(Level.WARNING, "State file '{0}' is incomplete", stateFile);
       return false; // we cannot restore
     }
     try {
       if (nodeId == null) {
         nodeId = parseAlternativeNodeId(propNodeId);
       } else if (!getNodeIdentifier().equals(propNodeId)) {
-        log.warn(
-            "The nodeId in the state file '{}' has changed from {} to {}. "
-                + "This can happen when MAC address changes or when two containers share the same state file",
-            stateFile, propNodeId, getNodeIdentifier());
+        log.log(Level.WARNING,
+          "The nodeId in the state file '{0}' has changed from {1} to {2}. "
+            + "This can happen when MAC address changes or when two containers share the same state file",
+          stateFile, propNodeId, getNodeIdentifier());
         return false;
       }
       Integer seq = Integer.valueOf(prop.getProperty("clockSeq")) & 0x3FFF;
       Long ts = Long.valueOf(prop.getProperty("timeStamp"));
       clockSeq.set(seq);
       timeStamp.set(ts);
-      log.debug("State successfully restored: {}", prop);
       return true;
-      
+
     } catch (IllegalArgumentException nfe) {
-      log.error("State file '{}' is corrupt", stateFile, nfe);
+      log.log(Level.ERROR, "State file corrupt: " + stateFile, nfe);
     }
     return false;
   }
@@ -259,9 +254,8 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
     }
     try (OutputStream os = new FileOutputStream(stateFile)) {
       prop.store(os, "ebean uuid state file");
-      log.debug("Persisted state to '{}'", stateFile);
     } catch (IOException e) {
-      log.error("Could not persist uuid state to '{}'", stateFile, e);
+      log.log(Level.ERROR, "Could not persist uuid state to: " + stateFile, e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
index a8fd0b52b..e5a34d135 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
@@ -1,17 +1,16 @@
 package io.ebeaninternal.server.idgen;
 
+import io.avaje.applog.AppLog;
 import io.ebean.Transaction;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 
+import java.lang.System.Logger.Level;
 import java.security.SecureRandom;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * IdGenerator for (pseudo) type 1 UUIDs.
  *
@@ -27,7 +26,7 @@ import org.slf4j.LoggerFactory;
  */
 public class UuidV1RndIdGenerator implements PlatformIdGenerator {
 
-  protected static final Logger log = LoggerFactory.getLogger("io.ebean.IDGEN");
+  protected static final System.Logger log = AppLog.getLogger("io.ebean.IDGEN");
 
   // UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
   protected static final long UUID_EPOCH_OFFSET = 0x01B21DD213814000L;
@@ -106,7 +105,7 @@ public class UuidV1RndIdGenerator implements PlatformIdGenerator {
 
         delta = current - last;
         if (delta < -10000 * 20000) {
-          log.info("Clock skew of {} ms detected", delta / -10000);
+          log.log(Level.INFO, "Clock skew of {} ms detected", delta / -10000);
           // The clock was adjusted back about 2 seconds, or we were generating a lot of ids too fast
           // if so, we try to set the current as last and also increment the clockSeq.
           lock.lock();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java
index 90f6cbafa..d52e8cb3b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DLoggerFactory.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.logger;
 
+import io.avaje.applog.AppLog;
 import io.ebeaninternal.api.SpiLogger;
 import io.ebeaninternal.api.SpiLoggerFactory;
-import org.slf4j.LoggerFactory;
 
 /**
  * Default SpiLoggerFactory implementation.
@@ -14,6 +14,6 @@ public final class DLoggerFactory implements SpiLoggerFactory {
    */
   @Override
   public SpiLogger create(String name) {
-    return new DSpiLogger(LoggerFactory.getLogger(name));
+    return new DSpiLogger(AppLog.getLogger(name));
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
index 7c59031ae..adc648275 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
@@ -1,33 +1,34 @@
 package io.ebeaninternal.server.logger;
 
 import io.ebeaninternal.api.SpiLogger;
-import org.slf4j.Logger;
+
+import java.lang.System.Logger.Level;
 
 final class DSpiLogger implements SpiLogger {
 
-  private final Logger logger;
+  private final System.Logger logger;
 
-  DSpiLogger(Logger logger) {
+  DSpiLogger(System.Logger logger) {
     this.logger = logger;
   }
 
   @Override
   public boolean isDebug() {
-    return logger.isDebugEnabled();
+    return logger.isLoggable(Level.DEBUG);
   }
 
   @Override
   public boolean isTrace() {
-    return logger.isTraceEnabled();
+    return logger.isLoggable(Level.TRACE);
   }
 
   @Override
   public void debug(String msg) {
-    logger.debug(msg);
+    logger.log(Level.DEBUG, msg);
   }
 
   @Override
   public void trace(String msg) {
-    logger.trace(msg);
+    logger.log(Level.TRACE, msg);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
index 7b3e74085..ccf068973 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
@@ -6,6 +6,7 @@ import io.ebeaninternal.api.SpiTransaction;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.System.Logger.Level;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -135,7 +136,7 @@ public final class BatchedPstmt implements SpiProfileTransactionEvent {
       try {
         pstmt.close();
       } catch (SQLException e) {
-        CoreLog.log.warn("BatchedPstmt Error closing statement", e);
+        CoreLog.log.log(Level.WARNING, "BatchedPstmt Error closing statement", e);
       } finally {
         pstmt = null;
       }
@@ -201,7 +202,7 @@ public final class BatchedPstmt implements SpiProfileTransactionEvent {
         try {
           inputStream.close();
         } catch (IOException e) {
-          CoreLog.log.warn("BatchedPstmt Error closing inputStream ", e);
+          CoreLog.log.log(Level.WARNING, "BatchedPstmt Error closing inputStream ", e);
         }
       }
       inputStreams = null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index ca81e4ac8..779362ee8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -12,6 +12,7 @@ import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.type.*;
 
 import javax.persistence.PersistenceException;
+import java.lang.System.Logger.Level;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.util.Collection;
@@ -132,7 +133,7 @@ public final class Binder {
       }
 
     } catch (SQLException ex) {
-      CoreLog.log.warn("error binding parameter [{}][{}]", (dataBind.currentPos() - 1), value);
+      CoreLog.log.log(Level.WARNING, "error binding parameter [{0}][{1}]", (dataBind.currentPos() - 1), value);
       throw ex;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index aa2fc8bc2..728c4efcb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.persist;
 
+import io.avaje.applog.AppLog;
 import io.ebean.*;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollection.ModifyListenMode;
@@ -11,9 +12,8 @@ import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.core.*;
 import io.ebeaninternal.server.core.PersistRequest.Type;
 import io.ebeaninternal.server.deploy.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.sql.SQLException;
 import java.util.*;
 
@@ -33,8 +33,8 @@ import java.util.*;
  */
 public final class DefaultPersister implements Persister {
 
-  private static final Logger PUB = LoggerFactory.getLogger("io.ebean.PUB");
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger PUB = AppLog.getLogger("io.ebean.PUB");
+  private static final System.Logger log = CoreLog.internal;
 
   /**
    * Actually does the persisting work.
@@ -143,7 +143,7 @@ public final class DefaultPersister implements Persister {
     DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);
 
     List<T> liveBeans = draftHandler.fetchSourceBeans(query, false);
-    PUB.debug("draftRestore [{}] count[{}]", desc.name(), liveBeans.size());
+    PUB.log(Level.DEBUG, "draftRestore [{0}] count[{1}]", desc.name(), liveBeans.size());
     if (liveBeans.isEmpty()) {
       return Collections.emptyList();
     }
@@ -156,11 +156,11 @@ public final class DefaultPersister implements Persister {
       // reset @DraftDirty and @DraftReset properties
       draftHandler.resetDraft(draftBean);
 
-      PUB.trace("draftRestore bean [{}] id[{}]", desc.name(), draftHandler.getId());
+      PUB.log(Level.TRACE, "draftRestore bean [{0}] id[{1}]", desc.name(), draftHandler.getId());
       update(createRequest(draftBean, transaction, null, mgr, Type.UPDATE, Flags.RECURSE));
     }
 
-    PUB.debug("draftRestore - complete for [{}]", desc.name());
+    PUB.log(Level.DEBUG, "draftRestore - complete for [{0}]", desc.name());
     return draftHandler.getDrafts();
   }
 
@@ -185,7 +185,7 @@ public final class DefaultPersister implements Persister {
     DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);
 
     List<T> draftBeans = draftHandler.fetchSourceBeans(query, true);
-    PUB.debug("publish [{}] count[{}]", desc.name(), draftBeans.size());
+    PUB.log(Level.DEBUG, "publish [{0}] count[{1}]", desc.name(), draftBeans.size());
     if (draftBeans.isEmpty()) {
       return Collections.emptyList();
     }
@@ -202,7 +202,7 @@ public final class DefaultPersister implements Persister {
       draftHandler.resetDraft(draftBean);
 
       Type persistType = draftHandler.isInsert() ? Type.INSERT : Type.UPDATE;
-      PUB.trace("publish bean [{}] id[{}] type[{}]", desc.name(), draftHandler.getId(), persistType);
+      PUB.log(Level.TRACE, "publish bean [{0}] id[{1}] type[{2}]", desc.name(), draftHandler.getId(), persistType);
 
       PersistRequestBean<T> request = createRequest(liveBean, transaction, null, mgr, persistType, Flags.PUBLISH_RECURSE);
       if (persistType == Type.INSERT) {
@@ -214,7 +214,7 @@ public final class DefaultPersister implements Persister {
     }
 
     draftHandler.updateDrafts(transaction, mgr);
-    PUB.debug("publish - complete for [{}]", desc.name());
+    PUB.log(Level.DEBUG, "publish - complete for [{0}]", desc.name());
     return livePublish;
   }
 
@@ -270,7 +270,7 @@ public final class DefaultPersister implements Persister {
     void updateDrafts(Transaction transaction, BeanManager<T> mgr) {
       if (!draftUpdates.isEmpty()) {
         // update the dirty status on the drafts that have been published
-        PUB.debug("publish - update dirty status on [{}] drafts", draftUpdates.size());
+        PUB.log(Level.DEBUG, "publish - update dirty status on [{0}] drafts", draftUpdates.size());
         for (T draftUpdate : draftUpdates) {
           update(createRequest(draftUpdate, transaction, null, mgr, Type.UPDATE, Flags.ZERO));
         }
@@ -491,8 +491,8 @@ public final class DefaultPersister implements Persister {
       }
       if (request.isDirty()) {
         request.executeOrQueue();
-      } else if (log.isDebugEnabled()) {
-        log.debug("Update skipped as bean is unchanged: {}", request.bean());
+      } else if (log.isLoggable(Level.DEBUG)) {
+        log.log(Level.DEBUG, "Update skipped as bean is unchanged: {0}", request.bean());
       }
       if (request.isPersistCascade()) {
         // save all the beans in assocMany's after
@@ -538,8 +538,8 @@ public final class DefaultPersister implements Persister {
     if (req.isRegisteredForDeleteBean()) {
       // skip deleting bean. Used where cascade is on
       // both sides of a relationship
-      if (log.isDebugEnabled()) {
-        log.debug("skipping delete on alreadyRegistered {}", req.bean());
+      if (log.isLoggable(Level.DEBUG)) {
+        log.log(Level.DEBUG, "skipping delete on alreadyRegistered {0}", req.bean());
       }
       return 0;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
index be42d42c2..c839ac9e6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
@@ -9,6 +9,7 @@ import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 
 import java.io.IOException;
+import java.lang.System.Logger.Level;
 
 /**
  * Base for saving entity bean collections and element collections.
@@ -71,7 +72,7 @@ abstract class SaveManyBase implements SaveMany {
           String asJson = many.jsonWriteCollection(value);
           request.addCollectionChange(many.name(), asJson);
         } catch (IOException e) {
-          CoreLog.log.error("Error build element collection entry for L2 cache", e);
+          CoreLog.log.log(Level.ERROR, "Error build element collection entry for L2 cache", e);
         }
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 7b7c2d970..5b6858e78 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -318,7 +318,7 @@ final class SaveManyBeans extends SaveManyBase {
           if (transaction.isLogSummary()) {
             transaction.logSummary(m);
           }
-          CoreLog.log.warn(m);
+          CoreLog.log.log(System.Logger.Level.WARNING, m);
         } else {
           if (!many.hasImportedId(otherBean)) {
             throw new PersistenceException("ManyToMany bean " + otherBean + " does not have an Id value.");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index 7b82e7faa..ef3d9d098 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -15,6 +15,8 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Base class for Handler implementations.
  */
@@ -123,7 +125,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
         dataBind.close();
       }
     } catch (SQLException ex) {
-      CoreLog.log.error(null, ex);
+      CoreLog.log.log(ERROR, "Error closing DataBind", ex);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
index b7457bbbb..6fc84bfb5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -25,6 +25,8 @@ import java.sql.SQLException;
 import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * An object that represents a SqlSelect statement.
  * <p>
@@ -344,7 +346,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
         auditIterateLogMessage();
       }
     } catch (Throwable e) {
-      CoreLog.log.error("Error logging read audit logs", e);
+      CoreLog.log.log(ERROR, "Error logging read audit logs", e);
     }
     try {
       if (dataReader != null) {
@@ -352,7 +354,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
         dataReader = null;
       }
     } catch (SQLException e) {
-      CoreLog.log.error("Error closing dataReader", e);
+      CoreLog.log.log(ERROR, "Error closing dataReader", e);
     }
     JdbcClose.close(pstmt);
     pstmt = null;
@@ -548,7 +550,7 @@ public final class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfi
       }
       transaction().profileEvent(this);
     } catch (Exception e) {
-      CoreLog.log.error("Error updating execution statistics", e);
+      CoreLog.log.log(ERROR, "Error updating execution statistics", e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index 894bcfce5..ad2cdbae8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -11,16 +11,14 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.util.JdbcClose;
 import io.ebean.util.StringHelper;
-import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.DiffHelp;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.util.Str;
 import io.ebeaninternal.server.persist.Binder;
-import org.slf4j.Logger;
+import io.ebeaninternal.server.util.Str;
 
 import javax.persistence.PersistenceException;
 import java.sql.ResultSet;
@@ -32,7 +30,6 @@ import java.util.*;
  */
 public final class CQueryEngine {
 
-  private static final Logger log = CoreLog.log;
   private static final String T0 = "t0";
 
   private final int defaultFetchSizeFindList;
@@ -195,7 +192,6 @@ public final class CQueryEngine {
       }
       if (!cquery.prepareBindExecuteQueryForwardOnly(forwardOnlyHintOnFindIterate)) {
         // query has been cancelled already
-        log.trace("Future fetch already cancelled");
         return null;
       }
       if (request.logSql()) {
@@ -349,7 +345,6 @@ public final class CQueryEngine {
       }
       if (!cquery.prepareBindExecuteQuery()) {
         // query has been cancelled already
-        log.trace("Future fetch already cancelled");
         return null;
       }
       if (request.logSql()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
index f2fb587f2..78b20dc1c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java
@@ -19,6 +19,8 @@ import java.util.Collection;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Base compiled query request for single attribute queries.
  */
@@ -153,7 +155,7 @@ final class CQueryFetchSingleAttribute implements SpiProfileTransactionEvent, Ca
         dataReader = null;
       }
     } catch (SQLException e) {
-      CoreLog.log.error("Error closing DataReader", e);
+      CoreLog.log.log(ERROR, "Error closing DataReader", e);
     }
     JdbcClose.close(pstmt);
     pstmt = null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 7ab1b8a39..490949ab1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -23,6 +23,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Set;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Represents a query for a given SQL statement.
  * <p>
@@ -313,7 +315,7 @@ public class CQueryPlan implements SpiQueryPlan {
       predicates.bind(capture);
       bindCapture.setBind(capture.bindCapture(), executionTimeMicros, startNanos);
     } catch (SQLException e) {
-      CoreLog.log.error("Error capturing bind values", e);
+      CoreLog.log.log(ERROR, "Error capturing bind values", e);
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
index e1cb2d3c3..33f353176 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
@@ -7,6 +7,7 @@ import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.server.type.bindcapture.BindCapture;
 
+import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -64,7 +65,7 @@ public final class CQueryPlanManager implements QueryPlanManager {
       }
       return req.plans();
     } catch (SQLException e) {
-      CoreLog.log.error("Error during query plan collection", e);
+      CoreLog.log.log(Level.ERROR, "Error during query plan collection", e);
       return emptyList();
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index 414484d1e..01e64642f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -26,6 +26,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * Compile Query Predicates.
  * <p>
@@ -339,7 +341,7 @@ public final class CQueryPredicates {
         msg += "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById + "]";
         msg += " must come before the many property [" + manyProp.name() + "] in the orderBy.";
         msg += " Ebean has automatically modified the orderBy clause to do this.";
-        CoreLog.log.warn(msg);
+        CoreLog.log.log(WARNING, msg);
       }
       // the id needs to come before the manyPropName
       orderBy = orderBy.substring(0, manyPos) + orderById + ", " + orderBy.substring(manyPos);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
index d87f66ed6..70c0df722 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
@@ -10,6 +10,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * A QueryPlanLogger that prefixes "EXPLAIN " to the query. This works for Postgres, H2 and MySql.
  */
@@ -23,7 +25,7 @@ public final class QueryPlanLoggerExplain extends QueryPlanLogger {
         return readQueryPlan(plan, bind, rset);
       }
     } catch (SQLException e) {
-      CoreLog.log.warn("Could not log query plan", e);
+      CoreLog.log.log(WARNING, "Could not log query plan", e);
       return null;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
index f5454bb76..45c3094af 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
@@ -12,6 +12,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * A QueryPlanLogger for oracle.
  *
@@ -30,7 +32,7 @@ public final class QueryPlanLoggerOracle extends QueryPlanLogger {
         return readQueryPlan(plan, bind, rset);
       }
     } catch (SQLException e) {
-      CoreLog.log.warn("Could not log query plan", e);
+      CoreLog.log.log(WARNING, "Could not log query plan", e);
       return null;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
index db99ef672..8b5253c90 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
@@ -10,6 +10,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * A QueryPlanLogger for Postgres that prefixes "EXPLAIN ANALYZE" to the query.
  */
@@ -24,7 +26,7 @@ public final class QueryPlanLoggerPostgres extends QueryPlanLogger {
         return readQueryPlanBasic(plan, bind, rset);
       }
     } catch (SQLException e) {
-      CoreLog.log.warn("Could not log query plan: " + explain, e);
+      CoreLog.log.log(WARNING, "Could not log query plan: " + explain, e);
       return null;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
index 75df42bc1..2da90d98f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
@@ -11,6 +11,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * A QueryPlanLogger for SqlServer. It will return the plan as XML, which can be opened in
  * Microsoft SQL Server Management Studio.
@@ -42,13 +44,13 @@ public final class QueryPlanLoggerSqlServer extends QueryPlanLogger {
         return createPlan(plan, bind.toString(), xml);
 
       } catch (SQLException e) {
-        CoreLog.log.warn("Could not log query plan", e);
+        CoreLog.log.log(WARNING, "Could not log query plan", e);
         return null;
       } finally {
         stmt.execute("set statistics xml off");
       }
     } catch (SQLException e) {
-      CoreLog.log.warn("Could not log query plan", e);
+      CoreLog.log.log(WARNING, "Could not log query plan", e);
       return null;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index a018b081f..30586c4f7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -11,23 +11,16 @@ import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
-import org.slf4j.Logger;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.lang.System.Logger.Level;
+import java.util.*;
 
 /**
  * Factory for SqlTree.
  */
 public final class SqlTreeBuilder {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final SpiQuery<?> query;
   private final STreeType desc;
@@ -92,10 +85,10 @@ public final class SqlTreeBuilder {
     this.disableLazyLoad = query.isDisableLazyLoading();
     this.readOnly = Boolean.TRUE.equals(query.isReadOnly());
     this.subQuery = Type.SQ_EXISTS == query.getType()
-        || Type.SQ_IN == query.getType()
-        || Type.ID_LIST == query.getType()
-        || Type.DELETE == query.getType()
-        || query.isCountDistinct();
+      || Type.SQ_IN == query.getType()
+      || Type.ID_LIST == query.getType()
+      || Type.DELETE == query.getType()
+      || query.isCountDistinct();
     this.includeJoin = query.getM2mIncludeJoin();
     this.manyWhereJoins = query.getManyWhereJoins();
     this.queryDetail = query.getDetail();
@@ -392,7 +385,7 @@ public final class SqlTreeBuilder {
   private void addPropertyToSubQuery(SqlTreeProperties selectProps, STreeType desc, String propName, String path) {
     STreeProperty p = desc.findPropertyWithDynamic(propName, path);
     if (p == null) {
-      log.error("property [" + propName + "]not found on " + desc + " for query - excluding it.");
+      log.log(Level.ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
       return;
     } else if (p instanceof STreePropertyAssoc && p.isEmbedded()) {
       // if the property is embedded we need to lookup the real column name
@@ -427,13 +420,13 @@ public final class SqlTreeBuilder {
           if (p != null) {
             selectProps.add(p);
           } else {
-            log.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
+            log.log(Level.ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
           }
         } else if (p.isEmbedded() || (p instanceof STreePropertyAssoc && !queryProps.isIncludedBeanJoin(p.name()))) {
           // add the embedded bean or the *ToOne assoc bean.  We skip the check that the *ToOne propName maps to Id property ...
           selectProps.add(p);
         } else {
-          log.error("property [" + p.fullName() + "] expected to be an embedded or *ToOne bean for query - excluding it.");
+          log.log(Level.ERROR, "property [{0}] expected to be an embedded or *ToOne bean for query - excluding it.", p.fullName());
         }
       }
 
@@ -442,7 +435,7 @@ public final class SqlTreeBuilder {
       // sub class hierarchy if required
       STreeProperty p = desc.findPropertyWithDynamic(propName, queryProps.getPath());
       if (p == null) {
-        log.error("property [" + propName + "] not found on " + desc + " for query - excluding it.");
+        log.log(Level.ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
         p = desc.findProperty("id");
         selectProps.add(p);
 
@@ -542,9 +535,6 @@ public final class SqlTreeBuilder {
     if (queryDetail.includesPath(propName)) {
       if (manyProperty != null) {
         // only one many associated allowed to be included in fetch
-        if (log.isDebugEnabled()) {
-          log.debug("Not joining [" + propName + "] as already joined to a Many[" + manyProperty + "].");
-        }
         return false;
       }
       manyProperty = manyProp;
@@ -559,7 +549,6 @@ public final class SqlTreeBuilder {
    * Return true if this node is FULLY included resulting in table join. If the
    * node is not included but its parent has been included then a "bean proxy"
    * is added and false is returned.
-   * </p>
    */
   private boolean isIncludeBean(String prefix) {
     if (queryDetail.includesPath(prefix)) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
index 72b5ee85f..b49f3baf4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
@@ -1,17 +1,17 @@
 package io.ebeaninternal.server.readaudit;
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import io.avaje.applog.AppLog;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditQueryPlan;
 import io.ebean.event.readaudit.ReadEvent;
 import io.ebean.text.json.EJson;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
 import io.ebeaninternal.api.CoreLog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.lang.System.Logger.Level;
 import java.util.Map;
 
 /**
@@ -19,8 +19,8 @@ import java.util.Map;
  */
 public class DefaultReadAuditLogger implements ReadAuditLogger {
 
-  private static final Logger queryLogger = LoggerFactory.getLogger("io.ebean.ReadAuditQuery");
-  private static final Logger auditLogger = LoggerFactory.getLogger("io.ebean.ReadAudit");
+  private static final System.Logger queryLogger = AppLog.getLogger("io.ebean.ReadAuditQuery");
+  private static final System.Logger auditLogger = AppLog.getLogger("io.ebean.ReadAudit");
 
   protected final JsonFactory jsonFactory = new JsonFactory();
   protected int defaultQueryBuffer = 500;
@@ -48,9 +48,9 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
       }
       gen.writeEndObject();
       gen.flush();
-      queryLogger.info(writer.toString());
+      queryLogger.log(Level.INFO, writer.toString());
     } catch (IOException e) {
-      CoreLog.log.error("Error writing Read audit event", e);
+      CoreLog.log.log(Level.ERROR, "Error writing Read audit event", e);
     }
   }
 
@@ -75,9 +75,9 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
       StringWriter writer = new StringWriter(defaultReadBuffer);
       JsonGenerator gen = jsonFactory.createGenerator(writer);
       writeDetails(gen, event);
-      auditLogger.info(writer.toString());
+      auditLogger.log(Level.INFO, writer.toString());
     } catch (IOException e) {
-      CoreLog.log.error("Error writing Read audit event", e);
+      CoreLog.log.log(Level.ERROR, "Error writing Read audit event", e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
index 16c4aafad..028b40c19 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
@@ -7,9 +7,11 @@ import io.ebean.plugin.SpiServer;
 import io.ebean.util.IOUtils;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiProfileHandler;
-import org.slf4j.Logger;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.lang.System.Logger.Level;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
@@ -31,8 +33,9 @@ import static java.time.temporal.ChronoField.*;
  */
 public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
   private static final DateTimeFormatter DTF;
+
   static {
     DTF = new DateTimeFormatterBuilder()
       .parseCaseInsensitive()
@@ -76,7 +79,7 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
     this.executor = Executors.newSingleThreadExecutor();
     this.dir = new File(config.getDirectory());
     if (!dir.exists() && !dir.mkdirs()) {
-      log.error("failed to mkdirs " + dir.getAbsolutePath());
+      log.log(Level.ERROR, "failed to mkdirs " + dir.getAbsolutePath());
     }
     incrementFile();
   }
@@ -106,7 +109,7 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
           out.close();
           out = null;
         } catch (IOException e) {
-          log.error("Failed to flush and close transaction profiling file ", e);
+          log.log(Level.ERROR, "Failed to flush and close transaction profiling file ", e);
         }
       }
     } finally {
@@ -126,7 +129,7 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
         File file = new File(dir, "txprofile-" + now + ".tprofile");
         out = IOUtils.newWriter(file);
       } catch (IOException e) {
-        log.error("Not expected", e);
+        log.log(Level.ERROR, "Not expected", e);
       }
     } finally {
       lock.unlock();
@@ -149,7 +152,7 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
       }
       flushCurrentFile();
     } catch (Exception e) {
-      log.warn("Error on collect", e);
+      log.log(Level.WARNING, "Error on collect", e);
     }
   }
 
@@ -180,10 +183,10 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
 
       if (profileCounter % profilesPerFile == 0) {
         incrementFile();
-        log.debug("profiled {} transactions", profileCounter);
+        log.log(Level.DEBUG, "profiled {0} transactions", profileCounter);
       }
     } catch (IOException e) {
-      log.warn("Error writing transaction profiling", e);
+      log.log(Level.WARNING, "Error writing transaction profiling", e);
     }
   }
 
@@ -247,16 +250,16 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
   @Override
   public void shutdown() {
     shutdown = true;
-    log.trace("shutting down");
+    log.log(Level.TRACE, "shutting down");
     try {
       executor.shutdown();
       if (!executor.awaitTermination(4, TimeUnit.SECONDS)) {
-        log.info("Shut down timeout exceeded. Terminating profiling consumer thread.");
+        log.log(Level.INFO, "Shut down timeout exceeded. Terminating profiling consumer thread.");
         executor.shutdownNow();
       }
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
-      log.warn("Interrupt on shutdown", e);
+      log.log(Level.WARNING, "Interrupt on shutdown", e);
     }
     flushCurrentFile();
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 42f585707..9ee5aa5a0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -12,6 +12,7 @@ import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
 
 import javax.persistence.PersistenceException;
+import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -483,7 +484,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
     } catch (Exception ex) {
       // the connection pool will automatically remove the
       // connection if it does not pass the test
-      CoreLog.log.error("Error closing connection", ex);
+      CoreLog.log.log(Level.ERROR, "Error closing connection", ex);
     }
     connection = null;
     active = false;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 4fb74db18..38021986f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -14,10 +14,10 @@ import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.persist.BatchedSqlException;
 import io.ebeaninternal.server.util.Str;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
-import org.slf4j.Logger;
 
 import javax.persistence.PersistenceException;
 import javax.persistence.RollbackException;
+import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.*;
@@ -28,7 +28,7 @@ import java.util.function.Consumer;
  */
 class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
-  private static final Logger log = CoreLog.log;
+  private static final System.Logger log = CoreLog.log;
   private static final Object PLACEHOLDER = new Object();
   private static final String illegalStateMessage = "Transaction is Inactive";
 
@@ -356,7 +356,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         try {
           consumer.accept(callbackList.get(i));
         } catch (Exception e) {
-          log.error("Error executing transaction callback", e);
+          log.log(Level.ERROR, "Error executing transaction callback", e);
         }
       }
     }
@@ -884,7 +884,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         connection.setReadOnly(false);
       }
     } catch (SQLException e) {
-      log.error("Error setting to readOnly?", e);
+      log.log(Level.ERROR, "Error setting to readOnly?", e);
     }
     try {
       if (autoCommit) {
@@ -892,14 +892,14 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         connection.setAutoCommit(true);
       }
     } catch (SQLException e) {
-      log.error("Error setting to readOnly?", e);
+      log.log(Level.ERROR, "Error setting to readOnly?", e);
     }
     try {
       connection.close();
     } catch (Exception ex) {
       // the connection pool will automatically remove the
       // connection if it does not pass the test
-      log.error("Error closing connection", ex);
+      log.log(Level.ERROR, "Error closing connection", ex);
     }
     connection = null;
     active = false;
@@ -932,7 +932,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       }
       withEachCallback(TransactionCallback::postCommit);
     } catch (SQLException e) {
-      log.error("Error when ending a query only transaction via " + onQueryOnly, e);
+      log.log(Level.ERROR, "Error when ending a query only transaction via " + onQueryOnly, e);
     }
   }
 
@@ -1056,7 +1056,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   private RuntimeException wrapIfNeeded(Exception e) {
     if (e instanceof PersistenceException) {
       // keep more specific exception if we have it
-      return (PersistenceException)e;
+      return (PersistenceException) e;
     }
     return new RollbackException(e);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
index f5edf2688..3845d0776 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
@@ -4,7 +4,6 @@ import io.ebean.config.ExternalTransactionManager;
 import io.ebean.util.JdbcClose;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiTransaction;
-import org.slf4j.Logger;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -14,13 +13,14 @@ import javax.transaction.Status;
 import javax.transaction.Synchronization;
 import javax.transaction.TransactionSynchronizationRegistry;
 import javax.transaction.UserTransaction;
+import java.lang.System.Logger.Level;
 
 /**
  * Hook into external JTA transaction manager.
  */
 public final class JtaTransactionManager implements ExternalTransactionManager {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
   private static final String EBEAN_TXN_RESOURCE = "EBEAN_TXN_RESOURCE";
 
   private TransactionManager transactionManager;
@@ -87,15 +87,15 @@ public final class JtaTransactionManager implements ExternalTransactionManager {
     SpiTransaction currentEbeanTransaction = scope.inScope();
     if (currentEbeanTransaction != null) {
       // NOT expecting this so log WARNING
-      log.warn("JTA Transaction - no current txn BUT using current Ebean one {}", currentEbeanTransaction.getId());
+      log.log(Level.WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.getId());
       return currentEbeanTransaction;
     }
 
     UserTransaction ut = getUserTransaction();
     if (ut == null) {
       // no current JTA transaction
-      if (log.isDebugEnabled()) {
-        log.debug("JTA Transaction - no current txn");
+      if (log.isLoggable(Level.DEBUG)) {
+        log.log(Level.DEBUG, "JTA Transaction - no current txn");
       }
       return null;
     }
@@ -181,27 +181,21 @@ public final class JtaTransactionManager implements ExternalTransactionManager {
     public void afterCompletion(int status) {
       switch (status) {
         case Status.STATUS_COMMITTED:
-          if (log.isDebugEnabled()) {
-            log.debug("Jta Txn [" + transaction.getId() + "] committed");
-          }
+          log.log(Level.DEBUG, "Jta Txn [{0}] committed", transaction.getId());
           transaction.postCommit();
           // Remove this transaction object as it is completed
           transactionManager.scope().clearExternal();
           break;
 
         case Status.STATUS_ROLLEDBACK:
-          if (log.isDebugEnabled()) {
-            log.debug("Jta Txn [" + transaction.getId() + "] rollback");
-          }
+          log.log(Level.DEBUG, "Jta Txn [{0}] rollback", transaction.getId());
           transaction.postRollback(null);
           // Remove this transaction object as it is completed
           transactionManager.scope().clearExternal();
           break;
 
         default:
-          if (log.isDebugEnabled()) {
-            log.debug("Jta Txn [" + transaction.getId() + "] status:" + status);
-          }
+          log.log(Level.DEBUG, "Jta Txn [{0}] status:{1}", transaction.getId(), status);
       }
 
       // No matter the completion status of the transaction, we release the connection we got from the pool.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index 51f3ece39..b1a3ee4f8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -10,8 +10,8 @@ import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
-import org.slf4j.Logger;
 
+import java.lang.System.Logger.Level;
 import java.util.List;
 import java.util.Set;
 
@@ -23,7 +23,7 @@ import java.util.Set;
  */
 final class PostCommitProcessing {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final ClusterManager clusterManager;
   private final TransactionEvent event;
@@ -104,8 +104,8 @@ final class PostCommitProcessing {
   private void notifyCluster() {
     if (remoteTransactionEvent != null && !remoteTransactionEvent.isEmpty()) {
       // send the interesting events to the cluster
-      if (log.isDebugEnabled()) {
-        log.debug("Cluster Send: {}", remoteTransactionEvent);
+      if (log.isLoggable(Level.DEBUG)) {
+        log.log(Level.DEBUG, "Cluster Send: {0}", remoteTransactionEvent);
       }
       clusterManager.broadcast(remoteTransactionEvent);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
index d3793a8e4..c1ba2e773 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
@@ -1,12 +1,12 @@
 package io.ebeaninternal.server.transaction;
 
+import io.avaje.applog.AppLog;
 import io.ebean.cache.QueryCacheEntry;
 import io.ebean.cache.QueryCacheEntryValidate;
 import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public final class TableModState implements QueryCacheEntryValidate, ServerCacheNotify {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.cache.TABLEMOD");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.cache.TABLEMOD");
 
   private final Map<String, Long> tableModStamp = new ConcurrentHashMap<>();
 
@@ -34,8 +34,8 @@ public final class TableModState implements QueryCacheEntryValidate, ServerCache
     for (String tableName : touchedTables) {
       tableModStamp.put(tableName, modNanoTime);
     }
-    if (log.isDebugEnabled()) {
-      log.debug("TableModState updated - touched:{} modNanoTime:{}", touchedTables, modNanoTime);
+    if (log.isLoggable(Level.DEBUG)) {
+      log.log(Level.DEBUG, "TableModState updated - touched:{0} modNanoTime:{1}", touchedTables, modNanoTime);
     }
   }
 
@@ -46,8 +46,8 @@ public final class TableModState implements QueryCacheEntryValidate, ServerCache
     for (String tableName : tables) {
       Long modTime = tableModStamp.get(tableName);
       if (modTime != null && modTime >= sinceNanoTime) {
-        if (log.isTraceEnabled()) {
-          log.trace("Invalidate on table:{}", tableName);
+        if (log.isLoggable(Level.TRACE)) {
+          log.log(Level.TRACE, "Invalidate on table:{0}", tableName);
         }
         return false;
       }
@@ -68,15 +68,13 @@ public final class TableModState implements QueryCacheEntryValidate, ServerCache
    * Update the table modification timestamps based on remote table modification events.
    * <p>
    * Generally this is used with distributed caches (Hazelcast, Ignite etc) via topic.
-   * </p>
    */
   @Override
   public void notify(ServerCacheNotification notification) {
-
     // use local clock - for slightly more aggressive invalidation (as later)
     // that removes any concern regarding clock syncing across cluster
-    if (log.isDebugEnabled()) {
-      log.debug("ServerCacheNotification:{}", notification);
+    if (log.isLoggable(Level.DEBUG)) {
+      log.log(Level.DEBUG, "ServerCacheNotification:{0}", notification);
     }
     touch(notification.getDependentTables());
   }
@@ -85,14 +83,12 @@ public final class TableModState implements QueryCacheEntryValidate, ServerCache
    * Update from Remote transaction event.
    * <p>
    * Generally this is used with Clustering (ebean-cluster, k8scache).
-   * </p>
    */
   public void notify(RemoteTableMod tableMod) {
-
     // use local clock - for slightly more aggressive invalidation (as later)
     // that removes any concern regarding clock syncing across cluster
-    if (log.isDebugEnabled()) {
-      log.debug("RemoteTableMod:{}", tableMod);
+    if (log.isLoggable(Level.DEBUG)) {
+      log.log(Level.DEBUG, "RemoteTableMod:{0}", tableMod);
     }
     touch(tableMod.getTables());
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 381ecea41..ace9d4f77 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.transaction;
 
+import io.avaje.applog.AppLog;
 import io.ebean.BackgroundExecutor;
 import io.ebean.ProfileLocation;
 import io.ebean.TxScope;
@@ -28,11 +29,10 @@ import io.ebeaninternal.server.profile.TimedProfileLocationRegistry;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
+import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -47,8 +47,8 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class TransactionManager implements SpiTransactionManager {
 
-  private static final Logger log = CoreLog.log;
-  private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster");
+  private static final System.Logger log = CoreLog.log;
+  private static final System.Logger clusterLogger = AppLog.getLogger("io.ebean.Cluster");
 
   private final SpiServer server;
   private final BeanDescriptorManager beanDescriptorManager;
@@ -365,7 +365,7 @@ public class TransactionManager implements SpiTransactionManager {
         txnLogger.debug(msg);
       }
     } catch (Exception ex) {
-      log.error("Error while notifying TransactionEventListener of rollback event", ex);
+      log.log(Level.ERROR, "Error while notifying TransactionEventListener of rollback event", ex);
     }
   }
 
@@ -416,7 +416,7 @@ public class TransactionManager implements SpiTransactionManager {
       postCommit.notifyLocalCache();
       backgroundExecutor.execute(postCommit.backgroundNotify());
     } catch (Exception ex) {
-      log.error("NotifyOfCommit failed. L2 Cache potentially not notified.", ex);
+      log.log(Level.ERROR, "NotifyOfCommit failed. L2 Cache potentially not notified.", ex);
     }
   }
 
@@ -442,8 +442,8 @@ public class TransactionManager implements SpiTransactionManager {
    * Notify local BeanPersistListeners etc of events from another server in the cluster.
    */
   public final void remoteTransactionEvent(RemoteTransactionEvent remoteEvent) {
-    if (clusterLogger.isDebugEnabled()) {
-      clusterLogger.debug("processing {}", remoteEvent);
+    if (clusterLogger.isLoggable(Level.DEBUG)) {
+      clusterLogger.log(Level.DEBUG, "processing {0}", remoteEvent);
     }
     CacheChangeSet changeSet = new CacheChangeSet();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
index ab17244e4..a33494277 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
@@ -4,18 +4,10 @@ import io.ebean.core.type.DataBinder;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
+import java.io.*;
+import java.lang.System.Logger.Level;
 import java.math.BigDecimal;
-import java.sql.Array;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Time;
-import java.sql.Timestamp;
+import java.sql.*;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -109,7 +101,7 @@ public class DataBind implements DataBinder {
         try {
           inputStream.close();
         } catch (IOException e) {
-          CoreLog.log.warn("Error closing InputStream that was bound to PreparedStatement", e);
+          CoreLog.log.log(Level.WARNING, "Error closing InputStream that was bound to PreparedStatement", e);
         }
       }
       inputStreams = null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 165d86c5a..c44670c73 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -25,11 +25,11 @@ import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 import org.joda.time.LocalTime;
-import org.slf4j.Logger;
 
 import javax.persistence.AttributeConverter;
 import javax.persistence.EnumType;
 import java.io.File;
+import java.lang.System.Logger.Level;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -52,7 +52,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public final class DefaultTypeManager implements TypeManager {
 
-  private static final Logger log = CoreLog.internal;
+  private static final System.Logger log = CoreLog.internal;
 
   private final ConcurrentHashMap<Class<?>, ScalarType<?>> typeMap;
   private final ConcurrentHashMap<Integer, ScalarType<?>> nativeMap;
@@ -194,7 +194,6 @@ public final class DefaultTypeManager implements TypeManager {
       ExtraTypeFactory plugin = iterator.next();
       List<? extends ScalarType<?>> types = plugin.createTypes(config, objectMapper);
       for (ScalarType<?> type : types) {
-        log.debug("adding ScalarType {}", type.getClass());
         add(type);
       }
     }
@@ -220,10 +219,10 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private void logAdd(ScalarType<?> scalarType) {
-    if (log.isTraceEnabled()) {
+    if (log.isLoggable(Level.TRACE)) {
       String msg = "ScalarType register [" + scalarType.getClass().getName() + "]";
       msg += " for [" + scalarType.getType().getName() + "]";
-      log.trace(msg);
+      log.log(Level.TRACE, msg);
     }
   }
 
@@ -676,7 +675,7 @@ public final class DefaultTypeManager implements TypeManager {
         }
         add(scalarType);
       } catch (Exception e) {
-        log.error("Error loading ScalarType [" + cls.getName() + "]", e);
+        log.log(Level.ERROR, "Error loading ScalarType [" + cls.getName() + "]", e);
       }
     }
   }
@@ -707,10 +706,10 @@ public final class DefaultTypeManager implements TypeManager {
         }
         ScalarTypeConverter converter = foundType.getDeclaredConstructor().newInstance();
         ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, converter);
-        log.debug("Register ScalarTypeWrapper from {} -> {} using:{}", logicalType, persistType, foundType);
+        log.log(Level.DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
         add(stw);
       } catch (Exception e) {
-        log.error("Error registering ScalarTypeConverter [" + foundType.getName() + "]", e);
+        log.log(Level.ERROR, "Error registering ScalarTypeConverter [" + foundType.getName() + "]", e);
       }
     }
   }
@@ -731,10 +730,10 @@ public final class DefaultTypeManager implements TypeManager {
         }
         AttributeConverter converter = foundType.getDeclaredConstructor().newInstance();
         ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, new AttributeConverterAdapter(converter));
-        log.debug("Register ScalarTypeWrapper from {} -> {} using:{}", logicalType, persistType, foundType);
+        log.log(Level.DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
         add(stw);
       } catch (Exception e) {
-        log.error("Error registering AttributeConverter [" + foundType.getName() + "]", e);
+        log.log(Level.ERROR, "Error registering AttributeConverter [" + foundType.getName() + "]", e);
       }
     }
   }
@@ -744,7 +743,6 @@ public final class DefaultTypeManager implements TypeManager {
    */
   private void initialiseJacksonTypes(DatabaseConfig config) {
     if (objectMapper != null) {
-      log.trace("Registering JsonNode type support");
       ObjectMapper mapper = (ObjectMapper) objectMapper;
       jsonNodeClob = new ScalarTypeJsonNode.Clob(mapper);
       jsonNodeBlob = new ScalarTypeJsonNode.Blob(mapper);
@@ -807,7 +805,7 @@ public final class DefaultTypeManager implements TypeManager {
     // detect if Joda classes are in the classpath
     if (config.getClassLoadConfig().isJodaTimePresent()) {
       // Joda classes are in the classpath so register the types
-      log.debug("Registering Joda data types");
+      log.log(Level.DEBUG, "Registering Joda data types");
       addType(LocalDateTime.class, new ScalarTypeJodaLocalDateTime(jsonDateTime));
       addType(DateTime.class, new ScalarTypeJodaDateTime(jsonDateTime));
       if (config.getDatabasePlatform().supportsNativeJavaTime()) {
@@ -822,11 +820,9 @@ public final class DefaultTypeManager implements TypeManager {
       if ("normal".equalsIgnoreCase(jodaLocalTimeMode)) {
         // use the expected/normal local time zone
         addType(LocalTime.class, new ScalarTypeJodaLocalTime());
-        log.debug("registered ScalarTypeJodaLocalTime");
       } else if ("utc".equalsIgnoreCase(jodaLocalTimeMode)) {
         // use the old UTC based
         addType(LocalTime.class, new ScalarTypeJodaLocalTimeUTC());
-        log.debug("registered ScalarTypeJodaLocalTimeUTC");
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
index be712b659..cddd89231 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
@@ -9,6 +9,7 @@ import io.ebean.text.TextException;
 import io.ebeaninternal.api.CoreLog;
 
 import java.io.*;
+import java.lang.System.Logger.Level;
 import java.sql.SQLException;
 import java.sql.Types;
 
@@ -169,14 +170,14 @@ final class ScalarTypeFile extends ScalarTypeBase<File> {
         try {
           output.close();
         } catch (IOException e) {
-          CoreLog.log.error("Error when closing outputstream", e);
+          CoreLog.log.log(Level.ERROR, "Error when closing outputStream", e);
         }
       }
       if (input != null) {
         try {
           input.close();
         } catch (IOException e) {
-          CoreLog.log.error("Error when closing inputstream ", e);
+          CoreLog.log.log(Level.ERROR, "Error when closing inputStream ", e);
         }
       }
     }
diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java
index a0462e27b..7511a8d0b 100644
--- a/ebean-core/src/main/java/module-info.java
+++ b/ebean-core/src/main/java/module-info.java
@@ -27,7 +27,6 @@ module io.ebean.core {
   requires io.avaje.classpath.scanner.api;
   requires io.avaje.classpath.scanner;
   requires io.ebean.types;
-  requires org.slf4j;
 
   requires static io.avaje.jsr305x;
   requires static com.fasterxml.jackson.annotation;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 74ae5a64c..e91a067f4 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration;
 
+import io.avaje.applog.AppLog;
 import io.ebean.annotation.Platform;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -11,11 +12,10 @@ import io.ebeaninternal.api.SpiDdlGenerator;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.model.CurrentModel;
 import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import java.io.*;
+import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 
@@ -27,7 +27,7 @@ import java.sql.SQLException;
  */
 public class DdlGenerator implements SpiDdlGenerator {
 
-  private static final Logger log = LoggerFactory.getLogger(DdlGenerator.class);
+  private static final System.Logger log = AppLog.getLogger(DdlGenerator.class);
   private static final String[] BUILD_DIRS = {"target", "build"};
 
   private final SpiEbeanServer server;
@@ -60,7 +60,7 @@ public class DdlGenerator implements SpiDdlGenerator {
     this.platform = databasePlatform.getPlatform();
     this.platformName = platform.base().name();
     if (!config.getTenantMode().isDdlEnabled() && config.isDdlRun()) {
-      log.warn("DDL can't be run on startup with TenantMode " + config.getTenantMode());
+      log.log(Level.WARNING, "DDL can't be run on startup with TenantMode " + config.getTenantMode());
       this.runDdl = false;
       this.useMigrationStoredProcedures = false;
     } else {
@@ -224,7 +224,7 @@ public class DdlGenerator implements SpiDdlGenerator {
     if (sqlScript != null) {
       try (InputStream is = getClassLoader().getResourceAsStream(sqlScript)) {
         if (is == null) {
-          log.warn("sql script {} was not found as a resource", sqlScript);
+          log.log(Level.WARNING, "sql script {0} was not found as a resource", sqlScript);
         } else {
           String content = readContent(IOUtils.newReader(is)); // 'is' is closed
           runScript(connection, false, content, sqlScript);
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index ed592e9d2..9f9384d0d 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration;
 
+import io.avaje.applog.AppLog;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.annotation.Platform;
@@ -21,12 +22,11 @@ import io.ebeaninternal.dbmigration.model.*;
 import io.ebeaninternal.extraddl.model.DdlScript;
 import io.ebeaninternal.extraddl.model.ExtraDdl;
 import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
+import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -57,7 +57,7 @@ import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
  */
 public class DefaultDbMigration implements DbMigration {
 
-  protected static final Logger logger = LoggerFactory.getLogger("io.ebean.GenerateMigration");
+  protected static final System.Logger logger = AppLog.getLogger("io.ebean.GenerateMigration");
   private static final String initialVersion = "1.0";
   private static final String GENERATED_COMMENT = "THIS IS A GENERATED FILE - DO NOT MODIFY";
 
@@ -402,7 +402,7 @@ public class DefaultDbMigration implements DbMigration {
    */
   private void writeExtraDdl(File migrationDir, DdlScript script) throws IOException {
     String fullName = repeatableMigrationName(script.isInit(), script.getName());
-    logger.debug("writing repeatable script {}", fullName);
+    logger.log(Level.DEBUG, "writing repeatable script {0}", fullName);
     File file = new File(migrationDir, fullName);
     try (Writer writer = IOUtils.newWriter(file)) {
       writer.write(script.getValue());
@@ -419,7 +419,7 @@ public class DefaultDbMigration implements DbMigration {
     if (logToSystemOut) {
       System.out.println("DbMigration> " + message);
     } else {
-      logger.error(message);
+      logger.log(Level.ERROR, message);
     }
   }
 
@@ -430,7 +430,7 @@ public class DefaultDbMigration implements DbMigration {
     if (logToSystemOut) {
       System.out.println("DbMigration> " + message);
     } else {
-      logger.info(message);
+      logger.log(Level.INFO, message);
     }
   }
 
@@ -792,7 +792,7 @@ public class DefaultDbMigration implements DbMigration {
       case SQLSERVER:
         throw new IllegalArgumentException("Please choose the more specific SQLSERVER16 or SQLSERVER17 platform. Refer to issue #1340 for details");
       case DB2:
-        logger.warn("Using DB2LegacyPlatform. It is recommended to migrate to db2luw/db2zos/db2fori. Refer to issue #2514 for details");
+        logger.log(Level.WARNING, "Using DB2LegacyPlatform. It is recommended to migrate to db2luw/db2zos/db2fori. Refer to issue #2514 for details");
       case GENERIC:
         return new DatabasePlatform();
       default:
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
index 4350bdc83..83b41a4fc 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java
@@ -1,16 +1,16 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.avaje.applog.AppLog;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
 import io.ebeaninternal.dbmigration.migration.*;
 import io.ebeaninternal.server.deploy.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
 import static io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns.split;
 import static io.ebeaninternal.dbmigration.model.MTableIdentity.fromCreateTable;
 import static io.ebeaninternal.dbmigration.model.MTableIdentity.toCreateTable;
+import static java.lang.System.Logger.Level.TRACE;
 
 /**
  * Holds the logical model for a given Table and everything associated to it.
@@ -26,7 +26,7 @@ import static io.ebeaninternal.dbmigration.model.MTableIdentity.toCreateTable;
  */
 public class MTable {
 
-  private static final Logger logger = LoggerFactory.getLogger(MTable.class);
+  private static final System.Logger logger = AppLog.getLogger(MTable.class);
 
   private String name;
   private MTable draftTable;
@@ -298,7 +298,7 @@ public class MTable {
         diffDropColumn(modelDiff, existingColumn);
       } else if (newColumn.isDraftOnly() && !draft) {
         // effectively a drop column (draft only column on a non-draft table)
-        logger.trace("... drop column {} from table {} as now draftOnly", newColumn.getName(), name);
+        logger.log(TRACE, "... drop column {0} from table {1} as now draftOnly", newColumn.getName(), name);
         diffDropColumn(modelDiff, existingColumn);
       }
     }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
index 9c49ad0aa..e949b17de 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
@@ -1,11 +1,10 @@
 package io.ebeaninternal.dbmigration.model;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import io.avaje.applog.AppLog;
 import io.ebean.migration.MigrationVersion;
 
 import java.io.File;
+import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -15,7 +14,7 @@ import java.util.List;
  */
 public class MigrationModel {
 
-  private static final Logger logger = LoggerFactory.getLogger(MigrationModel.class);
+  private static final System.Logger logger = AppLog.getLogger(MigrationModel.class);
 
   private final ModelContainer model = new ModelContainer();
   private final File modelDirectory;
@@ -53,7 +52,7 @@ public class MigrationModel {
 
     if (!initMigration) {
       for (MigrationResource migrationResource : resources) {
-        logger.debug("read {}", migrationResource);
+        logger.log(Level.DEBUG, "read {0}", migrationResource);
         model.apply(migrationResource.read(), migrationResource.version());
       }
     }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
index 83de7e459..00df18cf8 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.avaje.applog.AppLog;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.util.IOUtils;
@@ -10,12 +11,11 @@ import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.ChangeSetType;
 import io.ebeaninternal.dbmigration.migration.Migration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
+import java.lang.System.Logger.Level;
 import java.util.List;
 
 /**
@@ -23,7 +23,7 @@ import java.util.List;
  */
 public class PlatformDdlWriter {
 
-  private static final Logger logger = LoggerFactory.getLogger(PlatformDdlWriter.class);
+  private static final System.Logger logger = AppLog.getLogger(PlatformDdlWriter.class);
 
   private final DatabaseConfig databaseConfig;
   private final PlatformDdl platformDdl;
@@ -107,7 +107,7 @@ public class PlatformDdlWriter {
     File subPath = new File(path, suffix);
     if (!subPath.exists()) {
       if (!subPath.mkdirs()) {
-        logger.error("failed to create directories for " + subPath.getAbsolutePath());
+        logger.log(Level.ERROR, "failed to create directories for " + subPath.getAbsolutePath());
       }
     }
     return subPath;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index eac6284d5..379e33bd7 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -1,14 +1,14 @@
 package io.ebeaninternal.extraddl.model;
 
+import io.avaje.applog.AppLog;
 import io.ebean.annotation.Platform;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.System.Logger.Level;
 
 import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
 
@@ -17,7 +17,7 @@ import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
  */
 public class ExtraDdlXmlReader {
 
-  private static final Logger logger = LoggerFactory.getLogger(ExtraDdlXmlReader.class);
+  private static final System.Logger logger = AppLog.getLogger(ExtraDdlXmlReader.class);
 
   /**
    * Return the combined extra DDL that should be run given the platform name.
@@ -42,7 +42,7 @@ public class ExtraDdlXmlReader {
     StringBuilder sb = new StringBuilder(300);
     for (DdlScript script : read.getDdlScript()) {
       if (script.isDrop() == drops && matchPlatform(platform, script.getPlatforms())) {
-        logger.debug("include script {}", script.getName());
+        logger.log(Level.DEBUG, "include script {}", script.getName());
         String value = script.getValue();
         sb.append(value);
         if (value.lastIndexOf(';') == -1) {
diff --git a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
index 22b03d983..a52377423 100644
--- a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
@@ -1,24 +1,24 @@
 package io.localtest;
 
+import io.avaje.applog.AppLog;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiEbeanServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.sql.Types;
 
 public abstract class BaseTestCase {
 
-  protected static Logger logger = LoggerFactory.getLogger(BaseTestCase.class);
+  protected static System.Logger logger = AppLog.getLogger(BaseTestCase.class);
 
   /**
    * this is the clock delta that may occur between testing machine and db server.
    * If the clock delta of DB server is in future, an "asOf" query may not find the
    * correct entry.
-   *
+   * <p>
    * Note: That some tests may use a Thread.sleep to wait, so that the local system clock
    * can catch up. So don't set that to a too high value.
    */
@@ -35,7 +35,7 @@ public abstract class BaseTestCase {
       // First try, if we get the default server. If this fails, all tests will fail.
       DB.getDefault();
     } catch (Throwable e) {
-      logger.error("Fatal error while getting ebean-server. Exiting...", e);
+      logger.log(Level.ERROR, "Fatal error while getting ebean-server. Exiting...", e);
       System.exit(1);
     }
   }
@@ -47,7 +47,7 @@ public abstract class BaseTestCase {
   public boolean isSqlServer() {
     return Platform.SQLSERVER == platform();
   }
-  
+
   public boolean isDB2() {
     return Platform.DB2 == platform();
   }
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 0973886bc..5a5bf08f1 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -18,13 +18,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.33</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
diff --git a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/InternalConfigXmlRead.java b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/InternalConfigXmlRead.java
index 7880b10ae..19ebdfa09 100644
--- a/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/InternalConfigXmlRead.java
+++ b/ebean-externalmapping-xml/src/main/java/io/ebeaninternal/xmlmapping/InternalConfigXmlRead.java
@@ -4,8 +4,6 @@ import io.avaje.classpath.scanner.ClassPathScanner;
 import io.avaje.classpath.scanner.ClassPathScannerFactory;
 import io.avaje.classpath.scanner.Resource;
 import io.ebeaninternal.xmapping.api.XmapEbean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,8 +14,6 @@ import java.util.ServiceLoader;
  */
 class InternalConfigXmlRead {
 
-  private static final Logger log = LoggerFactory.getLogger(InternalConfigXmlRead.class);
-
   private final ToXmapEbean to = new ToXmapEbean();
   private final ClassLoader classLoader;
   private final List<String> mappingLocations;
@@ -40,7 +36,6 @@ class InternalConfigXmlRead {
   private List<Resource> xmlMappingResources() {
     List<ClassPathScanner> scanners = scanners();
     List<Resource> resourceList = new ArrayList<>();
-    long st = System.currentTimeMillis();
     if (mappingLocations != null && !mappingLocations.isEmpty()) {
       for (ClassPathScanner finder : scanners) {
         for (String mappingLocation : mappingLocations) {
@@ -48,8 +43,6 @@ class InternalConfigXmlRead {
         }
       }
     }
-    long searchTime = System.currentTimeMillis() - st;
-    log.debug("Classpath search mappings[{}] searchTime[{}]", resourceList.size(), searchTime);
     return resourceList;
   }
 
diff --git a/ebean-externalmapping-xml/src/main/java/module-info.java b/ebean-externalmapping-xml/src/main/java/module-info.java
index de792b2df..420f85c53 100644
--- a/ebean-externalmapping-xml/src/main/java/module-info.java
+++ b/ebean-externalmapping-xml/src/main/java/module-info.java
@@ -14,7 +14,6 @@ module io.ebean.xmapping.xml {
   requires transitive java.xml.bind;
   requires io.avaje.classpath.scanner.api;
   requires io.avaje.classpath.scanner;
-  requires static org.slf4j;
   requires static java.sql; // for testing
 
   uses ClassPathScannerFactory;
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 5e00d8e38..493d5d33b 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -54,14 +54,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- expected to be provided -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.33</version>
-      <scope>provided</scope>
-    </dependency>
-
     <!-- optionally use geolatte-geom -->
     <dependency>
       <groupId>org.geolatte</groupId>
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
index 83633aaeb..a934b8411 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
@@ -1,5 +1,6 @@
 package io.ebean.redis;
 
+import io.avaje.applog.AppLog;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheConfig;
 import io.ebean.cache.ServerCacheOptions;
@@ -11,19 +12,20 @@ import io.ebean.metric.TimedMetric;
 import io.ebean.metric.TimedMetricStats;
 import io.ebean.redis.encode.Encode;
 import io.ebean.redis.encode.EncodePrefixKey;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import redis.clients.jedis.*;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.Transaction;
 import redis.clients.jedis.params.ScanParams;
 import redis.clients.jedis.params.SetParams;
 import redis.clients.jedis.resps.ScanResult;
 import redis.clients.jedis.util.SafeEncoder;
 
+import java.lang.System.Logger.Level;
 import java.util.*;
 
 final class RedisCache implements ServerCache {
 
-  private static final Logger log = LoggerFactory.getLogger(RedisCache.class);
+  private static final System.Logger log = AppLog.getLogger(RedisCache.class);
 
   private static final String CURSOR_0 = "0";
   private static final byte[] CURSOR_0_BYTES = SafeEncoder.encode(CURSOR_0);
@@ -67,7 +69,7 @@ final class RedisCache implements ServerCache {
     if (cacheOptions != null) {
       final int maxSecsToLive = cacheOptions.getMaxSecsToLive();
       if (maxSecsToLive > 0) {
-        return new SetParams().ex((long)maxSecsToLive);
+        return new SetParams().ex((long) maxSecsToLive);
       }
     }
     return null;
@@ -104,17 +106,17 @@ final class RedisCache implements ServerCache {
       }
       return valueEncode.decode(data);
     } catch (Exception e) {
-      log.error("Error decoding data, treated as cache miss", e);
+      log.log(Level.ERROR, "Error decoding data, treated as cache miss", e);
       return null;
     }
   }
 
   private void errorOnRead(Exception e) {
-    log.warn("Error when reading redis cache", e);
+    log.log(Level.WARNING, "Error when reading redis cache", e);
   }
 
   private void errorOnWrite(Exception e) {
-    log.warn("Error when writing redis cache", e);
+    log.log(Level.WARNING, "Error when writing redis cache", e);
   }
 
   @Override
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
index 3b08ef21f..4dd991c05 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
@@ -1,11 +1,8 @@
 package io.ebean.redis;
 
+import io.avaje.applog.AppLog;
 import io.ebean.BackgroundExecutor;
-import io.ebean.cache.ServerCache;
-import io.ebean.cache.ServerCacheConfig;
-import io.ebean.cache.ServerCacheFactory;
-import io.ebean.cache.ServerCacheNotification;
-import io.ebean.cache.ServerCacheNotify;
+import io.ebean.cache.*;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.metric.MetricFactory;
@@ -18,18 +15,13 @@ import io.ebean.redis.topic.DaemonTopicRunner;
 import io.ebeaninternal.server.cache.DefaultServerCache;
 import io.ebeaninternal.server.cache.DefaultServerCacheConfig;
 import io.ebeaninternal.server.cache.DefaultServerQueryCache;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import redis.clients.jedis.BinaryJedisPubSub;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.util.SafeEncoder;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.io.*;
+import java.lang.System.Logger.Level;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -41,11 +33,11 @@ import static java.util.Arrays.asList;
 
 final class RedisCacheFactory implements ServerCacheFactory {
 
-  private static final Logger log = LoggerFactory.getLogger(RedisCacheFactory.class);
+  private static final System.Logger log = AppLog.getLogger(RedisCacheFactory.class);
 
-  private static final Logger queryLogger = LoggerFactory.getLogger("io.ebean.cache.QUERY");
-  private static final Logger logger = LoggerFactory.getLogger("io.ebean.cache.CACHE");
-  private static final Logger tableModLogger = LoggerFactory.getLogger("io.ebean.cache.TABLEMODS");
+  private static final System.Logger queryLogger = AppLog.getLogger("io.ebean.cache.QUERY");
+  private static final System.Logger logger = AppLog.getLogger("io.ebean.cache.CACHE");
+  private static final System.Logger tableModLogger = AppLog.getLogger("io.ebean.cache.TABLEMODS");
 
   private static final int MSG_NEARCACHE_CLEAR = 1;
   private static final int MSG_NEARCACHE_KEYS = 2;
@@ -113,7 +105,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
       redisConfig = new RedisConfig();
     }
     redisConfig.loadProperties(config.getProperties());
-    log.info("using l2cache redis host {}:{}", redisConfig.getServer(), redisConfig.getPort());
+    log.log(Level.INFO, "using l2cache redis host {0}:{1}", redisConfig.getServer(), redisConfig.getPort());
     return redisConfig.createPool();
   }
 
@@ -168,7 +160,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
     try {
       RQueryCache cache = queryCaches.get(config.getCacheKey());
       if (cache == null) {
-        logger.debug("create query cache [{}]", config.getCacheKey());
+        logger.log(Level.DEBUG, "create query cache [{0}]", config.getCacheKey());
         cache = new RQueryCache(new DefaultServerCacheConfig(config));
         cache.periodicTrim(executor);
         queryCaches.put(config.getCacheKey(), cache);
@@ -222,7 +214,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
      * Process the invalidation message coming from the cluster.
      */
     private void invalidate() {
-      queryLogger.debug("   CLEAR {}(*) - cluster invalidate", name);
+      queryLogger.log(Level.DEBUG, "   CLEAR {0}(*) - cluster invalidate", name);
       super.clear();
     }
   }
@@ -241,8 +233,8 @@ final class RedisCacheFactory implements ServerCacheFactory {
           msg.append(table).append(",");
         }
         String formattedMsg = msg.toString();
-        if (tableModLogger.isDebugEnabled()) {
-          tableModLogger.debug("Publish TableMods - {}", formattedMsg);
+        if (tableModLogger.isLoggable(Level.DEBUG)) {
+          tableModLogger.log(Level.DEBUG, "Publish TableMods - {0}", formattedMsg);
         }
         sendTableMod(formattedMsg);
       }
@@ -270,8 +262,8 @@ final class RedisCacheFactory implements ServerCacheFactory {
   private void processTableNotify(String rawMessage) {
     long nanos = System.nanoTime();
     try {
-      if (logger.isDebugEnabled()) {
-        logger.debug("processTableNotify {}", rawMessage);
+      if (logger.isLoggable(Level.DEBUG)) {
+        logger.log(Level.DEBUG, "processTableNotify {0}", rawMessage);
       }
       Set<String> tables = new HashSet<>(asList(rawMessage.split(",")));
       listener.notify(new ServerCacheNotification(tables));
@@ -290,7 +282,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
       try {
         sendMessage(messageInvalidateKeys(cacheKey, keySet));
       } catch (IOException e) {
-        logger.error("failed to transmit invalidateKeys() message", e);
+        logger.log(Level.ERROR, "failed to transmit invalidateKeys() message", e);
       }
     }
 
@@ -299,7 +291,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
       try {
         sendMessage(messageInvalidateKey(cacheKey, id));
       } catch (IOException e) {
-        logger.error("failed to transmit invalidateKeys() message", e);
+        logger.log(Level.ERROR, "failed to transmit invalidateKeys() message", e);
       }
     }
 
@@ -308,7 +300,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
       try {
         sendMessage(messageInvalidateClear(cacheKey));
       } catch (IOException e) {
-        logger.error("failed to transmit invalidateKeys() message", e);
+        logger.log(Level.ERROR, "failed to transmit invalidateKeys() message", e);
       }
     }
 
@@ -372,7 +364,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
 
     @Override
     public void notifyConnected() {
-      logger.info("Established connection to Redis");
+      logger.log(Level.INFO, "Established connection to Redis");
     }
 
     /**
@@ -403,8 +395,8 @@ final class RedisCacheFactory implements ServerCacheFactory {
           }
           msgType = oi.readInt();
           cacheKey = oi.readUTF();
-          if (logger.isDebugEnabled()) {
-            logger.debug("processNearCacheMessage serverId:{} type:{} cacheKey:{}", sourceServerId, msgType, cacheKey);
+          if (logger.isLoggable(Level.DEBUG)) {
+            logger.log(Level.DEBUG, "processNearCacheMessage serverId:{0} type:{1} cacheKey:{2}", sourceServerId, msgType, cacheKey);
           }
 
           switch (msgType) {
@@ -431,7 +423,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
           }
 
         } catch (IOException | ClassNotFoundException e) {
-          logger.error("failed to decode near cache message [" + SafeEncoder.encode(message) + "] for cache:" + cacheKey, e);
+          logger.log(Level.ERROR, "failed to decode near cache message [" + SafeEncoder.encode(message) + "] for cache:" + cacheKey, e);
           if (cacheKey != null) {
             nearCacheInvalidateClear(cacheKey);
           }
@@ -457,10 +449,10 @@ final class RedisCacheFactory implements ServerCacheFactory {
               queryCacheInvalidate(split[2]);
               break;
             default:
-              logger.error("Unknown L2 message type[{}] on redis channel - message[{}] ", split[0], message);
+              logger.log(Level.ERROR, "Unknown L2 message type[{0}] on redis channel - message[{1}] ", split[0], message);
           }
         } catch (Exception e) {
-          logger.error("Error handling L2 message[" + message + "]", e);
+          logger.log(Level.ERROR, "Error handling L2 message[" + message + "]", e);
         }
       }
     }
@@ -503,7 +495,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
   }
 
   private void warnNearCacheNotFound(String cacheKey) {
-    logger.warn("No near cache found for cacheKey [" + cacheKey + "] yet - probably on startup");
+    logger.log(Level.WARNING, "No near cache found for cacheKey [" + cacheKey + "] yet - probably on startup");
   }
 
 }
diff --git a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
index a6b682bce..1eab91402 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
@@ -1,11 +1,11 @@
 package io.ebean.redis.topic;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.avaje.applog.AppLog;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.exceptions.JedisException;
 
+import java.lang.System.Logger.Level;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -18,7 +18,7 @@ import java.util.TimerTask;
  */
 public final class DaemonTopicRunner {
 
-  private static final Logger log = LoggerFactory.getLogger(DaemonTopicRunner.class);
+  private static final System.Logger log = AppLog.getLogger(DaemonTopicRunner.class);
 
   private static final long reconnectWaitMillis = 1000;
 
@@ -49,13 +49,13 @@ public final class DaemonTopicRunner {
       try {
         subscribe();
       } catch (JedisException e) {
-        log.debug("... redis subscribe connection attempt:{} failed:{}", attempts, e.getMessage());
+        log.log(Level.DEBUG, "... redis subscribe connection attempt:{0} failed:{1}", attempts, e.getMessage());
         try {
           // wait a little before retrying
           Thread.sleep(reconnectWaitMillis);
         } catch (InterruptedException e1) {
           Thread.currentThread().interrupt();
-          log.warn("Interrupted redis re-connection wait", e1);
+          log.log(Level.WARNING, "Interrupted redis re-connection wait", e1);
         }
       }
     }
@@ -70,13 +70,13 @@ public final class DaemonTopicRunner {
     try {
       daemonTopic.subscribe(jedis);
     } catch (Exception e) {
-      log.error("Lost connection to topic, starting re-connection loop", e);
+      log.log(Level.ERROR, "Lost connection to topic, starting re-connection loop", e);
       attemptConnections();
     } finally {
       try {
         jedis.close();
       } catch (Exception e) {
-        log.warn("Error closing probably broken Redis connection", e);
+        log.log(Level.WARNING, "Error closing probably broken Redis connection", e);
       }
     }
   }
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 068a8b705..73ac74db4 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -14,10 +14,9 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.32</version>
-      <scope>provided</scope>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-applog</artifactId>
+      <version>1.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java b/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java
index aecc77026..71822c136 100644
--- a/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java
+++ b/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java
@@ -1,9 +1,10 @@
 package io.ebean.test;
 
+import io.avaje.applog.AppLog;
 import io.ebeaninternal.api.SpiLogger;
 import io.ebeaninternal.api.SpiLoggerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.lang.System.Logger.Level;
 
 /**
  * Create a logger that captures the SQL and register it for later access in tests.
@@ -15,7 +16,7 @@ public class CapturingLoggerFactory implements SpiLoggerFactory {
 
   @Override
   public SpiLogger create(String name) {
-    SpiLogger logger = new LogAdapter(LoggerFactory.getLogger(name));
+    SpiLogger logger = new LogAdapter(AppLog.getLogger(name));
     if (name.equals("io.ebean.SQL")) {
       return LoggedSql.register(logger);
     }
@@ -24,30 +25,30 @@ public class CapturingLoggerFactory implements SpiLoggerFactory {
 
   private static final class LogAdapter implements SpiLogger {
 
-    private final Logger logger;
+    private final System.Logger logger;
 
-    LogAdapter(Logger logger) {
+    LogAdapter(System.Logger logger) {
       this.logger = logger;
     }
 
     @Override
     public boolean isDebug() {
-      return logger.isDebugEnabled();
+      return logger.isLoggable(Level.DEBUG);
     }
 
     @Override
     public boolean isTrace() {
-      return logger.isTraceEnabled();
+      return logger.isLoggable(Level.TRACE);
     }
 
     @Override
     public void debug(String msg) {
-      logger.debug(msg);
+      logger.log(Level.DEBUG, msg);
     }
 
     @Override
     public void trace(String msg) {
-      logger.trace(msg);
+      logger.log(Level.TRACE, msg);
     }
   }
 }
diff --git a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
index fbe48318d..32d7df424 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
@@ -1,14 +1,14 @@
 package io.ebean.test.config;
 
+import io.avaje.applog.AppLog;
 import io.ebean.config.AutoConfigure;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.test.config.platform.PlatformAutoConfig;
 import io.ebean.test.config.provider.ProviderAutoConfig;
 import io.ebean.test.containers.DockerHost;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.util.Properties;
 
 /**
@@ -21,7 +21,7 @@ import java.util.Properties;
  */
 public class AutoConfigureForTesting implements AutoConfigure {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.test");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.test");
 
   /**
    * System property that can override the platform.  mvn clean test -Ddb=sqlserver
@@ -38,7 +38,7 @@ public class AutoConfigureForTesting implements AutoConfigure {
       io.avaje.config.Config.asConfiguration().evalModify(properties);
     }
     if (!config.isDefaultServer()) {
-      log.info("skip automatic testing config on non-default server name:{} register:{}", config.getName(), config.isRegister());
+      log.log(Level.INFO, "skip automatic testing config on non-default server name:{0} register:{1}", config.getName(), config.isRegister());
       return;
     }
     if (isExtraServer(config, properties)) {
@@ -46,7 +46,7 @@ public class AutoConfigureForTesting implements AutoConfigure {
       return;
     }
     String testPlatform = properties.getProperty("ebean.test.platform");
-    log.debug("automatic testing config - with ebean.test.platform:{} name:{} environmentDb:{}", testPlatform, config.getName(), environmentDb);
+    log.log(Level.DEBUG, "automatic testing config - with ebean.test.platform:{0} name:{1} environmentDb:{2}", testPlatform, config.getName(), environmentDb);
     if (RunOnceMarker.isRun()) {
       setupPlatform(environmentDb, config);
     }
diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java b/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java
index 44207a393..115a83107 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java
@@ -1,11 +1,11 @@
 package io.ebean.test.config.platform;
 
+import io.avaje.applog.AppLog;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.test.containers.DockerHost;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.util.Properties;
 
 /**
@@ -13,7 +13,7 @@ import java.util.Properties;
  */
 class Config {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.test");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.test");
 
   /**
    * Common optional docker parameters that we just transfer to docker properties.
@@ -193,7 +193,7 @@ class Config {
     ds.setDriver(driverClass);
     config.setDataSourceConfig(ds);
 
-    log.info("Using jdbc settings - username:{} url:{} driver:{}", ds.getUsername(), ds.getUrl(), ds.getDriver());
+    log.log(Level.INFO, "Using jdbc settings - username:{0} url:{1} driver:{2}", ds.getUsername(), ds.getUrl(), ds.getDriver());
 
     if (driverClass != null) {
       try {
diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java b/ebean-test/src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java
index 97ce65e38..f378f517c 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java
@@ -1,10 +1,10 @@
 package io.ebean.test.config.platform;
 
+import io.avaje.applog.AppLog;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.test.containers.ContainerFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -14,7 +14,7 @@ import static java.util.concurrent.CompletableFuture.runAsync;
 
 public class PlatformAutoConfig {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.test");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.test");
 
   /**
    * Known platforms we can setup locally or via docker container.
@@ -62,7 +62,7 @@ public class PlatformAutoConfig {
 
       Config config = new Config(db, platform, databaseName, this.config);
       platformSetup.setupExtraDbDataSource(config);
-      log.debug("configured dataSource for extraDb name:{} url:{}", db, this.config.getDataSourceConfig().getUrl());
+      log.log(Level.DEBUG, "configured dataSource for extraDb name:{0} url:{1}", db, this.config.getDataSourceConfig().getUrl());
     }
   }
 
@@ -92,9 +92,9 @@ public class PlatformAutoConfig {
     Properties dockerProperties = platformSetup.setup(config);
     if (!dockerProperties.isEmpty()) {
       if (isDebug()) {
-        log.info("Docker properties: {}", dockerProperties);
+        log.log(Level.INFO, "Docker properties: {0}", dockerProperties);
       } else {
-        log.debug("Docker properties: {}", dockerProperties);
+        log.log(Level.DEBUG, "Docker properties: {0}", dockerProperties);
       }
       // start the docker container with appropriate configuration
       new ContainerFactory(dockerProperties, config.getDockerPlatform()).startContainers();
@@ -130,7 +130,7 @@ public class PlatformAutoConfig {
     }
     this.platformSetup = KNOWN_PLATFORMS.get(platform);
     if (platformSetup == null) {
-      log.warn("unknown platform {} - skipping platform setup", platform);
+      log.log(Level.WARNING, "unknown platform {0} - skipping platform setup", platform);
     }
     return platformSetup != null;
   }
diff --git a/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java b/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java
index 21219ef65..48abb54cf 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java
@@ -1,12 +1,12 @@
 package io.ebean.test.config.provider;
 
+import io.avaje.applog.AppLog;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.CurrentUserProvider;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.EncryptKeyManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
+import java.lang.System.Logger.Level;
 import java.util.Properties;
 
 /**
@@ -14,7 +14,7 @@ import java.util.Properties;
  */
 public class ProviderAutoConfig {
 
-  private static final Logger log = LoggerFactory.getLogger("io.ebean.test");
+  private static final System.Logger log = AppLog.getLogger("io.ebean.test");
 
   private final DatabaseConfig config;
   private final Properties properties;
@@ -44,12 +44,12 @@ public class ProviderAutoConfig {
     if (keyManager == null) {
       // Must be 16 Chars for Oracle function
       String keyVal = properties.getProperty("ebean.test.encryptKey", "simple0123456789");
-      log.debug("for testing - using FixedEncryptKeyManager() keyVal:{}", keyVal);
+      log.log(Level.DEBUG, "for testing - using FixedEncryptKeyManager() keyVal:{0}", keyVal);
       config.setEncryptKeyManager(new FixedEncryptKeyManager(keyVal));
     }
 
     if (providerSetFlag > 0) {
-      log.info(msg(providerSetFlag));
+      log.log(Level.INFO, msg(providerSetFlag));
     }
   }
 
diff --git a/ebean-test/src/main/java/module-info.java b/ebean-test/src/main/java/module-info.java
index a23d1e65b..823483a0e 100644
--- a/ebean-test/src/main/java/module-info.java
+++ b/ebean-test/src/main/java/module-info.java
@@ -9,7 +9,6 @@ module io.ebean.test {
   provides io.ebeaninternal.api.SpiLoggerFactory with io.ebean.test.CapturingLoggerFactory;
   provides io.ebean.config.AutoConfigure with io.ebean.test.config.AutoConfigureForTesting;
 
-  requires transitive org.slf4j;
   requires transitive io.ebean.datasource;
   requires transitive io.ebean.core;
   requires transitive io.ebean.ddl.generator;
@@ -24,6 +23,7 @@ module io.ebean.test {
   requires transitive com.h2database;
 
   // support testing
+  requires static org.slf4j;
   requires static org.junit.jupiter.api;
   requires static jdk.management;
   requires static io.avaje.jsr305x;
diff --git a/platforms/h2/src/main/java/io/ebean/platform/h2/H2HistoryTrigger.java b/platforms/h2/src/main/java/io/ebean/platform/h2/H2HistoryTrigger.java
index 1cd6b8848..9cab33032 100644
--- a/platforms/h2/src/main/java/io/ebean/platform/h2/H2HistoryTrigger.java
+++ b/platforms/h2/src/main/java/io/ebean/platform/h2/H2HistoryTrigger.java
@@ -1,19 +1,21 @@
 package io.ebean.platform.h2;
 
+import io.avaje.applog.AppLog;
 import org.h2.api.Trigger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.sql.*;
+import java.lang.System.Logger.Level;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 
 /**
  * H2 database trigger used to populate history tables to support the @History feature.
  */
 public class H2HistoryTrigger implements Trigger {
 
-  private static final Logger log = LoggerFactory.getLogger(H2HistoryTrigger.class);
+  private static final System.Logger log = AppLog.getLogger(H2HistoryTrigger.class);
 
   /**
    * Hardcoding the column and history table suffix for now. Not sure how to get that
@@ -70,7 +72,7 @@ public class H2HistoryTrigger implements Trigger {
     insertSql.append(");");
 
     this.insertHistorySql = insertSql.toString();
-    log.debug("History table insert sql: {}", insertHistorySql);
+    log.log(Level.DEBUG, "History table insert sql: {0}", insertHistorySql);
   }
 
   @Override
@@ -83,9 +85,6 @@ public class H2HistoryTrigger implements Trigger {
         // update event. Set the effective start timestamp to now.
         newRow[effectStartPosition] = now;
       }
-      if (log.isTraceEnabled()) {
-        log.trace("History insert: {}", Arrays.toString(oldRow));
-      }
       insertIntoHistory(connection, oldRow);
     }
   }
diff --git a/pom.xml b/pom.xml
index 85ab5a776..196211980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,13 +56,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.36</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>

From 4252445eb48c5aeb91b9f6e1808a3af68711cb72 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 23 Aug 2022 15:18:46 +1200
Subject: [PATCH 023/127] Use AppLog and System.Logger for logging - static
 imports

---
 .../src/main/java/io/ebean/DbContext.java     |   5 +-
 .../src/main/java/io/ebean/EbeanVersion.java  |  11 +-
 .../config/dbplatform/DatabasePlatform.java   |   9 +-
 .../dbplatform/SequenceIdGenerator.java       |   8 +-
 .../java/io/ebean/event/ShutdownManager.java  |  15 +-
 .../io/ebean/text/csv/DefaultCsvCallback.java |   7 +-
 .../main/java/io/ebean/util/JdbcClose.java    |  13 +-
 .../service/DefaultAutoTuneService.java       |  25 ++--
 .../service/ProfileOriginNodeUsage.java       |   7 +-
 .../server/cache/DefaultCacheHolder.java      |  10 +-
 .../server/cache/DefaultServerCache.java      |  10 +-
 .../cache/DefaultServerCacheManager.java      |  12 +-
 .../changelog/DefaultChangeLogListener.java   |   8 +-
 .../server/cluster/ClusterManager.java        |   7 +-
 .../server/core/BeanRequest.java              |   4 +-
 .../server/core/DatabasePlatformFactory.java  |   8 +-
 .../server/core/DefaultBeanLoader.java        |   7 +-
 .../server/core/DefaultContainer.java         |  11 +-
 .../server/core/DefaultServer.java            |  10 +-
 .../server/core/InternalConfigXmlMap.java     |   5 +-
 .../server/core/InternalConfiguration.java    |   9 +-
 .../core/bootup/BootupClassPathSearch.java    |   5 +-
 .../server/core/bootup/BootupClasses.java     |   8 +-
 .../server/core/bootup/ManifestReader.java    |   5 +-
 .../server/deploy/BeanDescriptor.java         |  13 +-
 .../deploy/BeanDescriptorCacheHelp.java       | 135 +++++++++---------
 .../server/deploy/BeanDescriptorManager.java  |  21 +--
 .../server/deploy/BeanProperty.java           |   5 +-
 .../server/deploy/BeanPropertyAssoc.java      |   5 +-
 .../server/deploy/BeanPropertyAssocMany.java  |   9 +-
 .../server/deploy/BeanTable.java              |   4 +-
 .../deploy/parse/AnnotationAssocOnes.java     |   7 +-
 .../server/deploy/parse/AnnotationClass.java  |  28 +---
 .../deploy/parse/DeployCreateProperties.java  |  11 +-
 .../server/dto/DtoMetaBuilder.java            |   7 +-
 .../executor/DaemonExecutorService.java       |  11 +-
 .../executor/DaemonScheduleThreadPool.java    |  13 +-
 .../executor/DefaultBackgroundExecutor.java   |  19 +--
 .../server/idgen/UuidV1IdGenerator.java       |  31 ++--
 .../server/idgen/UuidV1RndIdGenerator.java    |   5 +-
 .../server/logger/DSpiLogger.java             |  11 +-
 .../server/persist/BatchedPstmt.java          |   7 +-
 .../ebeaninternal/server/persist/Binder.java  |   5 +-
 .../server/persist/DefaultPersister.java      |  26 ++--
 .../server/persist/SaveManyBase.java          |   5 +-
 .../server/query/CQueryPlanManager.java       |   4 +-
 .../server/query/SqlTreeBuilder.java          |  11 +-
 .../readaudit/DefaultReadAuditLogger.java     |  12 +-
 .../transaction/DefaultProfileHandler.java    |  20 +--
 .../ImplicitReadOnlyTransaction.java          |   5 +-
 .../server/transaction/JdbcTransaction.java   |  13 +-
 .../transaction/JtaTransactionManager.java    |  16 ++-
 .../transaction/PostCommitProcessing.java     |   7 +-
 .../server/transaction/TableModState.java     |  20 +--
 .../transaction/TransactionManager.java       |  12 +-
 .../ebeaninternal/server/type/DataBind.java   |   5 +-
 .../server/type/DefaultTypeManager.java       |  19 +--
 .../server/type/ScalarTypeFile.java           |   7 +-
 .../dbmigration/DdlGenerator.java             |   7 +-
 .../dbmigration/DefaultDbMigration.java       |  10 +-
 .../dbmigration/model/MigrationModel.java     |   5 +-
 .../dbmigration/model/PlatformDdlWriter.java  |   5 +-
 .../extraddl/model/ExtraDdlXmlReader.java     |   4 +-
 .../test/java/io/localtest/BaseTestCase.java  |   5 +-
 .../main/java/io/ebean/redis/RedisCache.java  |  10 +-
 .../io/ebean/redis/RedisCacheFactory.java     |  36 ++---
 .../ebean/redis/topic/DaemonTopicRunner.java  |  11 +-
 .../io/ebean/test/CapturingLoggerFactory.java |  11 +-
 .../test/config/AutoConfigureForTesting.java  |   8 +-
 .../io/ebean/test/config/platform/Config.java |   6 +-
 .../config/platform/PlatformAutoConfig.java   |  10 +-
 .../config/provider/ProviderAutoConfig.java   |   8 +-
 .../ebean/platform/h2/H2HistoryTrigger.java   |   5 +-
 73 files changed, 473 insertions(+), 416 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java
index c098f079a..3dca530a6 100644
--- a/ebean-api/src/main/java/io/ebean/DbContext.java
+++ b/ebean-api/src/main/java/io/ebean/DbContext.java
@@ -4,11 +4,12 @@ import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.datasource.DataSourceConfigurationException;
 
 import javax.persistence.PersistenceException;
-import java.lang.System.Logger.Level;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Holds Database instances.
  */
@@ -52,7 +53,7 @@ final class DbContext {
       throw new DataSourceConfigurationException(msg, e);
 
     } catch (Throwable e) {
-      log.log(Level.ERROR, "Error trying to create the default Database", e);
+      log.log(ERROR, "Error trying to create the default Database", e);
       throw new RuntimeException(e);
     }
   }
diff --git a/ebean-api/src/main/java/io/ebean/EbeanVersion.java b/ebean-api/src/main/java/io/ebean/EbeanVersion.java
index 7eaf5a52a..aeb855efc 100644
--- a/ebean-api/src/main/java/io/ebean/EbeanVersion.java
+++ b/ebean-api/src/main/java/io/ebean/EbeanVersion.java
@@ -6,9 +6,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
-import java.lang.System.Logger.Level;
 import java.util.Properties;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Class to determine the ebean version.
  *
@@ -36,12 +37,12 @@ public final class EbeanVersion {
         if (in != null) {
           try (LineNumberReader reader = new LineNumberReader(new InputStreamReader(in))) {
             version = reader.readLine();
-            log.log(Level.INFO, "ebean version: {0}", version);
+            log.log(INFO, "ebean version: {0}", version);
           }
         }
       }
     } catch (IOException e) {
-      log.log(Level.WARNING, "Could not determine ebean version: {0}", e.getMessage());
+      log.log(WARNING, "Could not determine ebean version: {0}", e.getMessage());
     }
   }
 
@@ -53,13 +54,13 @@ public final class EbeanVersion {
           String agentVersion = readVersion(in);
           if (agentVersion != null) {
             if (checkMinAgentVersion(agentVersion)) {
-              log.log(Level.ERROR, "Expected minimum ebean-agent version {0}.{1}.0 but we have {2}, please update the ebean-agent", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, agentVersion);
+              log.log(ERROR, "Expected minimum ebean-agent version {0}.{1}.0 but we have {2}, please update the ebean-agent", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, agentVersion);
             }
           }
         }
       }
     } catch (IOException e) {
-      log.log(Level.WARNING, "Could not check minimum ebean-agent version {0}.{1}.0 required due to - {2}", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, e.getMessage());
+      log.log(WARNING, "Could not check minimum ebean-agent version {0}.{1}.0 required due to - {2}", MIN_AGENT_MAJOR_VERSION, MIN_AGENT_MINOR_VERSION, e.getMessage());
     }
   }
 
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 53d416372..3bb2cced8 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -11,9 +11,10 @@ import io.ebean.util.JdbcClose;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
-import java.lang.System.Logger.Level;
 import java.sql.*;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Database platform specific settings.
  */
@@ -659,7 +660,7 @@ public class DatabasePlatform {
         if (isQuote(dbName.charAt(dbName.length() - 1))) {
           return openQuote + dbName.substring(1, dbName.length() - 1) + closeQuote;
         } else {
-          log.log(Level.ERROR, "Missing backquote on [" + dbName + "]");
+          log.log(ERROR, "Missing backquote on [" + dbName + "]");
         }
       } else if (allQuotedIdentifiers) {
         return openQuote + dbName + closeQuote;
@@ -722,7 +723,7 @@ public class DatabasePlatform {
 
   protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
     // silently assume the database does not support the "for update" clause.
-    log.log(Level.INFO, "it seems your database does not support the 'for update' clause");
+    log.log(INFO, "it seems your database does not support the 'for update' clause");
     return sql;
   }
 
@@ -756,7 +757,7 @@ public class DatabasePlatform {
     if (!schemaExists(dbSchema, connection)) {
       Statement query = connection.createStatement();
       try {
-        log.log(Level.DEBUG, "create schema:{0}", dbSchema);
+        log.log(DEBUG, "create schema:{0}", dbSchema);
         query.executeUpdate("create schema " + dbSchema);
       } finally {
         JdbcClose.close(query);
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
index 658c5e94e..246e8f1c0 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java
@@ -7,7 +7,6 @@ import io.ebean.util.JdbcClose;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -19,6 +18,9 @@ import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Database sequence based IdGenerator.
  */
@@ -120,7 +122,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
   protected void loadInBackground(final int requestSize) {
     if (currentlyBackgroundLoading.get()) {
       // skip as already background loading
-      log.log(Level.DEBUG, "... skip background sequence load (another load in progress)");
+      log.log(DEBUG, "... skip background sequence load (another load in progress)");
       return;
     }
     currentlyBackgroundLoading.set(true);
@@ -161,7 +163,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     } catch (SQLException e) {
       if (e.getMessage().contains("Database is already closed")) {
         String msg = "Error getting SEQ when DB shutting down " + e.getMessage();
-        log.log(Level.ERROR, msg);
+        log.log(ERROR, msg);
         System.out.println(msg);
         return Collections.emptyList();
       } else {
diff --git a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
index 2547ee542..3de1bb10b 100644
--- a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
+++ b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
@@ -4,7 +4,6 @@ import io.ebean.Database;
 import io.ebean.EbeanVersion;
 import io.ebean.service.SpiContainer;
 
-import java.lang.System.Logger.Level;
 import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -13,6 +12,8 @@ import java.util.Enumeration;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Manages the shutdown of Ebean.
  * <p>
@@ -121,8 +122,8 @@ public final class ShutdownManager {
         // Already run shutdown...
         return;
       }
-      if (log.isLoggable(Level.DEBUG)) {
-        log.log(Level.DEBUG, "Ebean shutting down");
+      if (log.isLoggable(DEBUG)) {
+        log.log(DEBUG, "Ebean shutting down");
       }
       stopping = true;
       deregisterShutdownHook();
@@ -134,7 +135,7 @@ public final class ShutdownManager {
           Runnable r = (Runnable) ClassUtil.newInstance(shutdownRunner);
           r.run();
         } catch (Exception e) {
-          log.log(Level.ERROR, "Error running custom shutdown runnable", e);
+          log.log(ERROR, "Error running custom shutdown runnable", e);
         }
       }
 
@@ -148,7 +149,7 @@ public final class ShutdownManager {
         try {
           server.shutdown();
         } catch (Exception ex) {
-          log.log(Level.ERROR, "Error executing shutdown runnable", ex);
+          log.log(ERROR, "Error executing shutdown runnable", ex);
           ex.printStackTrace();
         }
       }
@@ -166,10 +167,10 @@ public final class ShutdownManager {
     while (drivers.hasMoreElements()) {
       Driver driver = drivers.nextElement();
       try {
-        log.log(Level.INFO, "De-registering jdbc driver: " + driver);
+        log.log(INFO, "De-registering jdbc driver: " + driver);
         DriverManager.deregisterDriver(driver);
       } catch (SQLException e) {
-        log.log(Level.ERROR, "Error de-registering driver " + driver, e);
+        log.log(ERROR, "Error de-registering driver " + driver, e);
       }
     }
   }
diff --git a/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java b/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
index d2e6d3f98..3fcc8cc51 100644
--- a/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
+++ b/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
@@ -4,7 +4,8 @@ import io.ebean.Database;
 import io.ebean.EbeanVersion;
 import io.ebean.Transaction;
 
-import java.lang.System.Logger.Level;
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.INFO;
 
 /**
  * Provides the default implementation of CsvCallback.
@@ -129,7 +130,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
     // related beans (e.g. customer -> customer.billingAddress
     server.save(bean, transaction);
     if (logInfoFrequency > 0 && (row % logInfoFrequency == 0)) {
-      log.log(Level.DEBUG, "processed {0} rows", row);
+      log.log(DEBUG, "processed {0} rows", row);
     }
   }
 
@@ -140,7 +141,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
   public void end(int row) {
     commitTransactionIfCreated();
     exeTime = System.currentTimeMillis() - startTime;
-    log.log(Level.INFO, "Csv finished, rows[{0}] exeMillis[{1}]", row, exeTime);
+    log.log(INFO, "Csv finished, rows[{0}] exeMillis[{1}]", row, exeTime);
   }
 
   /**
diff --git a/ebean-api/src/main/java/io/ebean/util/JdbcClose.java b/ebean-api/src/main/java/io/ebean/util/JdbcClose.java
index b450db79a..d6b35539c 100644
--- a/ebean-api/src/main/java/io/ebean/util/JdbcClose.java
+++ b/ebean-api/src/main/java/io/ebean/util/JdbcClose.java
@@ -2,12 +2,13 @@ package io.ebean.util;
 
 import io.ebean.EbeanVersion;
 
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * Utility for closing raw Jdbc resources.
  */
@@ -24,7 +25,7 @@ public final class JdbcClose {
         statement.close();
       }
     } catch (SQLException e) {
-      log.log(Level.WARNING, "Error closing statement", e);
+      log.log(WARNING, "Error closing statement", e);
     }
   }
 
@@ -37,7 +38,7 @@ public final class JdbcClose {
         resultSet.close();
       }
     } catch (SQLException e) {
-      log.log(Level.WARNING, "Error closing resultSet", e);
+      log.log(WARNING, "Error closing resultSet", e);
     }
   }
 
@@ -50,7 +51,7 @@ public final class JdbcClose {
         connection.close();
       }
     } catch (SQLException e) {
-      log.log(Level.WARNING, "Error closing connection", e);
+      log.log(WARNING, "Error closing connection", e);
     }
   }
 
@@ -63,7 +64,7 @@ public final class JdbcClose {
         connection.rollback();
       }
     } catch (SQLException e) {
-      log.log(Level.WARNING, "Error on connection rollback", e);
+      log.log(WARNING, "Error on connection rollback", e);
     }
   }
 
@@ -76,7 +77,7 @@ public final class JdbcClose {
         stmt.cancel();
       }
     } catch (SQLException e) {
-      log.log(Level.WARNING, "Error on cancelling statement", e);
+      log.log(WARNING, "Error on cancelling statement", e);
     }
   }
 }
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
index be43c42af..a0031f938 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java
@@ -12,10 +12,11 @@ import io.ebeaninternal.server.autotune.model.Origin;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.System.Logger.Level;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Implementation of the AutoTuneService which is comprised of profiling and query tuning.
  */
@@ -111,7 +112,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
         if (stream != null) {
           loadAutoTuneProfiling(AutoTuneXmlReader.read(stream));
         } else {
-          logger.log(Level.WARNING, "AutoTune file {0} not found - no initial automatic query tuning", tuningFile);
+          logger.log(WARNING, "AutoTune file {0} not found - no initial automatic query tuning", tuningFile);
         }
       } catch (IOException e) {
         throw new IllegalStateException("Error on auto close of " + tuningFile, e);
@@ -120,7 +121,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
   }
 
   private void loadAutoTuneProfiling(Autotune profiling) {
-    logger.log(Level.INFO, "AutoTune loading {0} tuning entries", profiling.getOrigin().size());
+    logger.log(INFO, "AutoTune loading {0} tuning entries", profiling.getOrigin().size());
     for (Origin origin : profiling.getOrigin()) {
       queryTuner.put(origin);
     }
@@ -141,17 +142,17 @@ public class DefaultAutoTuneService implements AutoTuneService {
         event.process();
         if (event.isEmpty()) {
           long exeMillis = System.currentTimeMillis() - start;
-          logger.log(Level.DEBUG, "No query tuning updates for server:{0} executionMillis:{1}", serverName, exeMillis);
+          logger.log(DEBUG, "No query tuning updates for server:{0} executionMillis:{1}", serverName, exeMillis);
 
         } else {
           // report the query tuning changes that have been made
           runtimeChangeCount += event.getChangeCount();
           event.writeFile(profilingFile + "-" + serverName + "-update");
           long exeMillis = System.currentTimeMillis() - start;
-          logger.log(Level.INFO, "query tuning updates - new:{0} diff:{1} for server:{2} executionMillis:{3}", event.getNewCount(), event.getDiffCount(), serverName, exeMillis);
+          logger.log(INFO, "query tuning updates - new:{0} diff:{1} for server:{2} executionMillis:{3}", event.getNewCount(), event.getDiffCount(), serverName, exeMillis);
         }
       } catch (Throwable e) {
-        logger.log(Level.ERROR, "Error collecting or applying automatic query tuning", e);
+        logger.log(ERROR, "Error collecting or applying automatic query tuning", e);
       }
     } finally {
       lock.unlock();
@@ -172,11 +173,11 @@ public class DefaultAutoTuneService implements AutoTuneService {
         AutoTuneDiffCollection event = new AutoTuneDiffCollection(profiling, queryTuner, false);
         event.process();
         if (event.isEmpty()) {
-          logger.log(Level.INFO, "No new or diff entries for profiling server:{0}", serverName);
+          logger.log(INFO, "No new or diff entries for profiling server:{0}", serverName);
 
         } else {
           event.writeFile(profilingFile + "-" + serverName);
-          logger.log(Level.INFO, "writing new:{0} diff:{1} profiling entries for server:{2}", event.getNewCount(), event.getDiffCount(), serverName);
+          logger.log(INFO, "writing new:{0} diff:{1} profiling entries for server:{2}", event.getNewCount(), event.getDiffCount(), serverName);
         }
       }
     } finally {
@@ -196,7 +197,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
   private void outputAllTuning() {
 
     if (runtimeChangeCount == 0) {
-      logger.log(Level.INFO, "no runtime query tuning changes for server:{0}", serverName);
+      logger.log(INFO, "no runtime query tuning changes for server:{0}", serverName);
 
     } else {
       AutoTuneAllCollection event = new AutoTuneAllCollection(queryTuner);
@@ -205,12 +206,12 @@ public class DefaultAutoTuneService implements AutoTuneService {
       if (existingTuning.exists()) {
         // rename the existing autotune.xml file (appending 'now')
         if (!existingTuning.renameTo(new File(tuningFile + "." + AutoTuneXmlWriter.now()))) {
-          logger.log(Level.WARNING, "Failed to rename autotune file [{0}]", tuningFile);
+          logger.log(WARNING, "Failed to rename autotune file [{0}]", tuningFile);
         }
       }
 
       event.writeFile(tuningFile, false);
-      logger.log(Level.INFO, "query tuning detected [{0}] changes, writing all [{1}] tuning entries for server:{2}", runtimeChangeCount, size, serverName);
+      logger.log(INFO, "query tuning detected [{0}] changes, writing all [{1}] tuning entries for server:{2}", runtimeChangeCount, size, serverName);
     }
   }
 
@@ -279,7 +280,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
     } catch (InterruptedException e) {
       // restore the interrupted status
       Thread.currentThread().interrupt();
-      logger.log(Level.WARNING, "Error while sleeping after System.gc() request.", e);
+      logger.log(WARNING, "Error while sleeping after System.gc() request.", e);
     }
   }
 
diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
index fb9007ebf..408d9c1ff 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java
@@ -9,11 +9,12 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
 import io.ebeaninternal.server.el.ElPropertyValue;
 
-import java.lang.System.Logger.Level;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * Collects usages statistics for a given node in the object graph.
  */
@@ -45,7 +46,7 @@ public class ProfileOriginNodeUsage {
       if (path != null) {
         ElPropertyValue elGetValue = rootDesc.elGetValue(path);
         if (elGetValue == null) {
-          logger.log(Level.WARNING, "AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name());
+          logger.log(WARNING, "AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name());
           return;
         } else {
           BeanProperty beanProperty = elGetValue.beanProperty();
@@ -61,7 +62,7 @@ public class ProfileOriginNodeUsage {
       for (String propName : aggregateUsed) {
         BeanProperty beanProp = desc.findPropertyFromPath(propName);
         if (beanProp == null) {
-          logger.log(Level.WARNING, "AutoTune: Can't find property[" + propName + "] for " + desc.name());
+          logger.log(WARNING, "AutoTune: Can't find property[" + propName + "] for " + desc.name());
 
         } else {
           if (beanProp.isId()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
index cf6a02089..aff1929b6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java
@@ -9,12 +9,14 @@ import io.ebean.config.CurrentTenantProvider;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.util.AnnotationUtil;
 
-import java.lang.System.Logger.Level;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.TRACE;
+
 /**
  * Manages the construction of caches.
  */
@@ -89,7 +91,7 @@ final class DefaultCacheHolder {
   }
 
   void clearAll() {
-    log.log(Level.DEBUG, "clearAll");
+    log.log(DEBUG, "clearAll");
     for (ServerCache serverCache : allCaches.values()) {
       serverCache.clear();
     }
@@ -97,7 +99,7 @@ final class DefaultCacheHolder {
 
 
   public void clear(String name) {
-    log.log(Level.DEBUG, "clear {0}", name);
+    log.log(DEBUG, "clear {0}", name);
     clearIfExists(key(name, ServerCacheType.QUERY));
     clearIfExists(key(name, ServerCacheType.BEAN));
     clearIfExists(key(name, ServerCacheType.NATURAL_KEY));
@@ -112,7 +114,7 @@ final class DefaultCacheHolder {
   private void clearIfExists(String fullKey) {
     ServerCache cache = allCaches.get(fullKey);
     if (cache != null) {
-      log.log(Level.TRACE, "clear cache {0}", fullKey);
+      log.log(TRACE, "clear cache {0}", fullKey);
       cache.clear();
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
index e5bfd2628..e68c9a308 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java
@@ -9,13 +9,15 @@ import io.ebean.metric.CountMetric;
 import io.ebean.metric.MetricFactory;
 
 import java.io.Serializable;
-import java.lang.System.Logger.Level;
 import java.lang.ref.SoftReference;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.TRACE;
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * The default cache implementation.
  * <p>
@@ -287,13 +289,13 @@ public class DefaultServerCache implements ServerCache {
         evictCount.add(trimmedByGC);
         evictCount.add(trimmedByTTL);
         evictCount.add(trimmedByLRU);
-        if (logger.isLoggable(Level.TRACE)) {
+        if (logger.isLoggable(TRACE)) {
           long exeMicros = TimeUnit.MICROSECONDS.convert(System.nanoTime() - startNanos, TimeUnit.NANOSECONDS);
-          logger.log(Level.TRACE, "Executed trim of cache {0} in [{1}]millis idle[{2}] timeToLive[{3}] accessTime[{4}] gc[{5}]",
+          logger.log(TRACE, "Executed trim of cache {0} in [{1}]millis idle[{2}] timeToLive[{3}] accessTime[{4}] gc[{5}]",
             name, exeMicros, trimmedByIdle, trimmedByTTL, trimmedByLRU, trimmedByGC);
         }
       } catch (Throwable e) {
-        logger.log(Level.WARNING, "Error during trim of DefaultServerCache [" + name + "]. Cache might be bigger than desired.", e);
+        logger.log(WARNING, "Error during trim of DefaultServerCache [" + name + "]. Cache might be bigger than desired.", e);
       }
     } finally {
       lock.unlock();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
index 6142f6d50..0b7264ff9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java
@@ -9,9 +9,11 @@ import io.ebeaninternal.api.SpiCacheRegion;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.deploy.DCacheRegion;
 
-import java.lang.System.Logger.Level;
 import java.util.*;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.INFO;
+
 /**
  * Manages the bean and query caches.
  */
@@ -65,23 +67,23 @@ public final class DefaultServerCacheManager implements SpiCacheManager {
           enabled.add(region.name());
           if (!region.isEnabled()) {
             region.setEnabled(true);
-            log.log(Level.DEBUG, "Cache region[{0}] enabled", region.name());
+            log.log(DEBUG, "Cache region[{0}] enabled", region.name());
           }
         } else {
           disabled.add(region.name());
           if (region.isEnabled()) {
             region.setEnabled(false);
-            log.log(Level.DEBUG, "Cache region[{0}] disabled", region.name());
+            log.log(DEBUG, "Cache region[{0}] disabled", region.name());
           }
         }
       }
-      log.log(Level.INFO, "Cache regions enabled:{0} disabled:{1}", enabled, disabled);
+      log.log(INFO, "Cache regions enabled:{0} disabled:{1}", enabled, disabled);
     }
   }
 
   @Override
   public void setAllRegionsEnabled(boolean enabled) {
-    log.log(Level.DEBUG, "All cache regions enabled[{0}]", enabled);
+    log.log(DEBUG, "All cache regions enabled[{0}]", enabled);
     for (SpiCacheRegion region : regionMap.values()) {
       region.setEnabled(enabled);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
index c85edd315..7ababb99f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java
@@ -10,9 +10,11 @@ import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.CoreLog;
 
 import java.io.StringWriter;
-import java.lang.System.Logger.Level;
 import java.util.Properties;
 
+import static java.lang.System.Logger.Level.ERROR;
+import static java.lang.System.Logger.Level.INFO;
+
 /**
  * Simply logs the change sets in JSON form to logger named <code>io.ebean.ChangeLog</code>.
  */
@@ -65,9 +67,9 @@ public final class DefaultChangeLogListener implements ChangeLogListener, Plugin
       try {
         StringWriter writer = new StringWriter(getBufferSize(beanChange));
         jsonBuilder.writeBeanJson(writer, beanChange, changeSet);
-        changeLog.log(Level.INFO, writer.toString());
+        changeLog.log(INFO, writer.toString());
       } catch (Exception e) {
-        CoreLog.log.log(Level.ERROR, "Exception logging beanChange " + beanChange, e);
+        CoreLog.log.log(ERROR, "Exception logging beanChange " + beanChange, e);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
index 4af7e1fce..e370534d9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java
@@ -5,12 +5,13 @@ import io.ebean.Database;
 import io.ebean.config.ContainerConfig;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 
-import java.lang.System.Logger.Level;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Manages the cluster service.
  */
@@ -112,8 +113,8 @@ public class ClusterManager implements ServerLookup {
    */
   public void broadcast(RemoteTransactionEvent event) {
     if (broadcast != null) {
-      if (clusterLogger.isLoggable(Level.DEBUG)) {
-        clusterLogger.log(Level.DEBUG, "sending: {0}", event);
+      if (clusterLogger.isLoggable(DEBUG)) {
+        clusterLogger.log(DEBUG, "sending: {0}", event);
       }
       broadcast.broadcast(event);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
index 6d68210bd..b8224bc23 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 
-import java.lang.System.Logger.Level;
+import static java.lang.System.Logger.Level.ERROR;
 
 /**
  * Base class for find and persist requests.
@@ -63,7 +63,7 @@ public abstract class BeanRequest {
         // Just log this and carry on. A previous exception has been
         // thrown and if this rollback throws exception it likely means
         // that the connection is broken (and the dataSource and db will cleanup)
-        CoreLog.log.log(Level.ERROR, "Error trying to rollback a transaction (after a prior exception thrown)", e);
+        CoreLog.log.log(ERROR, "Error trying to rollback a transaction (after a prior exception thrown)", e);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
index 265e71cba..8fa1093be 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java
@@ -8,7 +8,6 @@ import io.ebeaninternal.api.DbOffline;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
@@ -16,6 +15,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.INFO;
+
 /**
  * Create a DatabasePlatform from the configuration.
  * <p>
@@ -39,7 +41,7 @@ public class DatabasePlatformFactory {
     try {
       String offlinePlatform = DbOffline.getPlatform();
       if (offlinePlatform != null) {
-        CoreLog.log.log(Level.INFO, "offline platform [{0}]", offlinePlatform);
+        CoreLog.log.log(INFO, "offline platform [{0}]", offlinePlatform);
         return byDatabaseName(offlinePlatform);
       }
       if (config.getDatabasePlatformName() != null) {
@@ -88,7 +90,7 @@ public class DatabasePlatformFactory {
     String dbProductName = metaData.getDatabaseProductName().toLowerCase();
     final int majorVersion = metaData.getDatabaseMajorVersion();
     final int minorVersion = metaData.getDatabaseMinorVersion();
-    CoreLog.log.log(Level.DEBUG, "platform for productName[{0}] version[{1}.{2}]", dbProductName, majorVersion, minorVersion);
+    CoreLog.log.log(DEBUG, "platform for productName[{0}] version[{1}.{2}]", dbProductName, majorVersion, minorVersion);
     for (DatabasePlatformProvider provider : providers) {
       if (provider.matchByProductName(dbProductName)) {
         return provider.create(majorVersion, minorVersion, metaData, connection);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 7cd82edeb..8e1f2fb84 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -14,10 +14,11 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 
 import javax.persistence.EntityNotFoundException;
-import java.lang.System.Logger.Level;
 import java.util.List;
 import java.util.Set;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Helper to handle lazy loading and refreshing of beans.
  */
@@ -108,8 +109,8 @@ final class DefaultBeanLoader {
     server.findOne(query, null);
     if (beanCollection != null) {
       if (beanCollection.checkEmptyLazyLoad()) {
-        if (log.isLoggable(Level.DEBUG)) {
-          log.log(Level.DEBUG, "BeanCollection after load was empty. Owner:" + beanCollection.getOwnerBean());
+        if (log.isLoggable(DEBUG)) {
+          log.log(DEBUG, "BeanCollection after load was empty. Owner:" + beanCollection.getOwnerBean());
         }
       } else if (useManyIdCache) {
         parentDesc.cacheManyPropPut(many, beanCollection, parentId);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index eb1cb1fe2..16df24f4c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -14,7 +14,6 @@ import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
 
 import javax.persistence.PersistenceException;
-import java.lang.System.Logger.Level;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -22,6 +21,8 @@ import java.util.List;
 import java.util.ServiceLoader;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Default Server side implementation of ServerFactory.
  */
@@ -107,7 +108,7 @@ public final class DefaultContainer implements SpiContainer {
         startServer(online, server);
       }
       DbOffline.reset();
-      log.log(Level.INFO, "Started database[{0}] platform[{1}] in {2}ms", config.getName(), config.getDatabasePlatform().getPlatform(), System.currentTimeMillis() - start);
+      log.log(INFO, "Started database[{0}] platform[{1}] in {2}ms", config.getName(), config.getDatabasePlatform().getPlatform(), System.currentTimeMillis() - start);
       return server;
     } finally {
       lock.unlock();
@@ -136,7 +137,7 @@ public final class DefaultContainer implements SpiContainer {
   private void checkMissingModulePathProvides() {
     URL servicesFile = ClassLoader.getSystemResource("META-INF/services/io.ebean.config.EntityClassRegister");
     if (servicesFile != null) {
-      log.log(Level.ERROR, "module-info.java is probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause. EntityClassRegister exists but was not service loaded.");
+      log.log(ERROR, "module-info.java is probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause. EntityClassRegister exists but was not service loaded.");
     }
   }
 
@@ -214,7 +215,7 @@ public final class DefaultContainer implements SpiContainer {
    */
   private void setDataSource(DatabaseConfig config) {
     if (isOfflineMode(config)) {
-      log.log(Level.DEBUG, "... DbOffline using platform [{0}]", DbOffline.getPlatform());
+      log.log(DEBUG, "... DbOffline using platform [{0}]", DbOffline.getPlatform());
     } else {
       InitDataSource.init(config);
     }
@@ -250,7 +251,7 @@ public final class DefaultContainer implements SpiContainer {
     }
     try (Connection connection = config.getDataSource().getConnection()) {
       if (connection.getAutoCommit()) {
-        log.log(Level.WARNING, "DataSource [{0}] has autoCommit defaulting to true!", config.getName());
+        log.log(WARNING, "DataSource [{0}] has autoCommit defaulting to true!", config.getName());
       }
       return true;
     } catch (SQLException ex) {
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 b6b498b0d..d0333acda 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
@@ -51,7 +51,6 @@ import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -65,6 +64,7 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import static java.lang.System.Logger.Level.*;
 import static java.util.Spliterators.spliteratorUnknownSize;
 import static java.util.stream.StreamSupport.stream;
 
@@ -331,7 +331,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (config.isQueryPlanCapture()) {
       long secs = config.getQueryPlanCapturePeriodSecs();
       if (secs > 10) {
-        log.log(Level.INFO, "capture query plan enabled, every {0}secs", secs);
+        log.log(INFO, "capture query plan enabled, every {0}secs", secs);
         backgroundExecutor.scheduleWithFixedDelay(this::collectQueryPlans, secs, secs, TimeUnit.SECONDS);
       }
     }
@@ -379,7 +379,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Shutdown the services like threads and DataSource.
    */
   private void shutdownInternal(boolean shutdownDataSource, boolean deregisterDriver) {
-    log.log(Level.TRACE, "shutting down instance {0}", serverName);
+    log.log(TRACE, "shutting down instance {0}", serverName);
     if (shutdown) {
       // already shutdown
       return;
@@ -408,7 +408,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
       try {
         plugin.shutdown();
       } catch (Exception e) {
-        log.log(Level.ERROR, "Error when shutting down plugin", e);
+        log.log(ERROR, "Error when shutting down plugin", e);
       }
     }
   }
@@ -2075,7 +2075,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
             try {
               serverCacheManager.clearLocal(Class.forName(cache));
             } catch (Exception e) {
-              log.log(Level.ERROR, "Error clearing local cache for type " + cache, e);
+              log.log(ERROR, "Error clearing local cache for type " + cache, e);
             }
           }
         }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
index 4bd2545ed..c55467ce4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlMap.java
@@ -6,11 +6,12 @@ import io.ebeaninternal.xmapping.api.XmapDto;
 import io.ebeaninternal.xmapping.api.XmapEbean;
 import io.ebeaninternal.xmapping.api.XmapRawSql;
 
-import java.lang.System.Logger.Level;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Reads the Xml deployment information.
  */
@@ -56,7 +57,7 @@ final class InternalConfigXmlMap {
     try {
       dtoClass = Class.forName(dto.getClazz(), false, classLoader);
     } catch (Exception e) {
-      CoreLog.internal.log(Level.ERROR, "Could not load dto bean class " + dto.getClazz() + " for ebean xml entry");
+      CoreLog.internal.log(ERROR, "Could not load dto bean class " + dto.getClazz() + " for ebean xml entry");
       return;
     }
     DtoNamedQueries namedQueries = dtoNamedQueries.computeIfAbsent(dtoClass, aClass -> new DtoNamedQueries());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index c8b7f8810..51e4a7d5f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -57,9 +57,10 @@ import io.ebeanservice.docstore.api.DocStoreIntegration;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.none.NoneDocStoreFactory;
 
-import java.lang.System.Logger.Level;
 import java.util.*;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Used to extend the DatabaseConfig with additional objects used to configure and
  * construct an Database.
@@ -433,7 +434,7 @@ public final class InternalConfiguration {
       externalTransactionManager = new JtaTransactionManager();
     }
     if (externalTransactionManager != null) {
-      log.log(Level.INFO, "Using Transaction Manager {0}", externalTransactionManager.getClass());
+      log.log(INFO, "Using Transaction Manager {0}", externalTransactionManager.getClass());
       return new ExternalTransactionScopeManager(externalTransactionManager);
     } else {
       return new DefaultTransactionScopeManager();
@@ -523,7 +524,7 @@ public final class InternalConfiguration {
       if (iterator.hasNext()) {
         // use the cacheFactory (via classpath service loader)
         plugin = iterator.next();
-        log.log(Level.DEBUG, "using ServerCacheFactory {0}", plugin.getClass());
+        log.log(DEBUG, "using ServerCacheFactory {0}", plugin.getClass());
       } else {
         // use the built in default l2 caching which is local cache based
         localL2Caching = true;
@@ -613,7 +614,7 @@ public final class InternalConfiguration {
     @Override
     public void execute(boolean online) {
       if (online && ddlRun) {
-        CoreLog.log.log(Level.ERROR, "Configured to run DDL but ebean-ddl-generator is not in the classpath (or ebean-test in the test classpath?)");
+        CoreLog.log.log(ERROR, "Configured to run DDL but ebean-ddl-generator is not in the classpath (or ebean-test in the test classpath?)");
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
index 031c87688..8e2dd4d7f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
@@ -5,10 +5,11 @@ import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.ClassPathScanners;
 
-import java.lang.System.Logger.Level;
 import java.util.List;
 import java.util.Set;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Searches for interesting classes such as Entities, Embedded and ScalarTypes.
  */
@@ -58,7 +59,7 @@ public class BootupClassPathSearch {
       }
 
       long searchTime = System.currentTimeMillis() - st;
-      log.log(Level.DEBUG, "Classpath search entities[{0}] searchTime[{1}] in packages[{2}]", bc.getEntities().size(), searchTime, packages);
+      log.log(DEBUG, "Classpath search entities[{0}] searchTime[{1}] in packages[{2}]", bc.getEntities().size(), searchTime, packages);
       return bc;
 
     } catch (Exception ex) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
index b3f777c6f..40c4ad442 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
@@ -18,13 +18,15 @@ import javax.persistence.AttributeConverter;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.lang.System.Logger.Level;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Interesting classes for a EbeanServer such as Embeddable, Entity,
  * ScalarTypes, Finders, Listeners and Controllers.
@@ -205,13 +207,13 @@ public class BootupClasses implements Predicate<Class<?>> {
     try {
       return cls.getConstructor().newInstance();
     } catch (NoSuchMethodException e) {
-      log.log(Level.DEBUG, "Ignore/expected - no default constructor: " + e.getMessage());
+      log.log(DEBUG, "Ignore/expected - no default constructor: " + e.getMessage());
       return null;
 
     } catch (Exception e) {
       if (logOnException) {
         // not expected but we log and carry on
-        log.log(Level.ERROR, "Error creating " + cls, e);
+        log.log(ERROR, "Error creating " + cls, e);
         return null;
 
       } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
index a9dbf21ab..456b90987 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
@@ -6,7 +6,6 @@ import io.ebeaninternal.util.UrlHelper;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.System.Logger.Level;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -15,6 +14,8 @@ import java.util.Set;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * Reads all the META-INF/ebean.mf resources with the package locations of entity beans.
  */
@@ -63,7 +64,7 @@ class ManifestReader {
         }
       }
     } catch (IOException e) {
-      log.log(Level.WARNING, "Error reading " + resourcePath + " manifest resources", e);
+      log.log(WARNING, "Error reading " + resourcePath + " manifest resources", e);
     }
     return packageSet;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 4fd54268f..d86e75a7b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -58,7 +58,6 @@ import io.ebeanservice.docstore.api.mapping.DocumentMapping;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.lang.System.Logger.Level;
 import java.lang.reflect.Modifier;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -68,6 +67,8 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
+import static java.lang.System.Logger.Level.ERROR;
+import static java.lang.System.Logger.Level.INFO;
 
 /**
  * Describes Beans including their deployment information.
@@ -792,7 +793,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
       changeJson.flush();
       return beanChange(ChangeType.UPDATE, request.beanId(), changeJson.newJson(), changeJson.oldJson());
     } catch (RuntimeException e) {
-      log.log(Level.ERROR, "Failed to write ChangeLog entry for update", e);
+      log.log(ERROR, "Failed to write ChangeLog entry for update", e);
       return null;
     }
   }
@@ -808,7 +809,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
       jsonWriter.flush();
       return beanChange(ChangeType.INSERT, request.beanId(), writer.toString(), null);
     } catch (IOException e) {
-      log.log(Level.ERROR, "Failed to write ChangeLog entry for insert", e);
+      log.log(ERROR, "Failed to write ChangeLog entry for insert", e);
       return null;
     }
   }
@@ -2288,11 +2289,11 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   private ElComparator<T> createPropertyComparator(SortByClause.Property sortProp) {
     ElPropertyValue elGetValue = elGetValue(sortProp.getName());
     if (elGetValue == null) {
-      log.log(Level.ERROR, "Sort property [" + sortProp + "] not found in " + beanType + ". Cannot sort.");
+      log.log(ERROR, "Sort property [" + sortProp + "] not found in " + beanType + ". Cannot sort.");
       return new ElComparatorNoop<>();
     }
     if (elGetValue.isAssocMany()) {
-      log.log(Level.ERROR, "Sort property [" + sortProp + "] in " + beanType + " is a many-property. Cannot sort.");
+      log.log(ERROR, "Sort property [" + sortProp + "] in " + beanType + " is a many-property. Cannot sort.");
       return new ElComparatorNoop<>();
     }
     Boolean nullsHigh = sortProp.getNullsHigh();
@@ -2768,7 +2769,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   public void markAsDeleted(EntityBean bean) {
     if (softDeleteProperty == null) {
       Object id = getId(bean);
-      log.log(Level.INFO, "(Lazy) loading unsuccessful for type:{0} id:{1} - expecting when bean has been deleted", name(), id);
+      log.log(INFO, "(Lazy) loading unsuccessful for type:{0} id:{1} - expecting when bean has been deleted", name(), id);
       bean._ebean_getIntercept().setLazyLoadFailure(id);
     } else {
       softDeleteValue(bean);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 4e0c39b39..015fcbe70 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -16,9 +16,10 @@ import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 
 import java.io.IOException;
-import java.lang.System.Logger.Level;
 import java.util.*;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Helper for BeanDescriptor that manages the bean, query and collection caches.
  *
@@ -104,10 +105,10 @@ final class BeanDescriptorCacheHelp<T> {
   void deriveNotifyFlags() {
     cacheNotifyOnAll = (invalidateQueryCache || beanCache != null || queryCache != null);
     cacheNotifyOnDelete = !cacheNotifyOnAll && isNotifyOnDeletes();
-    if (log.isLoggable(Level.DEBUG)) {
+    if (log.isLoggable(DEBUG)) {
       if (cacheNotifyOnAll || cacheNotifyOnDelete) {
         String notifyMode = cacheNotifyOnAll ? "All" : "Delete";
-        log.log(Level.DEBUG, "l2 caching on {0} - beanCaching:{1} queryCaching:{2} notifyMode:{3} ",
+        log.log(DEBUG, "l2 caching on {0} - beanCaching:{1} queryCaching:{2} notifyMode:{3} ",
           desc.fullName(), isBeanCaching(), isQueryCaching(), notifyMode);
       }
     }
@@ -178,8 +179,8 @@ final class BeanDescriptorCacheHelp<T> {
    */
   void queryCacheClear() {
     if (queryCache != null) {
-      if (queryLog.isLoggable(Level.DEBUG)) {
-        queryLog.log(Level.DEBUG, "   CLEAR {0}", cacheName);
+      if (queryLog.isLoggable(DEBUG)) {
+        queryLog.log(DEBUG, "   CLEAR {0}", cacheName);
       }
       queryCache.clear();
     }
@@ -202,11 +203,11 @@ final class BeanDescriptorCacheHelp<T> {
       throw new IllegalStateException("No query cache enabled on " + desc + ". Need explicit @Cache(enableQueryCache=true)");
     }
     Object queryResult = queryCache.get(id);
-    if (queryLog.isLoggable(Level.DEBUG)) {
+    if (queryLog.isLoggable(DEBUG)) {
       if (queryResult == null) {
-        queryLog.log(Level.DEBUG, "   GET {0}({1}) - cache miss", cacheName, id);
+        queryLog.log(DEBUG, "   GET {0}({1}) - cache miss", cacheName, id);
       } else {
-        queryLog.log(Level.DEBUG, "   GET {0}({1}) - hit", cacheName, id);
+        queryLog.log(DEBUG, "   GET {0}({1}) - hit", cacheName, id);
       }
     }
     return queryResult;
@@ -219,8 +220,8 @@ final class BeanDescriptorCacheHelp<T> {
     if (queryCache == null) {
       throw new IllegalStateException("No query cache enabled on " + desc + ". Need explicit @Cache(enableQueryCache=true)");
     }
-    if (queryLog.isLoggable(Level.DEBUG)) {
-      queryLog.log(Level.DEBUG, "   PUT {0}({1})", cacheName, id);
+    if (queryLog.isLoggable(DEBUG)) {
+      queryLog.log(DEBUG, "   PUT {0}({1})", cacheName, id);
     }
     queryCache.put(id, entry);
   }
@@ -228,16 +229,16 @@ final class BeanDescriptorCacheHelp<T> {
 
   void manyPropRemove(String propertyName, Object parentId) {
     ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, propertyName);
-    if (manyLog.isLoggable(Level.TRACE)) {
-      manyLog.log(Level.TRACE, "   REMOVE {0}({1}).{2}", cacheName, parentId, propertyName);
+    if (manyLog.isLoggable(TRACE)) {
+      manyLog.log(TRACE, "   REMOVE {0}({1}).{2}", cacheName, parentId, propertyName);
     }
     collectionIdsCache.remove(parentId);
   }
 
   void manyPropClear(String propertyName) {
     ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, propertyName);
-    if (manyLog.isLoggable(Level.DEBUG)) {
-      manyLog.log(Level.DEBUG, "   CLEAR {0}(*).{1} ", cacheName, propertyName);
+    if (manyLog.isLoggable(DEBUG)) {
+      manyLog.log(DEBUG, "   CLEAR {0}(*).{1} ", cacheName, propertyName);
     }
     collectionIdsCache.clear();
   }
@@ -249,11 +250,11 @@ final class BeanDescriptorCacheHelp<T> {
     ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, propertyName);
     CachedManyIds entry = (CachedManyIds) collectionIdsCache.get(parentId);
     if (entry == null) {
-      if (manyLog.isLoggable(Level.TRACE)) {
-        manyLog.log(Level.TRACE, "   GET {0}({1}).{2} - cache miss", cacheName, parentId, propertyName);
+      if (manyLog.isLoggable(TRACE)) {
+        manyLog.log(TRACE, "   GET {0}({1}).{2} - cache miss", cacheName, parentId, propertyName);
       }
-    } else if (manyLog.isLoggable(Level.DEBUG)) {
-      manyLog.log(Level.DEBUG, "   GET {0}({1}).{2} - hit", cacheName, parentId, propertyName);
+    } else if (manyLog.isLoggable(DEBUG)) {
+      manyLog.log(DEBUG, "   GET {0}({1}).{2} - hit", cacheName, parentId, propertyName);
     }
     return entry;
   }
@@ -303,12 +304,12 @@ final class BeanDescriptorCacheHelp<T> {
           changes.put(many.name(), asJson);
 
           CachedBeanData newData = data.update(changes, data.getVersion());
-          if (beanLog.isLoggable(Level.DEBUG)) {
-            beanLog.log(Level.DEBUG, "   UPDATE {0}({1})  changes:{2}", cacheName, parentId, changes);
+          if (beanLog.isLoggable(DEBUG)) {
+            beanLog.log(DEBUG, "   UPDATE {0}({1})  changes:{2}", cacheName, parentId, changes);
           }
           beanCache.put(parentId, newData);
         } catch (IOException e) {
-          log.log(Level.ERROR, "Error updating L2 cache", e);
+          log.log(ERROR, "Error updating L2 cache", e);
         }
       }
     } else {
@@ -321,8 +322,8 @@ final class BeanDescriptorCacheHelp<T> {
 
   void cachePutManyIds(Object parentId, String manyName, CachedManyIds entry) {
     ServerCache collectionIdsCache = cacheManager.getCollectionIdsCache(beanType, manyName);
-    if (manyLog.isLoggable(Level.DEBUG)) {
-      manyLog.log(Level.DEBUG, "   PUT {0}({1}).{2} - ids:{3}", cacheName, parentId, manyName, entry);
+    if (manyLog.isLoggable(DEBUG)) {
+      manyLog.log(DEBUG, "   PUT {0}({1}).{2} - ids:{3}", cacheName, parentId, manyName, entry);
     }
     collectionIdsCache.put(parentId, entry);
   }
@@ -353,8 +354,8 @@ final class BeanDescriptorCacheHelp<T> {
       return new BeanCacheResult<>();
     }
     Map<Object, Object> beanDataMap = beanCache.getAll(keys);
-    if (beanLog.isLoggable(Level.TRACE)) {
-      beanLog.log(Level.TRACE, "   MGET {0}({1}) - hits:{2}", cacheName, ids, beanDataMap.keySet());
+    if (beanLog.isLoggable(TRACE)) {
+      beanLog.log(TRACE, "   MGET {0}({1}) - hits:{2}", cacheName, ids, beanDataMap.keySet());
     }
     BeanCacheResult<T> result = new BeanCacheResult<>();
     for (Map.Entry<Object, Object> entry : beanDataMap.entrySet()) {
@@ -375,8 +376,8 @@ final class BeanDescriptorCacheHelp<T> {
 
     // naturalKey -> Id map
     Map<Object, Object> naturalKeyMap = naturalKeyCache.getAll(keys);
-    if (natLog.isLoggable(Level.TRACE)) {
-      natLog.log(Level.TRACE, " MLOOKUP {0}({1}) - hits:{2}", cacheName, keys, naturalKeyMap);
+    if (natLog.isLoggable(TRACE)) {
+      natLog.log(TRACE, " MLOOKUP {0}({1}) - hits:{2}", cacheName, keys, naturalKeyMap);
     }
 
     BeanCacheResult<T> result = new BeanCacheResult<>();
@@ -392,8 +393,8 @@ final class BeanDescriptorCacheHelp<T> {
 
     Set<Object> ids = new HashSet<>(naturalKeyMap.values());
     Map<Object, Object> beanDataMap = beanCache.getAll(ids);
-    if (beanLog.isLoggable(Level.TRACE)) {
-      beanLog.log(Level.TRACE, "   MGET {0}({1}) - hits:{2}", cacheName, ids, beanDataMap.keySet());
+    if (beanLog.isLoggable(TRACE)) {
+      beanLog.log(TRACE, "   MGET {0}({1}) - hits:{2}", cacheName, ids, beanDataMap.keySet());
     }
     // process the hits into beans etc
     for (Map.Entry<Object, Object> entry : beanDataMap.entrySet()) {
@@ -437,8 +438,8 @@ final class BeanDescriptorCacheHelp<T> {
    */
   void beanCacheClear() {
     if (beanCache != null) {
-      if (beanLog.isLoggable(Level.DEBUG)) {
-        beanLog.log(Level.DEBUG, "   CLEAR {0}", cacheName);
+      if (beanLog.isLoggable(DEBUG)) {
+        beanLog.log(DEBUG, "   CLEAR {0}", cacheName);
       }
       beanCache.clear();
     }
@@ -507,14 +508,14 @@ final class BeanDescriptorCacheHelp<T> {
         }
       }
     }
-    if (beanLog.isLoggable(Level.DEBUG)) {
-      beanLog.log(Level.DEBUG, "   MPUT {0}({1})", cacheName, map.keySet());
+    if (beanLog.isLoggable(DEBUG)) {
+      beanLog.log(DEBUG, "   MPUT {0}({1})", cacheName, map.keySet());
     }
     getBeanCache().putAll(map);
 
     if (natKeys != null && !natKeys.isEmpty()) {
-      if (natLog.isLoggable(Level.DEBUG)) {
-        natLog.log(Level.DEBUG, " MPUT {0}({1}, {2})", cacheName, naturalKey, natKeys.keySet());
+      if (natLog.isLoggable(DEBUG)) {
+        natLog.log(DEBUG, " MPUT {0}({1}, {2})", cacheName, naturalKey, natKeys.keySet());
       }
       naturalKeyCache.putAll(natKeys);
     }
@@ -526,15 +527,15 @@ final class BeanDescriptorCacheHelp<T> {
   void beanCachePutDirect(EntityBean bean) {
     CachedBeanData beanData = beanExtractData(desc, bean);
     String key = desc.cacheKeyForBean(bean);
-    if (beanLog.isLoggable(Level.DEBUG)) {
-      beanLog.log(Level.DEBUG, "   PUT {0}({1}) data:{2}", cacheName, key, beanData);
+    if (beanLog.isLoggable(DEBUG)) {
+      beanLog.log(DEBUG, "   PUT {0}({1}) data:{2}", cacheName, key, beanData);
     }
     getBeanCache().put(key, beanData);
     if (naturalKey != null) {
       String naturalKey = calculateNaturalKey(beanData);
       if (naturalKey != null) {
-        if (natLog.isLoggable(Level.DEBUG)) {
-          natLog.log(Level.DEBUG, " PUT {0}({1}, {2})", cacheName, naturalKey, key);
+        if (natLog.isLoggable(DEBUG)) {
+          natLog.log(DEBUG, " PUT {0}({1}, {2})", cacheName, naturalKey, key);
         }
         naturalKeyCache.put(naturalKey, key);
       }
@@ -575,13 +576,13 @@ final class BeanDescriptorCacheHelp<T> {
   private T beanCacheGetInternal(String key, Boolean readOnly, PersistenceContext context) {
     CachedBeanData data = (CachedBeanData) getBeanCache().get(key);
     if (data == null) {
-      if (beanLog.isLoggable(Level.TRACE)) {
-        beanLog.log(Level.TRACE, "   GET {0}({1}) - cache miss", cacheName, key);
+      if (beanLog.isLoggable(TRACE)) {
+        beanLog.log(TRACE, "   GET {0}({1}) - cache miss", cacheName, key);
       }
       return null;
     }
-    if (beanLog.isLoggable(Level.TRACE)) {
-      beanLog.log(Level.TRACE, "   GET {0}({1}) - hit", cacheName, key);
+    if (beanLog.isLoggable(TRACE)) {
+      beanLog.log(TRACE, "   GET {0}({1}) - hit", cacheName, key);
     }
     return convertToBean(key, readOnly, context, data);
   }
@@ -591,8 +592,8 @@ final class BeanDescriptorCacheHelp<T> {
     if (cacheSharableBeans && !Boolean.FALSE.equals(readOnly)) {
       Object bean = data.getSharableBean();
       if (bean != null) {
-        if (beanLog.isLoggable(Level.TRACE)) {
-          beanLog.log(Level.TRACE, "   GET {0}({1}) - hit shared bean", cacheName, id);
+        if (beanLog.isLoggable(TRACE)) {
+          beanLog.log(TRACE, "   GET {0}({1}) - hit shared bean", cacheName, id);
         }
         if (desc.isReadAuditing()) {
           desc.readAuditBean("l2", "", bean);
@@ -680,8 +681,8 @@ final class BeanDescriptorCacheHelp<T> {
    */
   void beanCacheApplyInvalidate(Collection<String> keys) {
     if (beanCache != null) {
-      if (beanLog.isLoggable(Level.DEBUG)) {
-        beanLog.log(Level.DEBUG, "   MREMOVE {0}({1})", cacheName, keys);
+      if (beanLog.isLoggable(DEBUG)) {
+        beanLog.log(DEBUG, "   MREMOVE {0}({1})", cacheName, keys);
       }
       beanCache.removeAll(new HashSet<>(keys));
     }
@@ -700,8 +701,8 @@ final class BeanDescriptorCacheHelp<T> {
     }
 
     Map<Object, Object> hits = getBeanCache().getAll(ebis.keySet());
-    if (beanLog.isLoggable(Level.TRACE)) {
-      beanLog.log(Level.TRACE, "   MLOAD {0}({1}) - got hits ({2})", cacheName, ebis.keySet(), hits.size());
+    if (beanLog.isLoggable(TRACE)) {
+      beanLog.log(TRACE, "   MLOAD {0}({1}) - got hits ({2})", cacheName, ebis.keySet(), hits.size());
     }
 
     Set<EntityBeanIntercept> loaded = new HashSet<>();
@@ -713,19 +714,19 @@ final class BeanDescriptorCacheHelp<T> {
       CachedBeanData cacheData = (CachedBeanData) hit.getValue();
 
       if (lazyLoadProperty > -1 && !cacheData.isLoaded(propertyName)) {
-        if (beanLog.isLoggable(Level.TRACE)) {
-          beanLog.log(Level.TRACE, "   load {0}({1}) - cache miss on property({2})", cacheName, key, propertyName);
+        if (beanLog.isLoggable(TRACE)) {
+          beanLog.log(TRACE, "   load {0}({1}) - cache miss on property({2})", cacheName, key, propertyName);
         }
       } else {
         CachedBeanDataToBean.load(desc, ebi.getOwner(), cacheData, context);
         loaded.add(ebi);
-        if (beanLog.isLoggable(Level.DEBUG)) {
-          beanLog.log(Level.DEBUG, "   load {0}({1}) - hit", cacheName, key);
+        if (beanLog.isLoggable(DEBUG)) {
+          beanLog.log(DEBUG, "   load {0}({1}) - hit", cacheName, key);
         }
       }
     }
-    if (!ebis.isEmpty() && beanLog.isLoggable(Level.TRACE)) {
-      beanLog.log(Level.TRACE, "   load {0}({1}) - cache miss", cacheName, ebis.keySet());
+    if (!ebis.isEmpty() && beanLog.isLoggable(TRACE)) {
+      beanLog.log(TRACE, "   load {0}({1}) - cache miss", cacheName, ebis.keySet());
     }
     return loaded;
   }
@@ -736,21 +737,21 @@ final class BeanDescriptorCacheHelp<T> {
   boolean beanCacheLoad(EntityBean bean, EntityBeanIntercept ebi, String key, PersistenceContext context) {
     CachedBeanData cacheData = (CachedBeanData) getBeanCache().get(key);
     if (cacheData == null) {
-      if (beanLog.isLoggable(Level.TRACE)) {
-        beanLog.log(Level.TRACE, "   LOAD {0}({1}) - cache miss", cacheName, key);
+      if (beanLog.isLoggable(TRACE)) {
+        beanLog.log(TRACE, "   LOAD {0}({1}) - cache miss", cacheName, key);
       }
       return false;
     }
     int lazyLoadProperty = ebi.getLazyLoadPropertyIndex();
     if (lazyLoadProperty > -1 && !cacheData.isLoaded(ebi.getLazyLoadProperty())) {
-      if (beanLog.isLoggable(Level.TRACE)) {
-        beanLog.log(Level.TRACE, "   LOAD {0}({1}) - cache miss on property({2})", cacheName, key, ebi.getLazyLoadProperty());
+      if (beanLog.isLoggable(TRACE)) {
+        beanLog.log(TRACE, "   LOAD {0}({1}) - cache miss on property({2})", cacheName, key, ebi.getLazyLoadProperty());
       }
       return false;
     }
     CachedBeanDataToBean.load(desc, bean, cacheData, context);
-    if (beanLog.isLoggable(Level.DEBUG)) {
-      beanLog.log(Level.DEBUG, "   LOAD {0}({1}) - hit", cacheName, key);
+    if (beanLog.isLoggable(DEBUG)) {
+      beanLog.log(DEBUG, "   LOAD {0}({1}) - hit", cacheName, key);
     }
     return true;
   }
@@ -874,8 +875,8 @@ final class BeanDescriptorCacheHelp<T> {
     if (existingData != null) {
       long currentVersion = existingData.getVersion();
       if (version > 0 && version < currentVersion) {
-        if (beanLog.isLoggable(Level.DEBUG)) {
-          beanLog.log(Level.DEBUG, "   REMOVE {0}({1}) - version conflict old:{2} new:{3}", cacheName, key, currentVersion, version);
+        if (beanLog.isLoggable(DEBUG)) {
+          beanLog.log(DEBUG, "   REMOVE {0}({1}) - version conflict old:{2} new:{3}", cacheName, key, currentVersion, version);
         }
         cache.remove(key);
       } else {
@@ -883,16 +884,16 @@ final class BeanDescriptorCacheHelp<T> {
           version = currentVersion;
         }
         CachedBeanData newData = existingData.update(changes, version);
-        if (beanLog.isLoggable(Level.DEBUG)) {
-          beanLog.log(Level.DEBUG, "   UPDATE {0}({1})  changes:{2}", cacheName, key, changes);
+        if (beanLog.isLoggable(DEBUG)) {
+          beanLog.log(DEBUG, "   UPDATE {0}({1})  changes:{2}", cacheName, key, changes);
         }
         cache.put(key, newData);
       }
       if (updateNaturalKey) {
         Object oldKey = calculateNaturalKey(existingData);
         if (oldKey != null) {
-          if (natLog.isLoggable(Level.DEBUG)) {
-            natLog.log(Level.DEBUG, ".. update {0} REMOVE({1}) - old key for ({2})", cacheName, oldKey, key);
+          if (natLog.isLoggable(DEBUG)) {
+            natLog.log(DEBUG, ".. update {0} REMOVE({1}) - old key for ({2})", cacheName, oldKey, key);
           }
           naturalKeyCache.remove(oldKey);
         }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 0074b550a..bfdc4cd17 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -47,12 +47,13 @@ import javax.persistence.PersistenceException;
 import javax.persistence.Transient;
 import javax.sql.DataSource;
 import java.io.Serializable;
-import java.lang.System.Logger.Level;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Creates BeanDescriptors.
  */
@@ -309,7 +310,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     } catch (BeanNotEnhancedException e) {
       throw e;
     } catch (RuntimeException e) {
-      log.log(Level.ERROR, "Error in deployment", e);
+      log.log(ERROR, "Error in deployment", e);
       throw e;
     }
   }
@@ -332,13 +333,13 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     try {
       entityClass = Class.forName(entityClassName, false, classLoader);
     } catch (Exception e) {
-      log.log(Level.ERROR, "Could not load entity bean class " + entityClassName + " for ebean.xml entry");
+      log.log(ERROR, "Could not load entity bean class " + entityClassName + " for ebean.xml entry");
       return;
     }
 
     DeployBeanInfo<?> info = deployInfoMap.get(entityClass);
     if (info == null) {
-      log.log(Level.ERROR, "No entity bean for ebean.xml entry " + entityClassName);
+      log.log(ERROR, "No entity bean for ebean.xml entry " + entityClassName);
 
     } else {
       for (XmapRawSql sql : entityDeploy.getRawSql()) {
@@ -601,11 +602,11 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     int pc = postConstructManager.getRegisterCount();
     int lc = persistListenerManager.getRegisterCount();
     int fc = beanFinderManager.getRegisterCount();
-    log.log(Level.DEBUG, "BeanPersistControllers[{0}] BeanFinders[{1}] BeanPersistListeners[{2}] BeanQueryAdapters[{3}] BeanPostLoaders[{4}] BeanPostConstructors[{5}]", cc, fc, lc, qa, pl, pc);
+    log.log(DEBUG, "BeanPersistControllers[{0}] BeanFinders[{1}] BeanPersistListeners[{2}] BeanQueryAdapters[{3}] BeanPostLoaders[{4}] BeanPostConstructors[{5}]", cc, fc, lc, qa, pl, pc);
   }
 
   private void logStatus() {
-    log.log(Level.DEBUG, "Entities[{0}]", entityBeanCount);
+    log.log(DEBUG, "Entities[{0}]", entityBeanCount);
   }
 
   /**
@@ -867,10 +868,10 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
           if (possibleLower.contains(searchName)) {
             // we have a match
             prop.setMappedBy(possibleMappedBy);
-            if (log.isLoggable(Level.DEBUG)) {
+            if (log.isLoggable(DEBUG)) {
               String m = "Implicitly found mappedBy for " + targetDesc + "." + prop;
               m += " by searching for [" + searchName + "] against " + matchSet;
-              log.log(Level.DEBUG, m);
+              log.log(DEBUG, m);
             }
             return true;
           }
@@ -1207,12 +1208,12 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     final DeployIdentityMode identityMode = desc.getIdentityMode();
     if (identityMode.isSequence() && !dbIdentity.isSupportsSequence()) {
       // explicit sequence but not supported by the DatabasePlatform
-      log.log(Level.INFO, "Explicit sequence on {0} but not supported by DB Platform - ignored", desc.getFullName());
+      log.log(INFO, "Explicit sequence on {0} but not supported by DB Platform - ignored", desc.getFullName());
       identityMode.setIdType(IdType.AUTO);
     }
     if (identityMode.isIdentity() && !dbIdentity.isSupportsIdentity()) {
       // explicit identity but not supported by the DatabasePlatform
-      log.log(Level.INFO, "Explicit Identity on {0} but not supported by DB Platform - ignored", desc.getFullName());
+      log.log(INFO, "Explicit Identity on {0} but not supported by DB Platform - ignored", desc.getFullName());
       identityMode.setIdType(IdType.AUTO);
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index a119ddb90..2133ef767 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -44,7 +44,6 @@ import javax.persistence.PersistenceException;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import java.lang.System.Logger.Level;
 import java.lang.reflect.Field;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -52,6 +51,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Description of a property of a bean. Includes its deployment information such
  * as database column mapping information.
@@ -1434,7 +1435,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
           objValue = null;
           String msg = "Error trying to use Jackson ObjectMapper to read transient property "
             + fullName() + " - consider marking this property with @JsonIgnore";
-          CoreLog.log.log(Level.ERROR, msg, e);
+          CoreLog.log.log(ERROR, msg, e);
         }
       }
       if (jsonDeserialize) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index c2bd2bb4d..d98f6d849 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -27,10 +27,11 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.support.DocStructure;
 
 import javax.persistence.PersistenceException;
-import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Abstract base for properties mapped to an associated bean, list, set or map.
  */
@@ -433,7 +434,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
     if (!idProp.isEmbedded()) {
       // simple single scalar id
       if (cols.length != 1) {
-        CoreLog.log.log(Level.ERROR, "No Imported Id column for [" + idProp + "] in table [" + join.getTable() + "]");
+        CoreLog.log.log(ERROR, "No Imported Id column for [" + idProp + "] in table [" + join.getTable() + "]");
         return null;
       } else {
         BeanProperty[] idProps = {idProp};
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index fab75feea..a96ea496e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -24,9 +24,10 @@ import io.ebeaninternal.server.query.SqlBeanLoad;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.lang.System.Logger.Level;
 import java.util.*;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Property mapped to a List Set or Map.
  */
@@ -668,7 +669,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
         }
       } catch (PersistenceException e) {
         // not found as individual scalar properties
-        CoreLog.log.log(Level.ERROR, "Could not find a exported property?", e);
+        CoreLog.log.log(ERROR, "Could not find a exported property?", e);
       }
     } else {
       if (idProp != null) {
@@ -963,7 +964,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
         setValue(bean, collection);
       }
     } catch (Exception e) {
-      CoreLog.log.log(Level.ERROR, "Error setting value from L2 cache", e);
+      CoreLog.log.log(ERROR, "Error setting value from L2 cache", e);
     }
   }
 
@@ -976,7 +977,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
       }
       return jsonWriteCollection(collection);
     } catch (Exception e) {
-      CoreLog.log.log(Level.ERROR, "Error building value element collection json for L2 cache", e);
+      CoreLog.log.log(ERROR, "Error building value element collection json for L2 cache", e);
       return null;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
index 80bed8585..0cc2f6ccf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanTable;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 
-import java.lang.System.Logger.Level;
+import static java.lang.System.Logger.Level.DEBUG;
 
 
 /**
@@ -107,7 +107,7 @@ public final class BeanTable {
     if (complexKey) {
       // just to copy the column name rather than prefix with the foreignKeyPrefix.
       // I think that with complex keys this is the more common approach.
-      CoreLog.internal.log(Level.DEBUG, "On table[{0}] foreign key column [{1}]", baseTable, lc);
+      CoreLog.internal.log(DEBUG, "On table[{0}] foreign key column [{1}]", baseTable, lc);
       fk = lc;
     }
     if (sqlFormulaSelect != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
index e37d9ea40..598962fcf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java
@@ -15,7 +15,8 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
 
 import javax.persistence.*;
-import java.lang.System.Logger.Level;
+
+import static java.lang.System.Logger.Level.INFO;
 
 /**
  * Read the deployment annotations for Associated One beans.
@@ -214,10 +215,10 @@ final class AnnotationAssocOnes extends AnnotationAssoc {
     prop.setPrimaryKeyJoin(true);
 
     if (!primaryKeyJoin.name().isEmpty()) {
-      CoreLog.internal.log(Level.INFO, "Automatically determining join columns for @PrimaryKeyJoinColumn - ignoring PrimaryKeyJoinColumn.name attribute [{0}] on {1}", primaryKeyJoin.name(), prop.getFullBeanName());
+      CoreLog.internal.log(INFO, "Automatically determining join columns for @PrimaryKeyJoinColumn - ignoring PrimaryKeyJoinColumn.name attribute [{0}] on {1}", primaryKeyJoin.name(), prop.getFullBeanName());
     }
     if (!primaryKeyJoin.referencedColumnName().isEmpty()) {
-      CoreLog.internal.log(Level.INFO, "Automatically determining join columns for @PrimaryKeyJoinColumn - Ignoring PrimaryKeyJoinColumn.referencedColumnName attribute [{0}] on {1}", primaryKeyJoin.referencedColumnName(), prop.getFullBeanName());
+      CoreLog.internal.log(INFO, "Automatically determining join columns for @PrimaryKeyJoinColumn - Ignoring PrimaryKeyJoinColumn.referencedColumnName attribute [{0}] on {1}", primaryKeyJoin.referencedColumnName(), prop.getFullBeanName());
     }
     BeanTable baseBeanTable = factory.beanTable(info.getDescriptor().getBeanType());
     String localPrimaryKey = baseBeanTable.getIdColumn();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
index 36fdc915f..662b73be8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java
@@ -1,19 +1,7 @@
 package io.ebeaninternal.server.deploy.parse;
 
-import io.ebean.annotation.Cache;
-import io.ebean.annotation.DbComment;
-import io.ebean.annotation.DbPartition;
-import io.ebean.annotation.DocStore;
-import io.ebean.annotation.Draftable;
-import io.ebean.annotation.DraftableElement;
-import io.ebean.annotation.History;
-import io.ebean.annotation.Identity;
 import io.ebean.annotation.Index;
-import io.ebean.annotation.InvalidateQueryCache;
-import io.ebean.annotation.ReadAudit;
-import io.ebean.annotation.StorageEngine;
-import io.ebean.annotation.Tablespace;
-import io.ebean.annotation.View;
+import io.ebean.annotation.*;
 import io.ebean.config.TableName;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
@@ -23,18 +11,10 @@ import io.ebeaninternal.server.deploy.PartitionMeta;
 import io.ebeaninternal.server.deploy.TablespaceMeta;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.IdClass;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import java.lang.System.Logger.Level;
+import javax.persistence.*;
 
 import static io.ebean.util.AnnotationUtil.typeGet;
+import static java.lang.System.Logger.Level.ERROR;
 
 /**
  * Read the class level deployment annotations.
@@ -67,7 +47,7 @@ final class AnnotationClass extends AnnotationParser {
       Column column = override.column();
       DeployBeanProperty beanProperty = descriptor.getBeanProperty(propertyName);
       if (beanProperty == null) {
-        CoreLog.log.log(Level.ERROR, "AttributeOverride property [" + propertyName + "] not found on " + descriptor.getFullName());
+        CoreLog.log.log(ERROR, "AttributeOverride property [" + propertyName + "] not found on " + descriptor.getFullName());
       } else {
         readColumn(column, beanProperty);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index 14579b621..cab048376 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -11,9 +11,10 @@ import io.ebeaninternal.server.type.TypeManager;
 
 import javax.persistence.PersistenceException;
 import javax.persistence.Transient;
-import java.lang.System.Logger.Level;
 import java.lang.reflect.*;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Create the properties for a bean.
  * <p>
@@ -85,7 +86,7 @@ public final class DeployCreateProperties {
             if (replaced != null && !replaced.isTransient()) {
               String msg = "Huh??? property " + prop.getFullBeanName() + " being defined twice";
               msg += " but replaced property was not transient? This is not expected?";
-              CoreLog.log.log(Level.WARNING, msg);
+              CoreLog.log.log(WARNING, msg);
             }
           }
         }
@@ -112,7 +113,7 @@ public final class DeployCreateProperties {
         return new DeployBeanPropertySimpleCollection(desc, targetType, manyType);
       }
     } catch (NullPointerException e) {
-      CoreLog.internal.log(Level.DEBUG, "expected non-scalar type {0}", e.getMessage());
+      CoreLog.internal.log(DEBUG, "expected non-scalar type {0}", e.getMessage());
     }
     return new DeployBeanPropertyAssocMany(desc, targetType, manyType);
   }
@@ -133,7 +134,7 @@ public final class DeployCreateProperties {
           // not supporting this field (generic type used)
           return null;
         }
-        CoreLog.internal.log(Level.WARNING, "Could not find parameter type (via reflection) on " + desc.getFullName() + " " + field.getName());
+        CoreLog.internal.log(WARNING, "Could not find parameter type (via reflection) on " + desc.getFullName() + " " + field.getName());
       }
       return createManyType(desc, targetType, manyType);
     }
@@ -152,7 +153,7 @@ public final class DeployCreateProperties {
       return new DeployBeanPropertyAssocOne(desc, propertyType);
 
     } catch (Exception e) {
-      CoreLog.log.log(Level.ERROR, "Error with " + desc + " field:" + field.getName(), e);
+      CoreLog.log.log(ERROR, "Error with " + desc + " field:" + field.getName(), e);
       return null;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
index 454bc65e1..67f4d9912 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java
@@ -3,13 +3,14 @@ package io.ebeaninternal.server.dto;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.type.TypeManager;
 
-import java.lang.System.Logger.Level;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Build the DtoMeta for a bean.
  * <p>
@@ -40,7 +41,7 @@ final class DtoMetaBuilder {
           final String name = propertyName(method.getName());
           properties.add(new DtoMetaProperty(typeManager, dtoType, method, name));
         } catch (Exception e) {
-          CoreLog.log.log(Level.DEBUG, "exclude on " + dtoType + " method " + method, e);
+          CoreLog.log.log(DEBUG, "exclude on " + dtoType + " method " + method, e);
         }
       }
     }
@@ -78,7 +79,7 @@ final class DtoMetaBuilder {
         constructorList.add(new DtoMetaConstructor(typeManager, constructor, dtoType));
       } catch (Exception e) {
         // we don't want that constructor
-        CoreLog.log.log(Level.DEBUG, "exclude on " + dtoType + " constructor " + constructor, e);
+        CoreLog.log.log(DEBUG, "exclude on " + dtoType + " constructor " + constructor, e);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonExecutorService.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonExecutorService.java
index de9b959ef..ea7ce58e4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonExecutorService.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonExecutorService.java
@@ -2,10 +2,11 @@ package io.ebeaninternal.server.executor;
 
 import io.avaje.applog.AppLog;
 
-import java.lang.System.Logger.Level;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * A "CachedThreadPool" based on Daemon threads.
  * <p>
@@ -43,19 +44,19 @@ final class DaemonExecutorService {
     lock.lock();
     try {
       if (service.isShutdown()) {
-        logger.log(Level.DEBUG, "DaemonExecutorService[{0}] already shut down", namePrefix);
+        logger.log(DEBUG, "DaemonExecutorService[{0}] already shut down", namePrefix);
         return;
       }
       try {
-        logger.log(Level.DEBUG, "DaemonExecutorService[{0}] shutting down...", namePrefix);
+        logger.log(DEBUG, "DaemonExecutorService[{0}] shutting down...", namePrefix);
         service.shutdown();
         if (!service.awaitTermination(shutdownWaitSeconds, TimeUnit.SECONDS)) {
-          logger.log(Level.INFO, "DaemonExecutorService[{0}] shut down timeout exceeded. Terminating running threads.", namePrefix);
+          logger.log(INFO, "DaemonExecutorService[{0}] shut down timeout exceeded. Terminating running threads.", namePrefix);
           service.shutdownNow();
         }
 
       } catch (Exception e) {
-        logger.log(Level.ERROR, "Error during shutdown of DaemonThreadPool[" + namePrefix + "]", e);
+        logger.log(ERROR, "Error during shutdown of DaemonThreadPool[" + namePrefix + "]", e);
         e.printStackTrace();
       }
     } finally {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
index 1a7c23b3e..1dd961c6c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DaemonScheduleThreadPool.java
@@ -2,11 +2,12 @@ package io.ebeaninternal.server.executor;
 
 import io.ebeaninternal.api.CoreLog;
 
-import java.lang.System.Logger.Level;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Daemon based ScheduleThreadPool.
  */
@@ -38,19 +39,19 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
     lock.lock();
     try {
       if (super.isShutdown()) {
-        log.log(Level.DEBUG, "Already shutdown threadPool {0}", namePrefix);
+        log.log(DEBUG, "Already shutdown threadPool {0}", namePrefix);
         return;
       }
       try {
-        log.log(Level.TRACE, "shutting down threadPool {0}", namePrefix);
+        log.log(TRACE, "shutting down threadPool {0}", namePrefix);
         super.shutdown();
         if (!super.awaitTermination(shutdownWaitSeconds, TimeUnit.SECONDS)) {
-          log.log(Level.INFO, "Shutdown wait timeout exceeded. Terminating running threads for {0}", namePrefix);
+          log.log(INFO, "Shutdown wait timeout exceeded. Terminating running threads for {0}", namePrefix);
           super.shutdownNow();
         }
-        log.log(Level.TRACE, "shutdown complete for threadPool {0}", namePrefix);
+        log.log(TRACE, "shutdown complete for threadPool {0}", namePrefix);
       } catch (Exception e) {
-        log.log(Level.ERROR, "Error during shutdown of threadPool " + namePrefix, e);
+        log.log(ERROR, "Error during shutdown of threadPool " + namePrefix, e);
         e.printStackTrace();
       }
     } finally {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
index ce0254a22..f134f9da7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
@@ -5,9 +5,10 @@ import io.avaje.lang.NonNullApi;
 import io.ebean.config.BackgroundExecutorWrapper;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
 
-import java.lang.System.Logger.Level;
 import java.util.concurrent.*;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * The default implementation of the BackgroundExecutor.
  */
@@ -27,7 +28,7 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
     this.schedulePool = new DaemonScheduleThreadPool(schedulePoolSize, shutdownWaitSeconds, namePrefix + "-periodic-");
     this.pool = new DaemonExecutorService(shutdownWaitSeconds, namePrefix);
     this.wrapper = wrapper;
-    log.log(Level.DEBUG, "Created backgroundExecutor {0} (schedulePoolSize={1}, shutdownWaitSeconds={2})", namePrefix, schedulePoolSize, shutdownWaitSeconds);
+    log.log(DEBUG, "Created backgroundExecutor {0} (schedulePoolSize={1}, shutdownWaitSeconds={2})", namePrefix, schedulePoolSize, shutdownWaitSeconds);
   }
 
   /**
@@ -64,14 +65,14 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
    */
   private Runnable logExceptions(Runnable task) {
     long queued = System.nanoTime();
-    log.log(Level.TRACE, "Queued {0}", task);
+    log.log(TRACE, "Queued {0}", task);
     return () -> {
       try {
-        if (log.isLoggable(Level.TRACE)) {
+        if (log.isLoggable(TRACE)) {
           long start = System.nanoTime();
-          log.log(Level.TRACE, "Start {0} (delay time {1} us)", task, (start - queued) / 1000L);
+          log.log(TRACE, "Start {0} (delay time {1} us)", task, (start - queued) / 1000L);
           task.run();
-          log.log(Level.TRACE, "Stop {0} (exec time {1} us)", task, (System.nanoTime() - start) / 1000L);
+          log.log(TRACE, "Stop {0} (exec time {1} us)", task, (System.nanoTime() - start) / 1000L);
         } else {
           task.run();
         }
@@ -79,7 +80,7 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
         // log any exception here. Note they will not bubble up to the calling user
         // unless Future.get() is checked. (Which is almost never done on scheduled
         // background executions)
-        log.log(Level.ERROR, "Error while executing the task " + task, t);
+        log.log(ERROR, "Error while executing the task " + task, t);
         throw t;
       }
     };
@@ -127,10 +128,10 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
 
   @Override
   public void shutdown() {
-    log.log(Level.TRACE, "BackgroundExecutor shutting down");
+    log.log(TRACE, "BackgroundExecutor shutting down");
     schedulePool.shutdown();
     pool.shutdown();
-    log.log(Level.DEBUG, "BackgroundExecutor stopped");
+    log.log(DEBUG, "BackgroundExecutor stopped");
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
index c7ae7e0d3..d17a8385d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
@@ -1,12 +1,13 @@
 package io.ebeaninternal.server.idgen;
 
 import java.io.*;
-import java.lang.System.Logger.Level;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * IdGenerator for java util UUID.
  * <p>
@@ -82,7 +83,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
           }
         }
       } catch (SocketException ex) {
-        log.log(Level.DEBUG, "Skipping " + network, ex);
+        log.log(DEBUG, "Skipping " + network, ex);
       }
     }
     return fallbackAddr;
@@ -119,7 +120,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
         // See, if there is an alternative MAC address set.
         nodeId = parseAlternativeNodeId(altNodeId);
         restoreState();
-        log.log(Level.INFO, "Explicitly using ID {0} to generate Type 1 UUIDs", getNodeIdentifier());
+        log.log(INFO, "Explicitly using ID {0} to generate Type 1 UUIDs", getNodeIdentifier());
       }
       UUID uuid = nextId(null);
       long ts = timeStamp.get();
@@ -127,9 +128,9 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
       ts /= MILLIS_TO_UUID;
 
       saveState();
-      log.log(Level.DEBUG, "Saved state: clockSeq {0}, timestamp {1}, uuid {2}, stateFile: {3})", clockSeq.get(), new Date(ts), uuid, stateFile);
+      log.log(DEBUG, "Saved state: clockSeq {0}, timestamp {1}, uuid {2}, stateFile: {3})", clockSeq.get(), new Date(ts), uuid, stateFile);
     } catch (IOException e) {
-      log.log(Level.ERROR, "There was a problem while detecting the nodeId. Falling back to random mode. Try using to specify 'ebean.uuidNodeId' property", e);
+      log.log(ERROR, "There was a problem while detecting the nodeId. Falling back to random mode. Try using to specify 'ebean.uuidNodeId' property", e);
       useRandomMode();
     }
   }
@@ -146,16 +147,16 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
     try {
       nodeId = getHardwareId();
     } catch (IOException e) {
-      log.log(Level.ERROR, "Error while reading MAC address. Fall back to 'generate' mode", e);
+      log.log(ERROR, "Error while reading MAC address. Fall back to 'generate' mode", e);
       tryGenerateMode();
     }
 
     if (nodeId != null) {
       restoreState();
-      log.log(Level.INFO, "Using MAC {0} to generate Type 1 UUIDs", getNodeIdentifier());
+      log.log(INFO, "Using MAC {0} to generate Type 1 UUIDs", getNodeIdentifier());
       return;
     }
-    log.log(Level.WARNING, "No suitable network interface found. Fall back to 'generate' mode");
+    log.log(WARNING, "No suitable network interface found. Fall back to 'generate' mode");
     tryGenerateMode();
   }
 
@@ -165,11 +166,11 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
    */
   private void tryGenerateMode() throws IOException {
     if (restoreState()) {
-      log.log(Level.INFO, "Using recently generated nodeId {0} to generate Type 1 UUIDs", getNodeIdentifier());
+      log.log(INFO, "Using recently generated nodeId {0} to generate Type 1 UUIDs", getNodeIdentifier());
     } else {
       // RFC 4.5 use random portion for node
       nodeId = super.getNodeIdBytes();
-      log.log(Level.INFO, "Using a newly generated nodeId {0} to generate Type 1 UUIDs", getNodeIdentifier());
+      log.log(INFO, "Using a newly generated nodeId {0} to generate Type 1 UUIDs", getNodeIdentifier());
     }
   }
 
@@ -180,7 +181,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
   private void useRandomMode() {
     canSaveState = false;
     nodeId = super.getNodeIdBytes();
-    log.log(Level.INFO, "Explicitly using a new random ID {0} to generate Type 1 UUIDs", getNodeIdentifier());
+    log.log(INFO, "Explicitly using a new random ID {0} to generate Type 1 UUIDs", getNodeIdentifier());
   }
 
   /**
@@ -211,14 +212,14 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
 
     String propNodeId = prop.getProperty("nodeId");
     if (propNodeId == null || propNodeId.isEmpty()) {
-      log.log(Level.WARNING, "State file '{0}' is incomplete", stateFile);
+      log.log(WARNING, "State file '{0}' is incomplete", stateFile);
       return false; // we cannot restore
     }
     try {
       if (nodeId == null) {
         nodeId = parseAlternativeNodeId(propNodeId);
       } else if (!getNodeIdentifier().equals(propNodeId)) {
-        log.log(Level.WARNING,
+        log.log(WARNING,
           "The nodeId in the state file '{0}' has changed from {1} to {2}. "
             + "This can happen when MAC address changes or when two containers share the same state file",
           stateFile, propNodeId, getNodeIdentifier());
@@ -231,7 +232,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
       return true;
 
     } catch (IllegalArgumentException nfe) {
-      log.log(Level.ERROR, "State file corrupt: " + stateFile, nfe);
+      log.log(ERROR, "State file corrupt: " + stateFile, nfe);
     }
     return false;
   }
@@ -255,7 +256,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
     try (OutputStream os = new FileOutputStream(stateFile)) {
       prop.store(os, "ebean uuid state file");
     } catch (IOException e) {
-      log.log(Level.ERROR, "Could not persist uuid state to: " + stateFile, e);
+      log.log(ERROR, "Could not persist uuid state to: " + stateFile, e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
index e5a34d135..484d92698 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
@@ -4,13 +4,14 @@ import io.avaje.applog.AppLog;
 import io.ebean.Transaction;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 
-import java.lang.System.Logger.Level;
 import java.security.SecureRandom;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.INFO;
+
 /**
  * IdGenerator for (pseudo) type 1 UUIDs.
  *
@@ -105,7 +106,7 @@ public class UuidV1RndIdGenerator implements PlatformIdGenerator {
 
         delta = current - last;
         if (delta < -10000 * 20000) {
-          log.log(Level.INFO, "Clock skew of {} ms detected", delta / -10000);
+          log.log(INFO, "Clock skew of {} ms detected", delta / -10000);
           // The clock was adjusted back about 2 seconds, or we were generating a lot of ids too fast
           // if so, we try to set the current as last and also increment the clockSeq.
           lock.lock();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
index adc648275..922667037 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/logger/DSpiLogger.java
@@ -2,7 +2,8 @@ package io.ebeaninternal.server.logger;
 
 import io.ebeaninternal.api.SpiLogger;
 
-import java.lang.System.Logger.Level;
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.TRACE;
 
 final class DSpiLogger implements SpiLogger {
 
@@ -14,21 +15,21 @@ final class DSpiLogger implements SpiLogger {
 
   @Override
   public boolean isDebug() {
-    return logger.isLoggable(Level.DEBUG);
+    return logger.isLoggable(DEBUG);
   }
 
   @Override
   public boolean isTrace() {
-    return logger.isLoggable(Level.TRACE);
+    return logger.isLoggable(TRACE);
   }
 
   @Override
   public void debug(String msg) {
-    logger.log(Level.DEBUG, msg);
+    logger.log(DEBUG, msg);
   }
 
   @Override
   public void trace(String msg) {
-    logger.log(Level.TRACE, msg);
+    logger.log(TRACE, msg);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
index ccf068973..ddd1747a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
@@ -6,13 +6,14 @@ import io.ebeaninternal.api.SpiTransaction;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.System.Logger.Level;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * A batched statement that is held in BatchedPstmtHolder. It has a list of
  * BatchPostExecute which it will process after the statement is executed.
@@ -136,7 +137,7 @@ public final class BatchedPstmt implements SpiProfileTransactionEvent {
       try {
         pstmt.close();
       } catch (SQLException e) {
-        CoreLog.log.log(Level.WARNING, "BatchedPstmt Error closing statement", e);
+        CoreLog.log.log(WARNING, "BatchedPstmt Error closing statement", e);
       } finally {
         pstmt = null;
       }
@@ -202,7 +203,7 @@ public final class BatchedPstmt implements SpiProfileTransactionEvent {
         try {
           inputStream.close();
         } catch (IOException e) {
-          CoreLog.log.log(Level.WARNING, "BatchedPstmt Error closing inputStream ", e);
+          CoreLog.log.log(WARNING, "BatchedPstmt Error closing inputStream ", e);
         }
       }
       inputStreams = null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 779362ee8..de8e16eb0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -12,12 +12,13 @@ import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.type.*;
 
 import javax.persistence.PersistenceException;
-import java.lang.System.Logger.Level;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.util.Collection;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * Binds bean values to a PreparedStatement.
  */
@@ -133,7 +134,7 @@ public final class Binder {
       }
 
     } catch (SQLException ex) {
-      CoreLog.log.log(Level.WARNING, "error binding parameter [{0}][{1}]", (dataBind.currentPos() - 1), value);
+      CoreLog.log.log(WARNING, "error binding parameter [{0}][{1}]", (dataBind.currentPos() - 1), value);
       throw ex;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 728c4efcb..104ccbe74 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -13,10 +13,12 @@ import io.ebeaninternal.server.core.*;
 import io.ebeaninternal.server.core.PersistRequest.Type;
 import io.ebeaninternal.server.deploy.*;
 
-import java.lang.System.Logger.Level;
 import java.sql.SQLException;
 import java.util.*;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.TRACE;
+
 /**
  * Persister implementation using DML.
  * <p>
@@ -143,7 +145,7 @@ public final class DefaultPersister implements Persister {
     DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);
 
     List<T> liveBeans = draftHandler.fetchSourceBeans(query, false);
-    PUB.log(Level.DEBUG, "draftRestore [{0}] count[{1}]", desc.name(), liveBeans.size());
+    PUB.log(DEBUG, "draftRestore [{0}] count[{1}]", desc.name(), liveBeans.size());
     if (liveBeans.isEmpty()) {
       return Collections.emptyList();
     }
@@ -156,11 +158,11 @@ public final class DefaultPersister implements Persister {
       // reset @DraftDirty and @DraftReset properties
       draftHandler.resetDraft(draftBean);
 
-      PUB.log(Level.TRACE, "draftRestore bean [{0}] id[{1}]", desc.name(), draftHandler.getId());
+      PUB.log(TRACE, "draftRestore bean [{0}] id[{1}]", desc.name(), draftHandler.getId());
       update(createRequest(draftBean, transaction, null, mgr, Type.UPDATE, Flags.RECURSE));
     }
 
-    PUB.log(Level.DEBUG, "draftRestore - complete for [{0}]", desc.name());
+    PUB.log(DEBUG, "draftRestore - complete for [{0}]", desc.name());
     return draftHandler.getDrafts();
   }
 
@@ -185,7 +187,7 @@ public final class DefaultPersister implements Persister {
     DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);
 
     List<T> draftBeans = draftHandler.fetchSourceBeans(query, true);
-    PUB.log(Level.DEBUG, "publish [{0}] count[{1}]", desc.name(), draftBeans.size());
+    PUB.log(DEBUG, "publish [{0}] count[{1}]", desc.name(), draftBeans.size());
     if (draftBeans.isEmpty()) {
       return Collections.emptyList();
     }
@@ -202,7 +204,7 @@ public final class DefaultPersister implements Persister {
       draftHandler.resetDraft(draftBean);
 
       Type persistType = draftHandler.isInsert() ? Type.INSERT : Type.UPDATE;
-      PUB.log(Level.TRACE, "publish bean [{0}] id[{1}] type[{2}]", desc.name(), draftHandler.getId(), persistType);
+      PUB.log(TRACE, "publish bean [{0}] id[{1}] type[{2}]", desc.name(), draftHandler.getId(), persistType);
 
       PersistRequestBean<T> request = createRequest(liveBean, transaction, null, mgr, persistType, Flags.PUBLISH_RECURSE);
       if (persistType == Type.INSERT) {
@@ -214,7 +216,7 @@ public final class DefaultPersister implements Persister {
     }
 
     draftHandler.updateDrafts(transaction, mgr);
-    PUB.log(Level.DEBUG, "publish - complete for [{0}]", desc.name());
+    PUB.log(DEBUG, "publish - complete for [{0}]", desc.name());
     return livePublish;
   }
 
@@ -270,7 +272,7 @@ public final class DefaultPersister implements Persister {
     void updateDrafts(Transaction transaction, BeanManager<T> mgr) {
       if (!draftUpdates.isEmpty()) {
         // update the dirty status on the drafts that have been published
-        PUB.log(Level.DEBUG, "publish - update dirty status on [{0}] drafts", draftUpdates.size());
+        PUB.log(DEBUG, "publish - update dirty status on [{0}] drafts", draftUpdates.size());
         for (T draftUpdate : draftUpdates) {
           update(createRequest(draftUpdate, transaction, null, mgr, Type.UPDATE, Flags.ZERO));
         }
@@ -491,8 +493,8 @@ public final class DefaultPersister implements Persister {
       }
       if (request.isDirty()) {
         request.executeOrQueue();
-      } else if (log.isLoggable(Level.DEBUG)) {
-        log.log(Level.DEBUG, "Update skipped as bean is unchanged: {0}", request.bean());
+      } else if (log.isLoggable(DEBUG)) {
+        log.log(DEBUG, "Update skipped as bean is unchanged: {0}", request.bean());
       }
       if (request.isPersistCascade()) {
         // save all the beans in assocMany's after
@@ -538,8 +540,8 @@ public final class DefaultPersister implements Persister {
     if (req.isRegisteredForDeleteBean()) {
       // skip deleting bean. Used where cascade is on
       // both sides of a relationship
-      if (log.isLoggable(Level.DEBUG)) {
-        log.log(Level.DEBUG, "skipping delete on alreadyRegistered {0}", req.bean());
+      if (log.isLoggable(DEBUG)) {
+        log.log(DEBUG, "skipping delete on alreadyRegistered {0}", req.bean());
       }
       return 0;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
index c839ac9e6..b01d685a3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBase.java
@@ -9,7 +9,8 @@ import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 
 import java.io.IOException;
-import java.lang.System.Logger.Level;
+
+import static java.lang.System.Logger.Level.ERROR;
 
 /**
  * Base for saving entity bean collections and element collections.
@@ -72,7 +73,7 @@ abstract class SaveManyBase implements SaveMany {
           String asJson = many.jsonWriteCollection(value);
           request.addCollectionChange(many.name(), asJson);
         } catch (IOException e) {
-          CoreLog.log.log(Level.ERROR, "Error build element collection entry for L2 cache", e);
+          CoreLog.log.log(ERROR, "Error build element collection entry for L2 cache", e);
         }
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
index 33f353176..88818d687 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
@@ -7,12 +7,12 @@ import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.transaction.TransactionManager;
 import io.ebeaninternal.server.type.bindcapture.BindCapture;
 
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static java.lang.System.Logger.Level.ERROR;
 import static java.util.Collections.emptyList;
 
 public final class CQueryPlanManager implements QueryPlanManager {
@@ -65,7 +65,7 @@ public final class CQueryPlanManager implements QueryPlanManager {
       }
       return req.plans();
     } catch (SQLException e) {
-      CoreLog.log.log(Level.ERROR, "Error during query plan collection", e);
+      CoreLog.log.log(ERROR, "Error during query plan collection", e);
       return emptyList();
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
index 30586c4f7..412c74fc8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
@@ -12,9 +12,10 @@ import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 
-import java.lang.System.Logger.Level;
 import java.util.*;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Factory for SqlTree.
  */
@@ -385,7 +386,7 @@ public final class SqlTreeBuilder {
   private void addPropertyToSubQuery(SqlTreeProperties selectProps, STreeType desc, String propName, String path) {
     STreeProperty p = desc.findPropertyWithDynamic(propName, path);
     if (p == null) {
-      log.log(Level.ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
+      log.log(ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
       return;
     } else if (p instanceof STreePropertyAssoc && p.isEmbedded()) {
       // if the property is embedded we need to lookup the real column name
@@ -420,13 +421,13 @@ public final class SqlTreeBuilder {
           if (p != null) {
             selectProps.add(p);
           } else {
-            log.log(Level.ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
+            log.log(ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
           }
         } else if (p.isEmbedded() || (p instanceof STreePropertyAssoc && !queryProps.isIncludedBeanJoin(p.name()))) {
           // add the embedded bean or the *ToOne assoc bean.  We skip the check that the *ToOne propName maps to Id property ...
           selectProps.add(p);
         } else {
-          log.log(Level.ERROR, "property [{0}] expected to be an embedded or *ToOne bean for query - excluding it.", p.fullName());
+          log.log(ERROR, "property [{0}] expected to be an embedded or *ToOne bean for query - excluding it.", p.fullName());
         }
       }
 
@@ -435,7 +436,7 @@ public final class SqlTreeBuilder {
       // sub class hierarchy if required
       STreeProperty p = desc.findPropertyWithDynamic(propName, queryProps.getPath());
       if (p == null) {
-        log.log(Level.ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
+        log.log(ERROR, "property [{0}] not found on {1} for query - excluding it.", propName, desc);
         p = desc.findProperty("id");
         selectProps.add(p);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
index b49f3baf4..1e14578de 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
@@ -11,9 +11,11 @@ import io.ebeaninternal.api.CoreLog;
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.lang.System.Logger.Level;
 import java.util.Map;
 
+import static java.lang.System.Logger.Level.ERROR;
+import static java.lang.System.Logger.Level.INFO;
+
 /**
  * Default implementation of ReadAuditLogger that writes the event in JSON format to standard loggers.
  */
@@ -48,9 +50,9 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
       }
       gen.writeEndObject();
       gen.flush();
-      queryLogger.log(Level.INFO, writer.toString());
+      queryLogger.log(INFO, writer.toString());
     } catch (IOException e) {
-      CoreLog.log.log(Level.ERROR, "Error writing Read audit event", e);
+      CoreLog.log.log(ERROR, "Error writing Read audit event", e);
     }
   }
 
@@ -75,9 +77,9 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
       StringWriter writer = new StringWriter(defaultReadBuffer);
       JsonGenerator gen = jsonFactory.createGenerator(writer);
       writeDetails(gen, event);
-      auditLogger.log(Level.INFO, writer.toString());
+      auditLogger.log(INFO, writer.toString());
     } catch (IOException e) {
-      CoreLog.log.log(Level.ERROR, "Error writing Read audit event", e);
+      CoreLog.log.log(ERROR, "Error writing Read audit event", e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
index 028b40c19..c690a8061 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java
@@ -11,7 +11,6 @@ import io.ebeaninternal.api.SpiProfileHandler;
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
-import java.lang.System.Logger.Level;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
@@ -22,6 +21,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.*;
 import static java.time.temporal.ChronoField.*;
 
 /**
@@ -79,7 +79,7 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
     this.executor = Executors.newSingleThreadExecutor();
     this.dir = new File(config.getDirectory());
     if (!dir.exists() && !dir.mkdirs()) {
-      log.log(Level.ERROR, "failed to mkdirs " + dir.getAbsolutePath());
+      log.log(ERROR, "failed to mkdirs " + dir.getAbsolutePath());
     }
     incrementFile();
   }
@@ -109,7 +109,7 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
           out.close();
           out = null;
         } catch (IOException e) {
-          log.log(Level.ERROR, "Failed to flush and close transaction profiling file ", e);
+          log.log(ERROR, "Failed to flush and close transaction profiling file ", e);
         }
       }
     } finally {
@@ -129,7 +129,7 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
         File file = new File(dir, "txprofile-" + now + ".tprofile");
         out = IOUtils.newWriter(file);
       } catch (IOException e) {
-        log.log(Level.ERROR, "Not expected", e);
+        log.log(ERROR, "Not expected", e);
       }
     } finally {
       lock.unlock();
@@ -152,7 +152,7 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
       }
       flushCurrentFile();
     } catch (Exception e) {
-      log.log(Level.WARNING, "Error on collect", e);
+      log.log(WARNING, "Error on collect", e);
     }
   }
 
@@ -183,10 +183,10 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
 
       if (profileCounter % profilesPerFile == 0) {
         incrementFile();
-        log.log(Level.DEBUG, "profiled {0} transactions", profileCounter);
+        log.log(DEBUG, "profiled {0} transactions", profileCounter);
       }
     } catch (IOException e) {
-      log.log(Level.WARNING, "Error writing transaction profiling", e);
+      log.log(WARNING, "Error writing transaction profiling", e);
     }
   }
 
@@ -250,16 +250,16 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
   @Override
   public void shutdown() {
     shutdown = true;
-    log.log(Level.TRACE, "shutting down");
+    log.log(TRACE, "shutting down");
     try {
       executor.shutdown();
       if (!executor.awaitTermination(4, TimeUnit.SECONDS)) {
-        log.log(Level.INFO, "Shut down timeout exceeded. Terminating profiling consumer thread.");
+        log.log(INFO, "Shut down timeout exceeded. Terminating profiling consumer thread.");
         executor.shutdownNow();
       }
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
-      log.log(Level.WARNING, "Interrupt on shutdown", e);
+      log.log(WARNING, "Interrupt on shutdown", e);
     }
     flushCurrentFile();
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 9ee5aa5a0..2dfa2a454 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -12,12 +12,13 @@ import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
 
 import javax.persistence.PersistenceException;
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Read only transaction expected to use autoCommit connection and for implicit use only.
  * <p>
@@ -484,7 +485,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
     } catch (Exception ex) {
       // the connection pool will automatically remove the
       // connection if it does not pass the test
-      CoreLog.log.log(Level.ERROR, "Error closing connection", ex);
+      CoreLog.log.log(ERROR, "Error closing connection", ex);
     }
     connection = null;
     active = false;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 38021986f..35fb61307 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -17,12 +17,13 @@ import io.ebeanservice.docstore.api.DocStoreTransaction;
 
 import javax.persistence.PersistenceException;
 import javax.persistence.RollbackException;
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.function.Consumer;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * JDBC Connection based transaction.
  */
@@ -356,7 +357,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         try {
           consumer.accept(callbackList.get(i));
         } catch (Exception e) {
-          log.log(Level.ERROR, "Error executing transaction callback", e);
+          log.log(ERROR, "Error executing transaction callback", e);
         }
       }
     }
@@ -884,7 +885,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         connection.setReadOnly(false);
       }
     } catch (SQLException e) {
-      log.log(Level.ERROR, "Error setting to readOnly?", e);
+      log.log(ERROR, "Error setting to readOnly?", e);
     }
     try {
       if (autoCommit) {
@@ -892,14 +893,14 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         connection.setAutoCommit(true);
       }
     } catch (SQLException e) {
-      log.log(Level.ERROR, "Error setting to readOnly?", e);
+      log.log(ERROR, "Error setting to readOnly?", e);
     }
     try {
       connection.close();
     } catch (Exception ex) {
       // the connection pool will automatically remove the
       // connection if it does not pass the test
-      log.log(Level.ERROR, "Error closing connection", ex);
+      log.log(ERROR, "Error closing connection", ex);
     }
     connection = null;
     active = false;
@@ -932,7 +933,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       }
       withEachCallback(TransactionCallback::postCommit);
     } catch (SQLException e) {
-      log.log(Level.ERROR, "Error when ending a query only transaction via " + onQueryOnly, e);
+      log.log(ERROR, "Error when ending a query only transaction via " + onQueryOnly, e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
index 3845d0776..73bc98981 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java
@@ -13,7 +13,9 @@ import javax.transaction.Status;
 import javax.transaction.Synchronization;
 import javax.transaction.TransactionSynchronizationRegistry;
 import javax.transaction.UserTransaction;
-import java.lang.System.Logger.Level;
+
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.WARNING;
 
 /**
  * Hook into external JTA transaction manager.
@@ -87,15 +89,15 @@ public final class JtaTransactionManager implements ExternalTransactionManager {
     SpiTransaction currentEbeanTransaction = scope.inScope();
     if (currentEbeanTransaction != null) {
       // NOT expecting this so log WARNING
-      log.log(Level.WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.getId());
+      log.log(WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.getId());
       return currentEbeanTransaction;
     }
 
     UserTransaction ut = getUserTransaction();
     if (ut == null) {
       // no current JTA transaction
-      if (log.isLoggable(Level.DEBUG)) {
-        log.log(Level.DEBUG, "JTA Transaction - no current txn");
+      if (log.isLoggable(DEBUG)) {
+        log.log(DEBUG, "JTA Transaction - no current txn");
       }
       return null;
     }
@@ -181,21 +183,21 @@ public final class JtaTransactionManager implements ExternalTransactionManager {
     public void afterCompletion(int status) {
       switch (status) {
         case Status.STATUS_COMMITTED:
-          log.log(Level.DEBUG, "Jta Txn [{0}] committed", transaction.getId());
+          log.log(DEBUG, "Jta Txn [{0}] committed", transaction.getId());
           transaction.postCommit();
           // Remove this transaction object as it is completed
           transactionManager.scope().clearExternal();
           break;
 
         case Status.STATUS_ROLLEDBACK:
-          log.log(Level.DEBUG, "Jta Txn [{0}] rollback", transaction.getId());
+          log.log(DEBUG, "Jta Txn [{0}] rollback", transaction.getId());
           transaction.postRollback(null);
           // Remove this transaction object as it is completed
           transactionManager.scope().clearExternal();
           break;
 
         default:
-          log.log(Level.DEBUG, "Jta Txn [{0}] status:{1}", transaction.getId(), status);
+          log.log(DEBUG, "Jta Txn [{0}] status:{1}", transaction.getId(), status);
       }
 
       // No matter the completion status of the transaction, we release the connection we got from the pool.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
index b1a3ee4f8..f36dd7ede 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/PostCommitProcessing.java
@@ -11,10 +11,11 @@ import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 
-import java.lang.System.Logger.Level;
 import java.util.List;
 import java.util.Set;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Performs post commit processing using a background thread.
  * <p>
@@ -104,8 +105,8 @@ final class PostCommitProcessing {
   private void notifyCluster() {
     if (remoteTransactionEvent != null && !remoteTransactionEvent.isEmpty()) {
       // send the interesting events to the cluster
-      if (log.isLoggable(Level.DEBUG)) {
-        log.log(Level.DEBUG, "Cluster Send: {0}", remoteTransactionEvent);
+      if (log.isLoggable(DEBUG)) {
+        log.log(DEBUG, "Cluster Send: {0}", remoteTransactionEvent);
       }
       clusterManager.broadcast(remoteTransactionEvent);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
index c1ba2e773..37669d3a3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TableModState.java
@@ -6,11 +6,13 @@ import io.ebean.cache.QueryCacheEntryValidate;
 import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
 
-import java.lang.System.Logger.Level;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.TRACE;
+
 /**
  * Holds timestamp of last modification per table.
  * <p>
@@ -34,8 +36,8 @@ public final class TableModState implements QueryCacheEntryValidate, ServerCache
     for (String tableName : touchedTables) {
       tableModStamp.put(tableName, modNanoTime);
     }
-    if (log.isLoggable(Level.DEBUG)) {
-      log.log(Level.DEBUG, "TableModState updated - touched:{0} modNanoTime:{1}", touchedTables, modNanoTime);
+    if (log.isLoggable(DEBUG)) {
+      log.log(DEBUG, "TableModState updated - touched:{0} modNanoTime:{1}", touchedTables, modNanoTime);
     }
   }
 
@@ -46,8 +48,8 @@ public final class TableModState implements QueryCacheEntryValidate, ServerCache
     for (String tableName : tables) {
       Long modTime = tableModStamp.get(tableName);
       if (modTime != null && modTime >= sinceNanoTime) {
-        if (log.isLoggable(Level.TRACE)) {
-          log.log(Level.TRACE, "Invalidate on table:{0}", tableName);
+        if (log.isLoggable(TRACE)) {
+          log.log(TRACE, "Invalidate on table:{0}", tableName);
         }
         return false;
       }
@@ -73,8 +75,8 @@ public final class TableModState implements QueryCacheEntryValidate, ServerCache
   public void notify(ServerCacheNotification notification) {
     // use local clock - for slightly more aggressive invalidation (as later)
     // that removes any concern regarding clock syncing across cluster
-    if (log.isLoggable(Level.DEBUG)) {
-      log.log(Level.DEBUG, "ServerCacheNotification:{0}", notification);
+    if (log.isLoggable(DEBUG)) {
+      log.log(DEBUG, "ServerCacheNotification:{0}", notification);
     }
     touch(notification.getDependentTables());
   }
@@ -87,8 +89,8 @@ public final class TableModState implements QueryCacheEntryValidate, ServerCache
   public void notify(RemoteTableMod tableMod) {
     // use local clock - for slightly more aggressive invalidation (as later)
     // that removes any concern regarding clock syncing across cluster
-    if (log.isLoggable(Level.DEBUG)) {
-      log.log(Level.DEBUG, "RemoteTableMod:{0}", tableMod);
+    if (log.isLoggable(DEBUG)) {
+      log.log(DEBUG, "RemoteTableMod:{0}", tableMod);
     }
     touch(tableMod.getTables());
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index ace9d4f77..523315eee 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -32,7 +32,6 @@ import io.ebeanservice.docstore.api.DocStoreUpdates;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -40,6 +39,9 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Manages transactions.
  * <p>
@@ -365,7 +367,7 @@ public class TransactionManager implements SpiTransactionManager {
         txnLogger.debug(msg);
       }
     } catch (Exception ex) {
-      log.log(Level.ERROR, "Error while notifying TransactionEventListener of rollback event", ex);
+      log.log(ERROR, "Error while notifying TransactionEventListener of rollback event", ex);
     }
   }
 
@@ -416,7 +418,7 @@ public class TransactionManager implements SpiTransactionManager {
       postCommit.notifyLocalCache();
       backgroundExecutor.execute(postCommit.backgroundNotify());
     } catch (Exception ex) {
-      log.log(Level.ERROR, "NotifyOfCommit failed. L2 Cache potentially not notified.", ex);
+      log.log(ERROR, "NotifyOfCommit failed. L2 Cache potentially not notified.", ex);
     }
   }
 
@@ -442,8 +444,8 @@ public class TransactionManager implements SpiTransactionManager {
    * Notify local BeanPersistListeners etc of events from another server in the cluster.
    */
   public final void remoteTransactionEvent(RemoteTransactionEvent remoteEvent) {
-    if (clusterLogger.isLoggable(Level.DEBUG)) {
-      clusterLogger.log(Level.DEBUG, "processing {0}", remoteEvent);
+    if (clusterLogger.isLoggable(DEBUG)) {
+      clusterLogger.log(DEBUG, "processing {0}", remoteEvent);
     }
     CacheChangeSet changeSet = new CacheChangeSet();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
index a33494277..b4ce613be 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
@@ -5,13 +5,14 @@ import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 
 import java.io.*;
-import java.lang.System.Logger.Level;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 public class DataBind implements DataBinder {
 
   private final DataTimeZone dataTimeZone;
@@ -101,7 +102,7 @@ public class DataBind implements DataBinder {
         try {
           inputStream.close();
         } catch (IOException e) {
-          CoreLog.log.log(Level.WARNING, "Error closing InputStream that was bound to PreparedStatement", e);
+          CoreLog.log.log(WARNING, "Error closing InputStream that was bound to PreparedStatement", e);
         }
       }
       inputStreams = null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index c44670c73..a1b7c3798 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -29,7 +29,6 @@ import org.joda.time.LocalTime;
 import javax.persistence.AttributeConverter;
 import javax.persistence.EnumType;
 import java.io.File;
-import java.lang.System.Logger.Level;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -45,6 +44,8 @@ import java.time.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Default implementation of TypeManager.
  * <p>
@@ -219,10 +220,10 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private void logAdd(ScalarType<?> scalarType) {
-    if (log.isLoggable(Level.TRACE)) {
+    if (log.isLoggable(TRACE)) {
       String msg = "ScalarType register [" + scalarType.getClass().getName() + "]";
       msg += " for [" + scalarType.getType().getName() + "]";
-      log.log(Level.TRACE, msg);
+      log.log(TRACE, msg);
     }
   }
 
@@ -675,7 +676,7 @@ public final class DefaultTypeManager implements TypeManager {
         }
         add(scalarType);
       } catch (Exception e) {
-        log.log(Level.ERROR, "Error loading ScalarType [" + cls.getName() + "]", e);
+        log.log(ERROR, "Error loading ScalarType [" + cls.getName() + "]", e);
       }
     }
   }
@@ -706,10 +707,10 @@ public final class DefaultTypeManager implements TypeManager {
         }
         ScalarTypeConverter converter = foundType.getDeclaredConstructor().newInstance();
         ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, converter);
-        log.log(Level.DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
+        log.log(DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
         add(stw);
       } catch (Exception e) {
-        log.log(Level.ERROR, "Error registering ScalarTypeConverter [" + foundType.getName() + "]", e);
+        log.log(ERROR, "Error registering ScalarTypeConverter [" + foundType.getName() + "]", e);
       }
     }
   }
@@ -730,10 +731,10 @@ public final class DefaultTypeManager implements TypeManager {
         }
         AttributeConverter converter = foundType.getDeclaredConstructor().newInstance();
         ScalarTypeWrapper stw = new ScalarTypeWrapper(logicalType, wrappedType, new AttributeConverterAdapter(converter));
-        log.log(Level.DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
+        log.log(DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
         add(stw);
       } catch (Exception e) {
-        log.log(Level.ERROR, "Error registering AttributeConverter [" + foundType.getName() + "]", e);
+        log.log(ERROR, "Error registering AttributeConverter [" + foundType.getName() + "]", e);
       }
     }
   }
@@ -805,7 +806,7 @@ public final class DefaultTypeManager implements TypeManager {
     // detect if Joda classes are in the classpath
     if (config.getClassLoadConfig().isJodaTimePresent()) {
       // Joda classes are in the classpath so register the types
-      log.log(Level.DEBUG, "Registering Joda data types");
+      log.log(DEBUG, "Registering Joda data types");
       addType(LocalDateTime.class, new ScalarTypeJodaLocalDateTime(jsonDateTime));
       addType(DateTime.class, new ScalarTypeJodaDateTime(jsonDateTime));
       if (config.getDatabasePlatform().supportsNativeJavaTime()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
index cddd89231..73037a58a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
@@ -9,10 +9,11 @@ import io.ebean.text.TextException;
 import io.ebeaninternal.api.CoreLog;
 
 import java.io.*;
-import java.lang.System.Logger.Level;
 import java.sql.SQLException;
 import java.sql.Types;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * ScalarType for streaming between a File and the database.
  */
@@ -170,14 +171,14 @@ final class ScalarTypeFile extends ScalarTypeBase<File> {
         try {
           output.close();
         } catch (IOException e) {
-          CoreLog.log.log(Level.ERROR, "Error when closing outputStream", e);
+          CoreLog.log.log(ERROR, "Error when closing outputStream", e);
         }
       }
       if (input != null) {
         try {
           input.close();
         } catch (IOException e) {
-          CoreLog.log.log(Level.ERROR, "Error when closing inputStream ", e);
+          CoreLog.log.log(ERROR, "Error when closing inputStream ", e);
         }
       }
     }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index e91a067f4..7f9c2ba6b 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -15,10 +15,11 @@ import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
 
 import javax.persistence.PersistenceException;
 import java.io.*;
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.SQLException;
 
+import static java.lang.System.Logger.Level.WARNING;
+
 /**
  * Controls the generation and execution of "Create All" and "Drop All" DDL scripts.
  * <p>
@@ -60,7 +61,7 @@ public class DdlGenerator implements SpiDdlGenerator {
     this.platform = databasePlatform.getPlatform();
     this.platformName = platform.base().name();
     if (!config.getTenantMode().isDdlEnabled() && config.isDdlRun()) {
-      log.log(Level.WARNING, "DDL can't be run on startup with TenantMode " + config.getTenantMode());
+      log.log(WARNING, "DDL can't be run on startup with TenantMode " + config.getTenantMode());
       this.runDdl = false;
       this.useMigrationStoredProcedures = false;
     } else {
@@ -224,7 +225,7 @@ public class DdlGenerator implements SpiDdlGenerator {
     if (sqlScript != null) {
       try (InputStream is = getClassLoader().getResourceAsStream(sqlScript)) {
         if (is == null) {
-          log.log(Level.WARNING, "sql script {0} was not found as a resource", sqlScript);
+          log.log(WARNING, "sql script {0} was not found as a resource", sqlScript);
         } else {
           String content = readContent(IOUtils.newReader(is)); // 'is' is closed
           runScript(connection, false, content, sqlScript);
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 9f9384d0d..f20b39121 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -26,13 +26,13 @@ import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
-import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.ServiceLoader;
 
 import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
+import static java.lang.System.Logger.Level.*;
 
 /**
  * Generates DB Migration xml and sql scripts.
@@ -402,7 +402,7 @@ public class DefaultDbMigration implements DbMigration {
    */
   private void writeExtraDdl(File migrationDir, DdlScript script) throws IOException {
     String fullName = repeatableMigrationName(script.isInit(), script.getName());
-    logger.log(Level.DEBUG, "writing repeatable script {0}", fullName);
+    logger.log(DEBUG, "writing repeatable script {0}", fullName);
     File file = new File(migrationDir, fullName);
     try (Writer writer = IOUtils.newWriter(file)) {
       writer.write(script.getValue());
@@ -419,7 +419,7 @@ public class DefaultDbMigration implements DbMigration {
     if (logToSystemOut) {
       System.out.println("DbMigration> " + message);
     } else {
-      logger.log(Level.ERROR, message);
+      logger.log(ERROR, message);
     }
   }
 
@@ -430,7 +430,7 @@ public class DefaultDbMigration implements DbMigration {
     if (logToSystemOut) {
       System.out.println("DbMigration> " + message);
     } else {
-      logger.log(Level.INFO, message);
+      logger.log(INFO, message);
     }
   }
 
@@ -792,7 +792,7 @@ public class DefaultDbMigration implements DbMigration {
       case SQLSERVER:
         throw new IllegalArgumentException("Please choose the more specific SQLSERVER16 or SQLSERVER17 platform. Refer to issue #1340 for details");
       case DB2:
-        logger.log(Level.WARNING, "Using DB2LegacyPlatform. It is recommended to migrate to db2luw/db2zos/db2fori. Refer to issue #2514 for details");
+        logger.log(WARNING, "Using DB2LegacyPlatform. It is recommended to migrate to db2luw/db2zos/db2fori. Refer to issue #2514 for details");
       case GENERIC:
         return new DatabasePlatform();
       default:
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
index e949b17de..696a9feb8 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MigrationModel.java
@@ -4,11 +4,12 @@ import io.avaje.applog.AppLog;
 import io.ebean.migration.MigrationVersion;
 
 import java.io.File;
-import java.lang.System.Logger.Level;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * Build the model from the series of migrations.
  */
@@ -52,7 +53,7 @@ public class MigrationModel {
 
     if (!initMigration) {
       for (MigrationResource migrationResource : resources) {
-        logger.log(Level.DEBUG, "read {0}", migrationResource);
+        logger.log(DEBUG, "read {0}", migrationResource);
         model.apply(migrationResource.read(), migrationResource.version());
       }
     }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
index 00df18cf8..6f9e424a5 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java
@@ -15,9 +15,10 @@ import io.ebeaninternal.dbmigration.migration.Migration;
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
-import java.lang.System.Logger.Level;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 /**
  * Writes migration changes as platform specific DDL.
  */
@@ -107,7 +108,7 @@ public class PlatformDdlWriter {
     File subPath = new File(path, suffix);
     if (!subPath.exists()) {
       if (!subPath.mkdirs()) {
-        logger.log(Level.ERROR, "failed to create directories for " + subPath.getAbsolutePath());
+        logger.log(ERROR, "failed to create directories for " + subPath.getAbsolutePath());
       }
     }
     return subPath;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
index 379e33bd7..3ff9034d1 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java
@@ -8,9 +8,9 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.System.Logger.Level;
 
 import static io.ebeaninternal.api.PlatformMatch.matchPlatform;
+import static java.lang.System.Logger.Level.DEBUG;
 
 /**
  * Read ExtraDdl from an XML document.
@@ -42,7 +42,7 @@ public class ExtraDdlXmlReader {
     StringBuilder sb = new StringBuilder(300);
     for (DdlScript script : read.getDdlScript()) {
       if (script.isDrop() == drops && matchPlatform(platform, script.getPlatforms())) {
-        logger.log(Level.DEBUG, "include script {}", script.getName());
+        logger.log(DEBUG, "include script {}", script.getName());
         String value = script.getValue();
         sb.append(value);
         if (value.lastIndexOf(';') == -1) {
diff --git a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
index a52377423..37e701fe6 100644
--- a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
@@ -7,9 +7,10 @@ import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiEbeanServer;
 
-import java.lang.System.Logger.Level;
 import java.sql.Types;
 
+import static java.lang.System.Logger.Level.ERROR;
+
 public abstract class BaseTestCase {
 
   protected static System.Logger logger = AppLog.getLogger(BaseTestCase.class);
@@ -35,7 +36,7 @@ public abstract class BaseTestCase {
       // First try, if we get the default server. If this fails, all tests will fail.
       DB.getDefault();
     } catch (Throwable e) {
-      logger.log(Level.ERROR, "Fatal error while getting ebean-server. Exiting...", e);
+      logger.log(ERROR, "Fatal error while getting ebean-server. Exiting...", e);
       System.exit(1);
     }
   }
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
index a934b8411..72aba98d4 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCache.java
@@ -20,9 +20,11 @@ import redis.clients.jedis.params.SetParams;
 import redis.clients.jedis.resps.ScanResult;
 import redis.clients.jedis.util.SafeEncoder;
 
-import java.lang.System.Logger.Level;
 import java.util.*;
 
+import static java.lang.System.Logger.Level.ERROR;
+import static java.lang.System.Logger.Level.WARNING;
+
 final class RedisCache implements ServerCache {
 
   private static final System.Logger log = AppLog.getLogger(RedisCache.class);
@@ -106,17 +108,17 @@ final class RedisCache implements ServerCache {
       }
       return valueEncode.decode(data);
     } catch (Exception e) {
-      log.log(Level.ERROR, "Error decoding data, treated as cache miss", e);
+      log.log(ERROR, "Error decoding data, treated as cache miss", e);
       return null;
     }
   }
 
   private void errorOnRead(Exception e) {
-    log.log(Level.WARNING, "Error when reading redis cache", e);
+    log.log(WARNING, "Error when reading redis cache", e);
   }
 
   private void errorOnWrite(Exception e) {
-    log.log(Level.WARNING, "Error when writing redis cache", e);
+    log.log(WARNING, "Error when writing redis cache", e);
   }
 
   @Override
diff --git a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
index 4dd991c05..808576ea1 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/RedisCacheFactory.java
@@ -21,7 +21,6 @@ import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.util.SafeEncoder;
 
 import java.io.*;
-import java.lang.System.Logger.Level;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -29,6 +28,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static java.lang.System.Logger.Level.*;
 import static java.util.Arrays.asList;
 
 final class RedisCacheFactory implements ServerCacheFactory {
@@ -105,7 +105,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
       redisConfig = new RedisConfig();
     }
     redisConfig.loadProperties(config.getProperties());
-    log.log(Level.INFO, "using l2cache redis host {0}:{1}", redisConfig.getServer(), redisConfig.getPort());
+    log.log(INFO, "using l2cache redis host {0}:{1}", redisConfig.getServer(), redisConfig.getPort());
     return redisConfig.createPool();
   }
 
@@ -160,7 +160,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
     try {
       RQueryCache cache = queryCaches.get(config.getCacheKey());
       if (cache == null) {
-        logger.log(Level.DEBUG, "create query cache [{0}]", config.getCacheKey());
+        logger.log(DEBUG, "create query cache [{0}]", config.getCacheKey());
         cache = new RQueryCache(new DefaultServerCacheConfig(config));
         cache.periodicTrim(executor);
         queryCaches.put(config.getCacheKey(), cache);
@@ -214,7 +214,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
      * Process the invalidation message coming from the cluster.
      */
     private void invalidate() {
-      queryLogger.log(Level.DEBUG, "   CLEAR {0}(*) - cluster invalidate", name);
+      queryLogger.log(DEBUG, "   CLEAR {0}(*) - cluster invalidate", name);
       super.clear();
     }
   }
@@ -233,8 +233,8 @@ final class RedisCacheFactory implements ServerCacheFactory {
           msg.append(table).append(",");
         }
         String formattedMsg = msg.toString();
-        if (tableModLogger.isLoggable(Level.DEBUG)) {
-          tableModLogger.log(Level.DEBUG, "Publish TableMods - {0}", formattedMsg);
+        if (tableModLogger.isLoggable(DEBUG)) {
+          tableModLogger.log(DEBUG, "Publish TableMods - {0}", formattedMsg);
         }
         sendTableMod(formattedMsg);
       }
@@ -262,8 +262,8 @@ final class RedisCacheFactory implements ServerCacheFactory {
   private void processTableNotify(String rawMessage) {
     long nanos = System.nanoTime();
     try {
-      if (logger.isLoggable(Level.DEBUG)) {
-        logger.log(Level.DEBUG, "processTableNotify {0}", rawMessage);
+      if (logger.isLoggable(DEBUG)) {
+        logger.log(DEBUG, "processTableNotify {0}", rawMessage);
       }
       Set<String> tables = new HashSet<>(asList(rawMessage.split(",")));
       listener.notify(new ServerCacheNotification(tables));
@@ -282,7 +282,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
       try {
         sendMessage(messageInvalidateKeys(cacheKey, keySet));
       } catch (IOException e) {
-        logger.log(Level.ERROR, "failed to transmit invalidateKeys() message", e);
+        logger.log(ERROR, "failed to transmit invalidateKeys() message", e);
       }
     }
 
@@ -291,7 +291,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
       try {
         sendMessage(messageInvalidateKey(cacheKey, id));
       } catch (IOException e) {
-        logger.log(Level.ERROR, "failed to transmit invalidateKeys() message", e);
+        logger.log(ERROR, "failed to transmit invalidateKeys() message", e);
       }
     }
 
@@ -300,7 +300,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
       try {
         sendMessage(messageInvalidateClear(cacheKey));
       } catch (IOException e) {
-        logger.log(Level.ERROR, "failed to transmit invalidateKeys() message", e);
+        logger.log(ERROR, "failed to transmit invalidateKeys() message", e);
       }
     }
 
@@ -364,7 +364,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
 
     @Override
     public void notifyConnected() {
-      logger.log(Level.INFO, "Established connection to Redis");
+      logger.log(INFO, "Established connection to Redis");
     }
 
     /**
@@ -395,8 +395,8 @@ final class RedisCacheFactory implements ServerCacheFactory {
           }
           msgType = oi.readInt();
           cacheKey = oi.readUTF();
-          if (logger.isLoggable(Level.DEBUG)) {
-            logger.log(Level.DEBUG, "processNearCacheMessage serverId:{0} type:{1} cacheKey:{2}", sourceServerId, msgType, cacheKey);
+          if (logger.isLoggable(DEBUG)) {
+            logger.log(DEBUG, "processNearCacheMessage serverId:{0} type:{1} cacheKey:{2}", sourceServerId, msgType, cacheKey);
           }
 
           switch (msgType) {
@@ -423,7 +423,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
           }
 
         } catch (IOException | ClassNotFoundException e) {
-          logger.log(Level.ERROR, "failed to decode near cache message [" + SafeEncoder.encode(message) + "] for cache:" + cacheKey, e);
+          logger.log(ERROR, "failed to decode near cache message [" + SafeEncoder.encode(message) + "] for cache:" + cacheKey, e);
           if (cacheKey != null) {
             nearCacheInvalidateClear(cacheKey);
           }
@@ -449,10 +449,10 @@ final class RedisCacheFactory implements ServerCacheFactory {
               queryCacheInvalidate(split[2]);
               break;
             default:
-              logger.log(Level.ERROR, "Unknown L2 message type[{0}] on redis channel - message[{1}] ", split[0], message);
+              logger.log(ERROR, "Unknown L2 message type[{0}] on redis channel - message[{1}] ", split[0], message);
           }
         } catch (Exception e) {
-          logger.log(Level.ERROR, "Error handling L2 message[" + message + "]", e);
+          logger.log(ERROR, "Error handling L2 message[" + message + "]", e);
         }
       }
     }
@@ -495,7 +495,7 @@ final class RedisCacheFactory implements ServerCacheFactory {
   }
 
   private void warnNearCacheNotFound(String cacheKey) {
-    logger.log(Level.WARNING, "No near cache found for cacheKey [" + cacheKey + "] yet - probably on startup");
+    logger.log(WARNING, "No near cache found for cacheKey [" + cacheKey + "] yet - probably on startup");
   }
 
 }
diff --git a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
index 1eab91402..374eab001 100644
--- a/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
+++ b/ebean-redis/src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java
@@ -5,10 +5,11 @@ import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.exceptions.JedisException;
 
-import java.lang.System.Logger.Level;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import static java.lang.System.Logger.Level.*;
+
 /**
  * Subscribe to redis topic listening for changes.
  * <p>
@@ -49,13 +50,13 @@ public final class DaemonTopicRunner {
       try {
         subscribe();
       } catch (JedisException e) {
-        log.log(Level.DEBUG, "... redis subscribe connection attempt:{0} failed:{1}", attempts, e.getMessage());
+        log.log(DEBUG, "... redis subscribe connection attempt:{0} failed:{1}", attempts, e.getMessage());
         try {
           // wait a little before retrying
           Thread.sleep(reconnectWaitMillis);
         } catch (InterruptedException e1) {
           Thread.currentThread().interrupt();
-          log.log(Level.WARNING, "Interrupted redis re-connection wait", e1);
+          log.log(WARNING, "Interrupted redis re-connection wait", e1);
         }
       }
     }
@@ -70,13 +71,13 @@ public final class DaemonTopicRunner {
     try {
       daemonTopic.subscribe(jedis);
     } catch (Exception e) {
-      log.log(Level.ERROR, "Lost connection to topic, starting re-connection loop", e);
+      log.log(ERROR, "Lost connection to topic, starting re-connection loop", e);
       attemptConnections();
     } finally {
       try {
         jedis.close();
       } catch (Exception e) {
-        log.log(Level.WARNING, "Error closing probably broken Redis connection", e);
+        log.log(WARNING, "Error closing probably broken Redis connection", e);
       }
     }
   }
diff --git a/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java b/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java
index 71822c136..c7887dd75 100644
--- a/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java
+++ b/ebean-test/src/main/java/io/ebean/test/CapturingLoggerFactory.java
@@ -4,7 +4,8 @@ import io.avaje.applog.AppLog;
 import io.ebeaninternal.api.SpiLogger;
 import io.ebeaninternal.api.SpiLoggerFactory;
 
-import java.lang.System.Logger.Level;
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.TRACE;
 
 /**
  * Create a logger that captures the SQL and register it for later access in tests.
@@ -33,22 +34,22 @@ public class CapturingLoggerFactory implements SpiLoggerFactory {
 
     @Override
     public boolean isDebug() {
-      return logger.isLoggable(Level.DEBUG);
+      return logger.isLoggable(DEBUG);
     }
 
     @Override
     public boolean isTrace() {
-      return logger.isLoggable(Level.TRACE);
+      return logger.isLoggable(TRACE);
     }
 
     @Override
     public void debug(String msg) {
-      logger.log(Level.DEBUG, msg);
+      logger.log(DEBUG, msg);
     }
 
     @Override
     public void trace(String msg) {
-      logger.log(Level.TRACE, msg);
+      logger.log(TRACE, msg);
     }
   }
 }
diff --git a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
index 32d7df424..f9a82cd91 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
@@ -8,9 +8,11 @@ import io.ebean.test.config.platform.PlatformAutoConfig;
 import io.ebean.test.config.provider.ProviderAutoConfig;
 import io.ebean.test.containers.DockerHost;
 
-import java.lang.System.Logger.Level;
 import java.util.Properties;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.INFO;
+
 /**
  * Automatically configure ServerConfig for testing purposes.
  * <p>
@@ -38,7 +40,7 @@ public class AutoConfigureForTesting implements AutoConfigure {
       io.avaje.config.Config.asConfiguration().evalModify(properties);
     }
     if (!config.isDefaultServer()) {
-      log.log(Level.INFO, "skip automatic testing config on non-default server name:{0} register:{1}", config.getName(), config.isRegister());
+      log.log(INFO, "skip automatic testing config on non-default server name:{0} register:{1}", config.getName(), config.isRegister());
       return;
     }
     if (isExtraServer(config, properties)) {
@@ -46,7 +48,7 @@ public class AutoConfigureForTesting implements AutoConfigure {
       return;
     }
     String testPlatform = properties.getProperty("ebean.test.platform");
-    log.log(Level.DEBUG, "automatic testing config - with ebean.test.platform:{0} name:{1} environmentDb:{2}", testPlatform, config.getName(), environmentDb);
+    log.log(DEBUG, "automatic testing config - with ebean.test.platform:{0} name:{1} environmentDb:{2}", testPlatform, config.getName(), environmentDb);
     if (RunOnceMarker.isRun()) {
       setupPlatform(environmentDb, config);
     }
diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java b/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java
index 115a83107..e85edb93e 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/platform/Config.java
@@ -5,9 +5,10 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.test.containers.DockerHost;
 
-import java.lang.System.Logger.Level;
 import java.util.Properties;
 
+import static java.lang.System.Logger.Level.INFO;
+
 /**
  * Config for a database / datasource with associated DDL mode and Docker configuration.
  */
@@ -193,8 +194,7 @@ class Config {
     ds.setDriver(driverClass);
     config.setDataSourceConfig(ds);
 
-    log.log(Level.INFO, "Using jdbc settings - username:{0} url:{1} driver:{2}", ds.getUsername(), ds.getUrl(), ds.getDriver());
-
+    log.log(INFO, "Using jdbc settings - username:{0} url:{1} driver:{2}", ds.getUsername(), ds.getUrl(), ds.getDriver());
     if (driverClass != null) {
       try {
         Class.forName(driverClass);
diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java b/ebean-test/src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java
index f378f517c..8321f0825 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/platform/PlatformAutoConfig.java
@@ -4,11 +4,11 @@ import io.avaje.applog.AppLog;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.test.containers.ContainerFactory;
 
-import java.lang.System.Logger.Level;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import static java.lang.System.Logger.Level.*;
 import static java.util.concurrent.CompletableFuture.allOf;
 import static java.util.concurrent.CompletableFuture.runAsync;
 
@@ -62,7 +62,7 @@ public class PlatformAutoConfig {
 
       Config config = new Config(db, platform, databaseName, this.config);
       platformSetup.setupExtraDbDataSource(config);
-      log.log(Level.DEBUG, "configured dataSource for extraDb name:{0} url:{1}", db, this.config.getDataSourceConfig().getUrl());
+      log.log(DEBUG, "configured dataSource for extraDb name:{0} url:{1}", db, this.config.getDataSourceConfig().getUrl());
     }
   }
 
@@ -92,9 +92,9 @@ public class PlatformAutoConfig {
     Properties dockerProperties = platformSetup.setup(config);
     if (!dockerProperties.isEmpty()) {
       if (isDebug()) {
-        log.log(Level.INFO, "Docker properties: {0}", dockerProperties);
+        log.log(INFO, "Docker properties: {0}", dockerProperties);
       } else {
-        log.log(Level.DEBUG, "Docker properties: {0}", dockerProperties);
+        log.log(DEBUG, "Docker properties: {0}", dockerProperties);
       }
       // start the docker container with appropriate configuration
       new ContainerFactory(dockerProperties, config.getDockerPlatform()).startContainers();
@@ -130,7 +130,7 @@ public class PlatformAutoConfig {
     }
     this.platformSetup = KNOWN_PLATFORMS.get(platform);
     if (platformSetup == null) {
-      log.log(Level.WARNING, "unknown platform {0} - skipping platform setup", platform);
+      log.log(WARNING, "unknown platform {0} - skipping platform setup", platform);
     }
     return platformSetup != null;
   }
diff --git a/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java b/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java
index 48abb54cf..0be14af3a 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java
@@ -6,9 +6,11 @@ import io.ebean.config.CurrentUserProvider;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.EncryptKeyManager;
 
-import java.lang.System.Logger.Level;
 import java.util.Properties;
 
+import static java.lang.System.Logger.Level.DEBUG;
+import static java.lang.System.Logger.Level.INFO;
+
 /**
  * Auto configuration of User and Tenant providers and Encrypt key manager for testing purposes.
  */
@@ -44,12 +46,12 @@ public class ProviderAutoConfig {
     if (keyManager == null) {
       // Must be 16 Chars for Oracle function
       String keyVal = properties.getProperty("ebean.test.encryptKey", "simple0123456789");
-      log.log(Level.DEBUG, "for testing - using FixedEncryptKeyManager() keyVal:{0}", keyVal);
+      log.log(DEBUG, "for testing - using FixedEncryptKeyManager() keyVal:{0}", keyVal);
       config.setEncryptKeyManager(new FixedEncryptKeyManager(keyVal));
     }
 
     if (providerSetFlag > 0) {
-      log.log(Level.INFO, msg(providerSetFlag));
+      log.log(INFO, msg(providerSetFlag));
     }
   }
 
diff --git a/platforms/h2/src/main/java/io/ebean/platform/h2/H2HistoryTrigger.java b/platforms/h2/src/main/java/io/ebean/platform/h2/H2HistoryTrigger.java
index 9cab33032..92df36731 100644
--- a/platforms/h2/src/main/java/io/ebean/platform/h2/H2HistoryTrigger.java
+++ b/platforms/h2/src/main/java/io/ebean/platform/h2/H2HistoryTrigger.java
@@ -3,13 +3,14 @@ package io.ebean.platform.h2;
 import io.avaje.applog.AppLog;
 import org.h2.api.Trigger;
 
-import java.lang.System.Logger.Level;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.LocalDateTime;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * H2 database trigger used to populate history tables to support the @History feature.
  */
@@ -72,7 +73,7 @@ public class H2HistoryTrigger implements Trigger {
     insertSql.append(");");
 
     this.insertHistorySql = insertSql.toString();
-    log.log(Level.DEBUG, "History table insert sql: {0}", insertHistorySql);
+    log.log(DEBUG, "History table insert sql: {0}", insertHistorySql);
   }
 
   @Override

From c297ebda5a19a700d0652ac80aec981bafd8b6b0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 23 Aug 2022 16:09:45 +1200
Subject: [PATCH 024/127] No effective change, fix typo in DatabasePlatform
 variable name

---
 .../java/io/ebean/config/dbplatform/DatabasePlatform.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 3bb2cced8..faed5973d 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -670,8 +670,8 @@ public class DatabasePlatform {
   }
 
   private boolean isQuote(char ch) {
-    for (char identifer : QUOTED_IDENTIFIERS) {
-      if (identifer == ch) {
+    for (char identifier : QUOTED_IDENTIFIERS) {
+      if (identifier == ch) {
         return true;
       }
     }

From 01155c3466ccde48a3a9e241fa48c82f20a7134d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 23 Aug 2022 18:16:51 +1200
Subject: [PATCH 025/127] #2798 - SQL Anywhere: invalid escape character on
 like expression

---
 .../xtest/platform/PlatformLikeTest.java      | 76 +++++++++++++++++++
 .../sqlanywhere/SqlAnywherePlatform.java      |  2 +-
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 ebean-test/src/test/java/io/ebean/xtest/platform/PlatformLikeTest.java

diff --git a/ebean-test/src/test/java/io/ebean/xtest/platform/PlatformLikeTest.java b/ebean-test/src/test/java/io/ebean/xtest/platform/PlatformLikeTest.java
new file mode 100644
index 000000000..db1e27aa4
--- /dev/null
+++ b/ebean-test/src/test/java/io/ebean/xtest/platform/PlatformLikeTest.java
@@ -0,0 +1,76 @@
+package io.ebean.xtest.platform;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.platform.cockroach.CockroachPlatform;
+import io.ebean.platform.db2.DB2LuwPlatform;
+import io.ebean.platform.h2.H2Platform;
+import io.ebean.platform.hana.HanaPlatform;
+import io.ebean.platform.mariadb.MariaDbPlatform;
+import io.ebean.platform.mysql.MySql55Platform;
+import io.ebean.platform.mysql.MySqlPlatform;
+import io.ebean.platform.oracle.Oracle11Platform;
+import io.ebean.platform.oracle.Oracle12Platform;
+import io.ebean.platform.oracle.OraclePlatform;
+import io.ebean.platform.postgres.Postgres9Platform;
+import io.ebean.platform.postgres.PostgresPlatform;
+import io.ebean.platform.sqlanywhere.SqlAnywherePlatform;
+import io.ebean.platform.sqlite.SQLitePlatform;
+import io.ebean.platform.sqlserver.SqlServer17Platform;
+import io.ebean.platform.yugabyte.YugabytePlatform;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class PlatformLikeTest {
+
+  DatabasePlatform h2 = new H2Platform();
+  DatabasePlatform pg = new PostgresPlatform();
+  DatabasePlatform pg9 = new Postgres9Platform();
+  DatabasePlatform cockroach = new CockroachPlatform();
+  DatabasePlatform yugabyte = new YugabytePlatform();
+  DatabasePlatform mysql = new MySqlPlatform();
+  DatabasePlatform mysql55 = new MySql55Platform();
+  DatabasePlatform maria = new MariaDbPlatform();
+
+  DatabasePlatform sqlite = new SQLitePlatform();
+  DatabasePlatform sqlAnywhere = new SqlAnywherePlatform();
+  DatabasePlatform sqlServer17 = new SqlServer17Platform();
+  DatabasePlatform oracle = new OraclePlatform();
+  DatabasePlatform oracle11 = new Oracle11Platform();
+  DatabasePlatform oracle12 = new Oracle12Platform();
+  DatabasePlatform hana = new HanaPlatform();
+  DatabasePlatform db2Luw = new DB2LuwPlatform();
+
+  @Test
+  void rawLike_escapeEmpty() {
+    for (DatabasePlatform platform : List.of(h2, pg, pg9, yugabyte, cockroach, mysql, mysql55, maria)) {
+      assertThat(platform.getLikeClause(true)).isEqualTo("like ? escape''");
+      assertThat(platform.getLikeClause(false)).isEqualTo("like ? escape'|'");
+    }
+  }
+
+  @Test
+  void ansi_rawLike() {
+    for (DatabasePlatform platform : List.of(sqlite, sqlAnywhere, sqlServer17, oracle, oracle11, oracle12, hana, db2Luw)) {
+      assertThat(platform.getLikeClause(true)).isEqualTo("like ?");
+    }
+  }
+
+  @Test
+  void escapeLike_noEscape() {
+    for (DatabasePlatform platform : List.of(sqlite, sqlServer17)) {
+      assertThat(platform.getLikeClause(false)).isEqualTo("like ?");
+    }
+  }
+
+
+  @Test
+  void ansi_escapeLike() {
+    for (DatabasePlatform platform : List.of(sqlAnywhere, oracle, oracle11, oracle12, hana, db2Luw)) {
+      assertThat(platform.getLikeClause(false)).isEqualTo("like ? escape'|'");
+    }
+  }
+
+}
diff --git a/platforms/sqlanywhere/src/main/java/io/ebean/platform/sqlanywhere/SqlAnywherePlatform.java b/platforms/sqlanywhere/src/main/java/io/ebean/platform/sqlanywhere/SqlAnywherePlatform.java
index 7a8894b21..a9aa3f41d 100644
--- a/platforms/sqlanywhere/src/main/java/io/ebean/platform/sqlanywhere/SqlAnywherePlatform.java
+++ b/platforms/sqlanywhere/src/main/java/io/ebean/platform/sqlanywhere/SqlAnywherePlatform.java
@@ -21,7 +21,7 @@ public class SqlAnywherePlatform extends DatabasePlatform {
     super();
     this.platform = Platform.SQLANYWHERE;
     this.dbIdentity.setIdType(IdType.IDENTITY);
-
+    this.likeClauseRaw = "like ?";
     this.sqlLimiter = new SqlAnywhereLimiter();
     this.dbIdentity.setSupportsGetGeneratedKeys(false);
     this.dbIdentity.setSelectLastInsertedIdTemplate("select @@IDENTITY as X");

From 6c7cedc1f19c5b84ad42a7828498d49004c5b523 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 10:19:11 +1200
Subject: [PATCH 026/127] #2799 - Remove unused
 DatabasePlatform.treatEmptyStringsAsNull

---
 .../ebean/config/dbplatform/DatabasePlatform.java  | 14 --------------
 .../io/ebean/platform/oracle/OraclePlatform.java   |  1 -
 2 files changed, 15 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index faed5973d..854ff0dc1 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -140,11 +140,6 @@ public class DatabasePlatform {
    */
   protected int clobDbType = Types.CLOB;
 
-  /**
-   * For Oracle treat empty strings as null.
-   */
-  protected boolean treatEmptyStringsAsNull;
-
   /**
    * The database platform name.
    */
@@ -542,15 +537,6 @@ public class DatabasePlatform {
     return clobDbType;
   }
 
-  /**
-   * Return true if empty strings should be treated as null.
-   *
-   * @return true, if checks if is treat empty strings as null
-   */
-  public boolean isTreatEmptyStringsAsNull() {
-    return treatEmptyStringsAsNull;
-  }
-
   /**
    * Return true if a compound ID in (...) type expression needs to be in
    * expanded form of (a=? and b=?) or (a=? and b=?) or ... rather than (a,b) in
diff --git a/platforms/oracle/src/main/java/io/ebean/platform/oracle/OraclePlatform.java b/platforms/oracle/src/main/java/io/ebean/platform/oracle/OraclePlatform.java
index a76880606..b067907f7 100644
--- a/platforms/oracle/src/main/java/io/ebean/platform/oracle/OraclePlatform.java
+++ b/platforms/oracle/src/main/java/io/ebean/platform/oracle/OraclePlatform.java
@@ -38,7 +38,6 @@ public class OraclePlatform extends DatabasePlatform {
     this.dbDefaultValue.setFalse("0");
     this.dbDefaultValue.setTrue("1");
     this.dbDefaultValue.setNow("current_timestamp");
-    this.treatEmptyStringsAsNull = true;
     this.likeClauseRaw = "like ?";
 
     this.exceptionTranslator =

From 341b9a74493e67155b1c3eead6a72a205fdc9636 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 10:23:14 +1200
Subject: [PATCH 027/127] Refactor DatabasePlatform - remove unused method
 tableExists()

---
 .../ebean/config/dbplatform/DatabasePlatform.java   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 854ff0dc1..9517462b7 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -769,19 +769,6 @@ public class DatabasePlatform {
     return false;
   }
 
-  /**
-   * Return true if the table exists.
-   */
-  public boolean tableExists(Connection connection, String catalog, String schema, String table) throws SQLException {
-    DatabaseMetaData metaData = connection.getMetaData();
-    ResultSet tables = metaData.getTables(catalog, schema, table, null);
-    try {
-      return tables.next();
-    } finally {
-      JdbcClose.close(tables);
-    }
-  }
-
   /**
    * Escapes the like string for this DB-Platform
    */

From 456086fb3cabf5ff235024b99f2117bb0781566c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 10:34:39 +1200
Subject: [PATCH 028/127] Refactor DatabasePlatform - rename getters to
 accessors

Although this is public API these getters are not expected to be used
by application code so, I feel comfortable making this change.
---
 .../config/AbstractNamingConvention.java      |  2 +-
 .../java/io/ebean/config/DatabaseConfig.java  |  2 +-
 .../config/dbplatform/DatabasePlatform.java   | 70 +++++++++----------
 .../server/core/AbstractSqlQueryRequest.java  |  2 +-
 .../server/core/DefaultContainer.java         |  2 +-
 .../server/core/DefaultServer.java            |  6 +-
 .../server/core/InitDataSource.java           |  2 +-
 .../server/core/InternalConfiguration.java    | 10 +--
 .../server/core/OrmQueryRequest.java          |  4 +-
 .../server/deploy/BeanDescriptorManager.java  | 10 +--
 .../server/deploy/parse/AnnotationBase.java   |  2 +-
 .../server/deploy/parse/AnnotationFields.java |  2 +-
 .../platform/DbExpressionHandlerFactory.java  |  2 +-
 .../server/persist/DefaultPersister.java      |  2 +-
 .../server/persist/dml/InsertMeta.java        |  4 +-
 .../server/persist/dml/MetaFactory.java       |  2 +-
 .../server/query/CQueryBuilder.java           | 16 ++---
 .../server/query/CQueryEngine.java            |  6 +-
 .../transaction/TransactionManager.java       |  2 +-
 .../server/type/DefaultTypeFactory.java       |  2 +-
 .../server/type/DefaultTypeManager.java       | 10 +--
 .../dbmigration/DdlGenerator.java             |  4 +-
 .../dbmigration/DefaultDbMigration.java       |  6 +-
 .../dbmigration/IndexMigration.java           |  2 +-
 .../ddlgeneration/PlatformDdlBuilder.java     |  2 +-
 .../ddlgeneration/platform/BaseTableDdl.java  |  6 +-
 .../ddlgeneration/platform/MySqlDdl.java      |  2 +-
 .../ddlgeneration/platform/PlatformDdl.java   | 12 ++--
 .../model/build/ModelBuildContext.java        |  2 +-
 .../dbmigration/HanaPlatformTest.java         |  4 +-
 .../dbmigration/SqlserverPlatformTest.java    |  6 +-
 .../platform/PlatformTypeConverterTest.java   | 10 +--
 .../test/java/io/localtest/BaseTestCase.java  |  8 +--
 .../java/io/ebean/xtest/BaseTestCase.java     | 12 ++--
 .../config/PlatformNoGeneratedKeysTest.java   |  2 +-
 .../config/dbplatform/DbTypeMapTest.java      | 14 ++--
 .../config/dbplatform/HanaPlatformTest.java   |  4 +-
 .../dbplatform/SqlserverPlatformTest.java     |  6 +-
 .../sqlserver/SqlServer2016PlatformTest.java  |  2 +-
 .../xtest/dbmigration/DbMigrationTest.java    |  2 +-
 .../xtest/platform/PlatformLikeTest.java      | 10 +--
 .../org/tests/basic/encrypt/TestEncrypt.java  |  2 +-
 .../batchinsert/TestBatchInsertSimple.java    |  2 +-
 .../TestBatchOnCascadeExceptionHandling.java  |  2 +-
 .../org/tests/idkeys/TestGeneratedKeys.java   |  4 +-
 .../TestElementCollectionBasicCache.java      |  2 +-
 .../TestElementCollectionBasicMapCache.java   |  2 +-
 .../clickhouse/ClickHousePlatform.java        |  2 +-
 .../io/ebean/platform/h2/H2PlatformTest.java  |  2 +-
 .../io/ebean/platform/hana/HanaPlatform.java  |  2 +-
 .../platform/mysql/MySqlPlatformTest.java     |  5 +-
 .../platform/oracle/OraclePlatformTest.java   | 10 +--
 .../platform/postgres/PostgresPlatform.java   |  2 +-
 .../postgres/PostgresPlatformTest.java        |  4 +-
 .../sqlserver/SqlServerBasePlatform.java      |  2 +-
 .../sqlserver/SqlServerPlatformTest.java      |  2 +-
 56 files changed, 160 insertions(+), 161 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java
index 33d607e97..b317ad7a5 100644
--- a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java
+++ b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java
@@ -237,7 +237,7 @@ public abstract class AbstractNamingConvention implements NamingConvention {
     }
     buffer.append(rhsTableName);
 
-    int maxTableNameLength = databasePlatform.getMaxTableNameLength();
+    int maxTableNameLength = databasePlatform.maxTableNameLength();
 
     // maxConstraintNameLength is used as the max table name length.
     if (buffer.length() > maxTableNameLength) {
diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index 0ed96efda..ca778d02c 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -3024,7 +3024,7 @@ public class DatabaseConfig {
   public PersistBatch appliedPersistBatchOnCascade() {
     if (persistBatchOnCascade == PersistBatch.INHERIT) {
       // use the platform default (ALL except SQL Server which has NONE)
-      return databasePlatform.getPersistBatchOnCascade();
+      return databasePlatform.persistBatchOnCascade();
     }
     return persistBatchOnCascade;
   }
diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 9517462b7..117da5ac8 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -288,7 +288,7 @@ public class DatabasePlatform {
   /**
    * Return the platform key.
    */
-  public Platform getPlatform() {
+  public Platform platform() {
     return platform;
   }
 
@@ -298,14 +298,14 @@ public class DatabasePlatform {
    * "generic" is returned when no specific database platform has been set or found.
    * </p>
    */
-  public String getName() {
+  public String name() {
     return platform.name().toLowerCase();
   }
 
   /**
    * Return true if we are using Sequence batch mode rather than STEP.
    */
-  public boolean isSequenceBatchMode() {
+  public boolean sequenceBatchMode() {
     return sequenceBatchMode;
   }
 
@@ -319,52 +319,52 @@ public class DatabasePlatform {
   /**
    * Return true if this database platform supports native ILIKE expression.
    */
-  public boolean isSupportsNativeIlike() {
+  public boolean supportsNativeIlike() {
     return supportsNativeIlike;
   }
 
   /**
    * Return true if the platform supports delete statements with table alias.
    */
-  public boolean isSupportsDeleteTableAlias() {
+  public boolean supportsDeleteTableAlias() {
     return supportsDeleteTableAlias;
   }
 
   /**
-   * Return true if the collation is case sensitive.
+   * Return true if the collation is case-sensitive.
    * <p>
    * This is expected to be used for testing only.
    * </p>
    */
-  public boolean isCaseSensitiveCollation() {
+  public boolean caseSensitiveCollation() {
     return caseSensitiveCollation;
   }
 
   /**
    * Return true if the platform supports SavepointId values.
    */
-  public boolean isSupportsSavepointId() {
+  public boolean supportsSavepointId() {
     return supportsSavepointId;
   }
 
   /**
    * Return true if migrations should use stored procedures.
    */
-  public boolean isUseMigrationStoredProcedures() {
+  public boolean useMigrationStoredProcedures() {
     return useMigrationStoredProcedures;
   }
 
   /**
    * Return true if the platform supports LIMIT with sql update.
    */
-  public boolean isInlineSqlUpdateLimit() {
+  public boolean inlineSqlUpdateLimit() {
     return inlineSqlUpdateLimit;
   }
 
   /**
    * Return the maximum number of bind values this database platform allows or zero for no limit.
    */
-  public int getMaxInBinding() {
+  public int maxInBinding() {
     return maxInBinding;
   }
 
@@ -374,14 +374,14 @@ public class DatabasePlatform {
    * This is used when deriving names of intersection tables.
    * </p>
    */
-  public int getMaxTableNameLength() {
+  public int maxTableNameLength() {
     return maxTableNameLength;
   }
 
   /**
    * Return the maximum constraint name allowed for the platform.
    */
-  public int getMaxConstraintNameLength() {
+  public int maxConstraintNameLength() {
     return maxConstraintNameLength;
   }
 
@@ -426,7 +426,7 @@ public class DatabasePlatform {
   /**
    * Return the DbEncrypt handler for this DB platform.
    */
-  public DbEncrypt getDbEncrypt() {
+  public DbEncrypt dbEncrypt() {
     return dbEncrypt;
   }
 
@@ -440,7 +440,7 @@ public class DatabasePlatform {
   /**
    * Return the history support for this database platform.
    */
-  public DbHistorySupport getHistorySupport() {
+  public DbHistorySupport historySupport() {
     return historySupport;
   }
 
@@ -454,14 +454,14 @@ public class DatabasePlatform {
   /**
    * So no except for Postgres and CockroachDB.
    */
-  public boolean isNativeArrayType() {
+  public boolean nativeArrayType() {
     return false;
   }
 
   /**
    * Return true if the DB supports native UUID.
    */
-  public boolean isNativeUuidType() {
+  public boolean nativeUuidType() {
     return nativeUuidType;
   }
 
@@ -470,21 +470,21 @@ public class DatabasePlatform {
    *
    * @return the db type map
    */
-  public DbPlatformTypeMapping getDbTypeMap() {
+  public DbPlatformTypeMapping dbTypeMap() {
     return dbTypeMap;
   }
 
   /**
    * Return the mapping for DB column default values.
    */
-  public DbDefaultValue getDbDefaultValue() {
+  public DbDefaultValue dbDefaultValue() {
     return dbDefaultValue;
   }
 
   /**
    * Return the column alias prefix.
    */
-  public String getColumnAliasPrefix() {
+  public String columnAliasPrefix() {
     return columnAliasPrefix;
   }
 
@@ -498,21 +498,21 @@ public class DatabasePlatform {
   /**
    * Return the close quote for quoted identifiers.
    */
-  public String getCloseQuote() {
+  public String closeQuote() {
     return closeQuote;
   }
 
   /**
    * Return the open quote for quoted identifiers.
    */
-  public String getOpenQuote() {
+  public String openQuote() {
     return openQuote;
   }
 
   /**
    * Return the JDBC type used to store booleans.
    */
-  public int getBooleanDbType() {
+  public int booleanDbType() {
     return booleanDbType;
   }
 
@@ -523,7 +523,7 @@ public class DatabasePlatform {
    * example.
    * </p>
    */
-  public int getBlobDbType() {
+  public int blobDbType() {
     return blobDbType;
   }
 
@@ -533,7 +533,7 @@ public class DatabasePlatform {
    * This is typically Types.CLOB but for Postgres is Types.VARCHAR.
    * </p>
    */
-  public int getClobDbType() {
+  public int clobDbType() {
     return clobDbType;
   }
 
@@ -542,7 +542,7 @@ public class DatabasePlatform {
    * expanded form of (a=? and b=?) or (a=? and b=?) or ... rather than (a,b) in
    * ((?,?),(?,?),...);
    */
-  public boolean isIdInExpandedForm() {
+  public boolean idInExpandedForm() {
     return idInExpandedForm;
   }
 
@@ -553,7 +553,7 @@ public class DatabasePlatform {
    * This specifically is required for MySql when processing large results.
    * </p>
    */
-  public boolean isForwardOnlyHintOnFindIterate() {
+  public boolean forwardOnlyHintOnFindIterate() {
     return forwardOnlyHintOnFindIterate;
   }
 
@@ -571,7 +571,7 @@ public class DatabasePlatform {
    * This specifically is required for Hana which doesn't support CONCUR_UPDATABLE
    * </p>
    */
-  public boolean isSupportsResultSetConcurrencyModeUpdatable() {
+  public boolean supportsResultSetConcurrencyModeUpdatable() {
     return supportsResultSetConcurrencyModeUpdatable;
   }
 
@@ -591,7 +591,7 @@ public class DatabasePlatform {
    *
    * @return the db identity
    */
-  public DbIdentity getDbIdentity() {
+  public DbIdentity dbIdentity() {
     return dbIdentity;
   }
 
@@ -604,14 +604,14 @@ public class DatabasePlatform {
    *
    * @return the sql limiter
    */
-  public SqlLimiter getSqlLimiter() {
+  public SqlLimiter sqlLimiter() {
     return sqlLimiter;
   }
 
   /**
    * Return the BasicSqlLimiter for limit/offset of SqlQuery queries.
    */
-  public BasicSqlLimiter getBasicSqlLimiter() {
+  public BasicSqlLimiter basicSqlLimiter() {
     return basicSqlLimiter;
   }
 
@@ -680,14 +680,14 @@ public class DatabasePlatform {
   /**
    * Set to true if select count against anonymous view requires an alias.
    */
-  public boolean isSelectCountWithAlias() {
+  public boolean selectCountWithAlias() {
     return selectCountWithAlias;
   }
 
   /**
    * Return true if select count with subquery needs column alias (SQL Server).
    */
-  public boolean isSelectCountWithColumnAlias() {
+  public boolean selectCountWithColumnAlias() {
     return selectCountWithColumnAlias;
   }
 
@@ -718,14 +718,14 @@ public class DatabasePlatform {
    * <p>
    * This may include an escape clause to disable a default escape character.
    */
-  public String getLikeClause(boolean rawLikeExpression) {
+  public String likeClause(boolean rawLikeExpression) {
     return rawLikeExpression ? likeClauseRaw : likeClauseEscaped;
   }
 
   /**
    * Return the platform default JDBC batch mode for persist cascade.
    */
-  public PersistBatch getPersistBatchOnCascade() {
+  public PersistBatch persistBatchOnCascade() {
     return persistBatchOnCascade;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index 01812fe5f..2424dd2b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -119,7 +119,7 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery {
     int firstRow = query.getFirstRow();
     int maxRows = query.getMaxRows();
     if (firstRow > 0 || maxRows > 0) {
-      return server.databasePlatform().getBasicSqlLimiter().limit(sql, firstRow, maxRows);
+      return server.databasePlatform().basicSqlLimiter().limit(sql, firstRow, maxRows);
     }
     return sql;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 16df24f4c..f15ab82ff 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -108,7 +108,7 @@ public final class DefaultContainer implements SpiContainer {
         startServer(online, server);
       }
       DbOffline.reset();
-      log.log(INFO, "Started database[{0}] platform[{1}] in {2}ms", config.getName(), config.getDatabasePlatform().getPlatform(), System.currentTimeMillis() - start);
+      log.log(INFO, "Started database[{0}] platform[{1}] in {2}ms", config.getName(), config.getDatabasePlatform().platform(), System.currentTimeMillis() - start);
       return server;
     } finally {
       lock.unlock();
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 d0333acda..02acc09a7 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
@@ -251,7 +251,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public Platform platform() {
-    return databasePlatform.getPlatform();
+    return databasePlatform.platform();
   }
 
   @Override
@@ -318,7 +318,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
         migrationRunner.setDefaultDbSchema(dbSchema);
       }
       migrationRunner.setName(config.getName());
-      Platform platform = config.getDatabasePlatform().getPlatform();
+      Platform platform = config.getDatabasePlatform().platform();
       migrationRunner.setBasePlatform(platform.base().name().toLowerCase());
       migrationRunner.setPlatform(platform.name().toLowerCase());
       migrationRunner.loadProperties(config.getProperties());
@@ -560,7 +560,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     try (Connection connection = dataSource().getConnection()) {
       for (String table : tables) {
         executeSql(connection, databasePlatform.truncateStatement(table));
-        if (databasePlatform.getPlatform().base() == Platform.DB2) {
+        if (databasePlatform.platform().base() == Platform.DB2) {
           // DB2 requires commit after each truncate statement
           connection.commit();
         }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java
index c7e17119f..3eb6dfe3a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java
@@ -105,7 +105,7 @@ final class InitDataSource {
   }
 
   boolean isPostgresAllQuotedIdentifiers() {
-    return config.isAllQuotedIdentifiers() && Platform.POSTGRES == config.getDatabasePlatform().getPlatform().base();
+    return config.isAllQuotedIdentifiers() && Platform.POSTGRES == config.getDatabasePlatform().platform().base();
   }
 
   private DataSource create(DataSourceConfig dsConfig, boolean readOnly) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 51e4a7d5f..67c3142fe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -116,7 +116,7 @@ public final class InternalConfiguration {
     this.databasePlatform = config.getDatabasePlatform();
     this.expressionFactory = initExpressionFactory(config);
     this.typeManager = new DefaultTypeManager(config, bootupClasses);
-    this.multiValueBind = createMultiValueBind(databasePlatform.getPlatform());
+    this.multiValueBind = createMultiValueBind(databasePlatform.platform());
     this.deployInherit = new DeployInherit(bootupClasses);
     this.deployCreateProperties = new DeployCreateProperties(typeManager);
     this.deployUtil = new DeployUtil(typeManager, config);
@@ -171,7 +171,7 @@ public final class InternalConfiguration {
    * Create and return the ExpressionFactory based on configuration and database platform.
    */
   private ExpressionFactory initExpressionFactory(DatabaseConfig config) {
-    boolean nativeIlike = config.isExpressionNativeIlike() && databasePlatform.isSupportsNativeIlike();
+    boolean nativeIlike = config.isExpressionNativeIlike() && databasePlatform.supportsNativeIlike();
     return new DefaultExpressionFactory(config.isExpressionEqualsWithNullAsNoop(), nativeIlike);
   }
 
@@ -265,7 +265,7 @@ public final class InternalConfiguration {
 
     DbExpressionHandler jsonHandler = getDbExpressionHandler(databasePlatform);
 
-    DbHistorySupport historySupport = databasePlatform.getHistorySupport();
+    DbHistorySupport historySupport = databasePlatform.historySupport();
     if (historySupport == null) {
       return new Binder(typeManager, logManager, 0, false, jsonHandler, dataTimeZone, multiValueBind);
     }
@@ -321,7 +321,7 @@ public final class InternalConfiguration {
   }
 
   private Platform getPlatform() {
-    return getDatabasePlatform().getPlatform();
+    return getDatabasePlatform().platform();
   }
 
   public DatabasePlatform getDatabasePlatform() {
@@ -577,7 +577,7 @@ public final class InternalConfiguration {
       return QueryPlanManager.NOOP;
     }
     long threshold = config.getQueryPlanThresholdMicros();
-    return new CQueryPlanManager(transactionManager, threshold, queryPlanLogger(databasePlatform.getPlatform()), extraMetrics);
+    return new CQueryPlanManager(transactionManager, threshold, queryPlanLogger(databasePlatform.platform()), extraMetrics);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 23df28e38..29dd4ac1d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -100,7 +100,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    */
   @Override
   public String dbLikeClause(boolean rawLikeExpression) {
-    return server.databasePlatform().getLikeClause(rawLikeExpression);
+    return server.databasePlatform().likeClause(rawLikeExpression);
   }
 
   /**
@@ -761,7 +761,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    * Return true if no MaxRows or use LIMIT in SQL update.
    */
   public boolean isInlineSqlUpdateLimit() {
-    return query.getMaxRows() < 1 || server.databasePlatform().isInlineSqlUpdateLimit();
+    return query.getMaxRows() < 1 || server.databasePlatform().inlineSqlUpdateLimit();
   }
 
   public int forwardOnlyFetchSize() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index bfdc4cd17..f54784a34 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -134,7 +134,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     this.encryptKeyManager = this.config.getEncryptKeyManager();
     this.databasePlatform = this.config.getDatabasePlatform();
     this.multiValueBind = config.getMultiValueBind();
-    this.idBinderFactory = new IdBinderFactory(databasePlatform.isIdInExpandedForm(), multiValueBind);
+    this.idBinderFactory = new IdBinderFactory(databasePlatform.idInExpandedForm(), multiValueBind);
     this.queryPlanTTLSeconds = this.config.getQueryPlanTTLSeconds();
     this.asOfViewSuffix = asOfViewSuffix(databasePlatform, this.config);
     String versionsBetweenSuffix = versionsBetweenSuffix(databasePlatform, this.config);
@@ -142,7 +142,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     this.bootupClasses = config.getBootupClasses();
     this.createProperties = config.getDeployCreateProperties();
     this.namingConvention = this.config.getNamingConvention();
-    this.dbIdentity = config.getDatabasePlatform().getDbIdentity();
+    this.dbIdentity = config.getDatabasePlatform().dbIdentity();
     this.deplyInherit = config.getDeployInherit();
     this.deployUtil = config.getDeployUtil();
     this.typeManager = deployUtil.getTypeManager();
@@ -196,7 +196,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    * Return the AsOfViewSuffix based on the DbHistorySupport.
    */
   private String asOfViewSuffix(DatabasePlatform databasePlatform, DatabaseConfig serverConfig) {
-    DbHistorySupport historySupport = databasePlatform.getHistorySupport();
+    DbHistorySupport historySupport = databasePlatform.historySupport();
     // with historySupport returns a simple view suffix or the sql2011 as of timestamp suffix
     return (historySupport == null) ? serverConfig.getAsOfViewSuffix() : historySupport.getAsOfViewSuffix(serverConfig.getAsOfViewSuffix());
   }
@@ -205,7 +205,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
    * Return the versions between timestamp suffix based on the DbHistorySupport.
    */
   private String versionsBetweenSuffix(DatabasePlatform databasePlatform, DatabaseConfig serverConfig) {
-    DbHistorySupport historySupport = databasePlatform.getHistorySupport();
+    DbHistorySupport historySupport = databasePlatform.historySupport();
     // with historySupport returns a simple view suffix or the sql2011 versions between timestamp suffix
     return (historySupport == null) ? serverConfig.getAsOfViewSuffix() : historySupport.getVersionsBetweenSuffix(serverConfig.getAsOfViewSuffix());
   }
@@ -1251,7 +1251,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
         String primaryKeyColumn = desc.getSinglePrimaryKeyColumn();
         seqName = namingConvention.getSequenceName(desc.getBaseTable(), primaryKeyColumn);
       }
-      int stepSize = desc.setIdentitySequenceBatchMode(databasePlatform.isSequenceBatchMode());
+      int stepSize = desc.setIdentitySequenceBatchMode(databasePlatform.sequenceBatchMode());
       desc.setIdGenerator(createSequenceIdGenerator(seqName, stepSize));
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
index b74035dc0..1d182c6a6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
@@ -53,7 +53,7 @@ abstract class AnnotationBase {
   AnnotationBase(DeployUtil util) {
     this.util = util;
     this.databasePlatform = util.getDbPlatform();
-    this.platform = databasePlatform.getPlatform();
+    this.platform = databasePlatform.platform();
     this.namingConvention = util.getNamingConvention();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index f93fbf028..331b6926d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -398,7 +398,7 @@ final class AnnotationFields extends AnnotationParser {
       return;
     }
     if (dbEncString) {
-      DbEncrypt dbEncrypt = util.getDbPlatform().getDbEncrypt();
+      DbEncrypt dbEncrypt = util.getDbPlatform().dbEncrypt();
       if (dbEncrypt != null) {
         // check if we have a DB encryption function for this type
         int jdbcType = prop.getScalarType().getJdbcType();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
index da3eee778..189b669e2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
@@ -10,7 +10,7 @@ public final class DbExpressionHandlerFactory {
    * Create and return the appropriate platform specific handing of expressions.
    */
   public static DbExpressionHandler from(DatabasePlatform databasePlatform) {
-    Platform platform = databasePlatform.getPlatform().base();
+    Platform platform = databasePlatform.platform().base();
     switch (platform) {
       case H2:
         return new H2DbExpression();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index 104ccbe74..f78e11ea8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -50,7 +50,7 @@ public final class DefaultPersister implements Persister {
     this.server = server;
     this.beanDescriptorManager = descMgr;
     this.persistExecute = new DefaultPersistExecute(binder, server.config().getPersistBatchSize());
-    this.maxInBinding = server.databasePlatform().getMaxInBinding();
+    this.maxInBinding = server.databasePlatform().maxInBinding();
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
index e3a89d1fa..1e59a193c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
@@ -38,7 +38,7 @@ final class InsertMeta {
   private final Platform platform;
 
   InsertMeta(DatabasePlatform dbPlatform, BeanDescriptor<?> desc, Bindable shadowFKey, BindableId id, BindableList all) {
-    this.platform = dbPlatform.getPlatform();
+    this.platform = dbPlatform.platform();
     this.discriminator = getDiscriminator(desc);
     this.id = id;
     this.all = all;
@@ -69,7 +69,7 @@ final class InsertMeta {
         this.supportsSelectLastInsertedId = false;
       } else {
         this.identityDbColumns = new String[]{id.getIdentityColumn()};
-        this.supportsGetGeneratedKeys = dbPlatform.getDbIdentity().isSupportsGetGeneratedKeys();
+        this.supportsGetGeneratedKeys = dbPlatform.dbIdentity().isSupportsGetGeneratedKeys();
         this.supportsSelectLastInsertedId = desc.supportsSelectLastInsertedId();
       }
       this.sqlNullId = genSql(true, tableName, false);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
index 9819aaf77..28d43f6db 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/MetaFactory.java
@@ -40,7 +40,7 @@ final class MetaFactory {
   MetaFactory(DatabasePlatform dbPlatform) {
     this.dbPlatform = dbPlatform;
     // to bind encryption data before or after the encryption key
-    DbEncrypt dbEncrypt = dbPlatform.getDbEncrypt();
+    DbEncrypt dbEncrypt = dbPlatform.dbEncrypt();
     boolean bindEncryptDataFirst = dbEncrypt == null || dbEncrypt.isBindEncryptDataFirst();
     this.baseFact = new FactoryBaseProperties(bindEncryptDataFirst);
     this.embeddedFact = new FactoryEmbedded(bindEncryptDataFirst);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 3f308d99a..3594c19a0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -60,11 +60,11 @@ final class CQueryBuilder {
     this.binder = binder;
     this.draftSupport = draftSupport;
     this.historySupport = historySupport;
-    this.columnAliasPrefix = dbPlatform.getColumnAliasPrefix();
-    this.sqlLimiter = dbPlatform.getSqlLimiter();
+    this.columnAliasPrefix = dbPlatform.columnAliasPrefix();
+    this.sqlLimiter = dbPlatform.sqlLimiter();
     this.rawSqlHandler = new CQueryBuilderRawSql(sqlLimiter, dbPlatform);
-    this.selectCountWithAlias = dbPlatform.isSelectCountWithAlias();
-    this.selectCountWithColumnAlias = dbPlatform.isSelectCountWithColumnAlias();
+    this.selectCountWithAlias = dbPlatform.selectCountWithAlias();
+    this.selectCountWithColumnAlias = dbPlatform.selectCountWithColumnAlias();
   }
 
   /**
@@ -118,10 +118,10 @@ final class CQueryBuilder {
   private <T> String buildDeleteSql(OrmQueryRequest<T> request, String rootTableAlias, CQueryPredicates predicates, SqlTree sqlTree) {
     String alias = alias(rootTableAlias);
     if (sqlTree.noJoins() && !request.query().hasMaxRowsOrFirstRow()) {
-      if (dbPlatform.isSupportsDeleteTableAlias()) {
+      if (dbPlatform.supportsDeleteTableAlias()) {
         // delete from table <alias> ...
         return aliasReplace(buildSqlDelete("delete", request, predicates, sqlTree).getSql(), alias);
-      } else if (isMySql(dbPlatform.getPlatform())) {
+      } else if (isMySql(dbPlatform.platform())) {
         return aliasReplace(buildSqlDelete("delete " + alias, request, predicates, sqlTree).getSql(), alias);
       } else {
         // simple - delete from table ...
@@ -380,7 +380,7 @@ final class CQueryBuilder {
   }
 
   private String nativeQueryPaging(SpiQuery<?> query, String sql) {
-    return dbPlatform.getBasicSqlLimiter().limit(sql, query.getFirstRow(), query.getMaxRows());
+    return dbPlatform.basicSqlLimiter().limit(sql, query.getFirstRow(), query.getMaxRows());
   }
 
   /**
@@ -399,7 +399,7 @@ final class CQueryBuilder {
     try {
       // For SqlServer we need either "selectMethod=cursor" in the connection string or fetch explicitly a cursorable
       // statement here by specifying ResultSet.CONCUR_UPDATABLE
-      PreparedStatement statement = connection.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, dbPlatform.isSupportsResultSetConcurrencyModeUpdatable() ? ResultSet.CONCUR_UPDATABLE : ResultSet.CONCUR_READ_ONLY);
+      PreparedStatement statement = connection.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, dbPlatform.supportsResultSetConcurrencyModeUpdatable() ? ResultSet.CONCUR_UPDATABLE : ResultSet.CONCUR_READ_ONLY);
       predicates.bind(statement, connection);
       ResultSet resultSet = statement.executeQuery();
       ResultSetMetaData metaData = resultSet.getMetaData();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index ad2cdbae8..c4fec72dd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -43,13 +43,13 @@ public final class CQueryEngine {
     this.dbPlatform = dbPlatform;
     this.defaultFetchSizeFindEach = config.getJdbcFetchSizeFindEach();
     this.defaultFetchSizeFindList = config.getJdbcFetchSizeFindList();
-    this.forwardOnlyHintOnFindIterate = dbPlatform.isForwardOnlyHintOnFindIterate();
-    this.historySupport = new CQueryHistorySupport(dbPlatform.getHistorySupport(), asOfTableMapping, config.getAsOfSysPeriod());
+    this.forwardOnlyHintOnFindIterate = dbPlatform.forwardOnlyHintOnFindIterate();
+    this.historySupport = new CQueryHistorySupport(dbPlatform.historySupport(), asOfTableMapping, config.getAsOfSysPeriod());
     this.queryBuilder = new CQueryBuilder(dbPlatform, binder, historySupport, new CQueryDraftSupport(draftTableMap));
   }
 
   public int forwardOnlyFetchSize() {
-    Platform base = dbPlatform.getPlatform().base();
+    Platform base = dbPlatform.platform().base();
     return Platform.MYSQL == base ? Integer.MIN_VALUE : 1;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 523315eee..9a167fce8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -120,7 +120,7 @@ public class TransactionManager implements SpiTransactionManager {
     this.txnLogger = logManager.txn();
     this.txnDebug = txnLogger.isDebug();
     this.databasePlatform = options.config.getDatabasePlatform();
-    this.supportsSavepointId = databasePlatform.isSupportsSavepointId();
+    this.supportsSavepointId = databasePlatform.supportsSavepointId();
     this.skipCacheAfterWrite = options.config.isSkipCacheAfterWrite();
     this.notifyL2CacheInForeground = options.notifyL2CacheInForeground;
     this.autoPersistUpdates = options.config.isAutoPersistUpdates();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
index b962a4811..f0a700670 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
@@ -50,7 +50,7 @@ final class DefaultTypeFactory {
       return createBoolean(trueValue, falseValue);
     }
     // determine based on database platform configuration
-    int booleanDbType = config.getDatabasePlatform().getBooleanDbType();
+    int booleanDbType = config.getDatabasePlatform().booleanDbType();
     if (booleanDbType == Types.BIT) {
       return new ScalarTypeBoolean.BitBoolean();
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index a1b7c3798..ca2c35609 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -167,7 +167,7 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private PlatformArrayTypeFactory arrayTypeListFactory(DatabasePlatform databasePlatform) {
-    if (databasePlatform.isNativeArrayType()) {
+    if (databasePlatform.nativeArrayType()) {
       return ScalarTypeArrayList.factory();
     } else if (databasePlatform.isPlatform(Platform.H2)) {
       return ScalarTypeArrayListH2.factory();
@@ -176,7 +176,7 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private PlatformArrayTypeFactory arrayTypeSetFactory(DatabasePlatform databasePlatform) {
-    if (databasePlatform.isNativeArrayType()) {
+    if (databasePlatform.nativeArrayType()) {
       return ScalarTypeArraySet.factory();
     } else if (databasePlatform.isPlatform(Platform.H2)) {
       return ScalarTypeArraySetH2.factory();
@@ -834,8 +834,8 @@ public final class DefaultTypeManager implements TypeManager {
    */
   private void initialiseStandard(DatabaseConfig config) {
     DatabasePlatform databasePlatform = config.getDatabasePlatform();
-    int platformClobType = databasePlatform.getClobDbType();
-    int platformBlobType = databasePlatform.getBlobDbType();
+    int platformClobType = databasePlatform.clobDbType();
+    int platformBlobType = databasePlatform.blobDbType();
 
     nativeMap.put(DbPlatformType.HSTORE, hstoreType);
 
@@ -857,7 +857,7 @@ public final class DefaultTypeManager implements TypeManager {
     }
 
     PlatformConfig.DbUuid dbUuid = config.getPlatformConfig().getDbUuid();
-    if (offlineMigrationGeneration || (databasePlatform.isNativeUuidType() && dbUuid.useNativeType())) {
+    if (offlineMigrationGeneration || (databasePlatform.nativeUuidType() && dbUuid.useNativeType())) {
       addType(UUID.class, new ScalarTypeUUIDNative());
     } else {
       // Store UUID as binary(16) or varchar(40)
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
index 7f9c2ba6b..7567ad4cf 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java
@@ -58,7 +58,7 @@ public class DdlGenerator implements SpiDdlGenerator {
     this.createOnly = config.isDdlCreateOnly();
     this.dbSchema = config.getDbSchema();
     final DatabasePlatform databasePlatform = server.databasePlatform();
-    this.platform = databasePlatform.getPlatform();
+    this.platform = databasePlatform.platform();
     this.platformName = platform.base().name();
     if (!config.getTenantMode().isDdlEnabled() && config.isDdlRun()) {
       log.log(WARNING, "DDL can't be run on startup with TenantMode " + config.getTenantMode());
@@ -66,7 +66,7 @@ public class DdlGenerator implements SpiDdlGenerator {
       this.useMigrationStoredProcedures = false;
     } else {
       this.runDdl = config.isDdlRun();
-      this.useMigrationStoredProcedures = config.getDatabasePlatform().isUseMigrationStoredProcedures();
+      this.useMigrationStoredProcedures = config.getDatabasePlatform().useMigrationStoredProcedures();
     }
     this.scriptTransform = createScriptTransform(config);
     this.baseDir = initBaseDir();
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index f20b39121..a96957d0a 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -209,7 +209,7 @@ public class DefaultDbMigration implements DbMigration {
   public void setPlatform(DatabasePlatform databasePlatform) {
     this.databasePlatform = databasePlatform;
     if (!online) {
-      DbOffline.setPlatform(databasePlatform.getPlatform());
+      DbOffline.setPlatform(databasePlatform.platform());
     }
   }
 
@@ -388,8 +388,8 @@ public class DefaultDbMigration implements DbMigration {
     if (extraDdl != null) {
       List<DdlScript> ddlScript = extraDdl.getDdlScript();
       for (DdlScript script : ddlScript) {
-        if (!script.isDrop() && matchPlatform(dbPlatform.getPlatform(), script.getPlatforms())) {
-          if (!checkSkip || dbPlatform.isUseMigrationStoredProcedures()) {
+        if (!script.isDrop() && matchPlatform(dbPlatform.platform(), script.getPlatforms())) {
+          if (!checkSkip || dbPlatform.useMigrationStoredProcedures()) {
             writeExtraDdl(migrationDir, script);
           }
         }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java
index c0f6221d7..a2c14388b 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/IndexMigration.java
@@ -40,7 +40,7 @@ class IndexMigration {
 
   File init() {
     pathStack.push("");
-    String name = "idx_" + databasePlatform.getPlatform().base().name().toLowerCase() + ".migrations";
+    String name = "idx_" + databasePlatform.platform().base().name().toLowerCase() + ".migrations";
     return new File(topDir, name);
   }
 
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/PlatformDdlBuilder.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/PlatformDdlBuilder.java
index 07e0be2bf..6302433c5 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/PlatformDdlBuilder.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/PlatformDdlBuilder.java
@@ -13,7 +13,7 @@ public class PlatformDdlBuilder {
    */
   public static PlatformDdl create(DatabasePlatform platform) {
 
-    switch (platform.getPlatform()) {
+    switch (platform.platform()) {
       case H2:
         return new H2Ddl(platform);
       case DB2:
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
index 93a8459ea..e9fafccc4 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
@@ -121,7 +121,7 @@ public class BaseTableDdl implements TableDdl {
     }
 
     private List<String> getScriptsForPlatform(List<DdlScript> scripts) {
-      Platform searchPlatform = platformDdl.getPlatform().getPlatform();
+      Platform searchPlatform = platformDdl.getPlatform().platform();
       for (DdlScript script : scripts) {
         if (matchPlatform(searchPlatform, script.getPlatforms())) {
           // just returns the first match (rather than appends them)
@@ -444,7 +444,7 @@ public class BaseTableDdl implements TableDdl {
   }
 
   private boolean platformInclude(String platforms) {
-    return matchPlatform(platformDdl.getPlatform().getPlatform(), platforms);
+    return matchPlatform(platformDdl.getPlatform().platform(), platforms);
   }
 
   /**
@@ -610,7 +610,7 @@ public class BaseTableDdl implements TableDdl {
   public void generate(DdlWrite writer, DropTable dropTable) {
     dropTable(writer.applyPostAlter(), dropTable.getName());
     if (hasValue(dropTable.getSequenceCol())
-        && platformDdl.getPlatform().getDbIdentity().isSupportsSequence()) {
+        && platformDdl.getPlatform().dbIdentity().isSupportsSequence()) {
       String sequenceName = dropTable.getSequenceName();
       if (!hasValue(sequenceName)) {
         sequenceName = namingConvention.getSequenceName(dropTable.getName(), dropTable.getSequenceCol());
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
index 987303b20..9862b9e1c 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java
@@ -24,7 +24,7 @@ public class MySqlDdl extends PlatformDdl {
     this.dropUniqueConstraint = "drop index";
     this.historyDdl = new MySqlHistoryDdl();
     this.inlineComments = true;
-    this.useMigrationStoredProcedures = platform.isUseMigrationStoredProcedures();
+    this.useMigrationStoredProcedures = platform.useMigrationStoredProcedures();
   }
 
   /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
index 8443f2532..d7e825e86 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
@@ -97,9 +97,9 @@ public class PlatformDdl {
 
   public PlatformDdl(DatabasePlatform platform) {
     this.platform = platform;
-    this.dbIdentity = platform.getDbIdentity();
-    this.dbDefaultValue = platform.getDbDefaultValue();
-    this.typeConverter = new PlatformTypeConverter(platform.getDbTypeMap());
+    this.dbIdentity = platform.dbIdentity();
+    this.dbDefaultValue = platform.dbDefaultValue();
+    this.typeConverter = new PlatformTypeConverter(platform.dbTypeMap());
   }
 
   /**
@@ -719,11 +719,11 @@ public class PlatformDdl {
    * As 36^6 > 31^2, the resulting string is never longer as 6 chars.
    */
   protected String maxConstraintName(String name) {
-    if (name.length() > platform.getMaxConstraintNameLength()) {
+    if (name.length() > platform.maxConstraintNameLength()) {
       int hash = name.hashCode() & 0x7FFFFFFF;
       name = VowelRemover.trim(name, 4);
-      if (name.length() > platform.getMaxConstraintNameLength()) {
-        return name.substring(0, platform.getMaxConstraintNameLength() - 7) + "_" + Integer.toString(hash, 36);
+      if (name.length() > platform.maxConstraintNameLength()) {
+        return name.substring(0, platform.maxConstraintNameLength() - 7) + "_" + Integer.toString(hash, 36);
       }
     }
     return name;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
index a20874497..b0e57619b 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
@@ -56,7 +56,7 @@ public class ModelBuildContext {
     if (constraintNaming.getMaxLength() != null) {
       return constraintNaming.getMaxLength();
     }
-    return new DefaultConstraintMaxLength(databasePlatform.getMaxConstraintNameLength());
+    return new DefaultConstraintMaxLength(databasePlatform.maxConstraintNameLength());
   }
 
   /**
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java
index d7d3ff29d..b40708345 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/HanaPlatformTest.java
@@ -49,7 +49,7 @@ public class HanaPlatformTest {
 
     HanaPlatform platform = new HanaPlatform();
     platform.configure(new PlatformConfig());
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
 
     assertThat(dbType.renderType(0, 0)).isEqualTo("varchar(40)");
   }
@@ -63,7 +63,7 @@ public class HanaPlatformTest {
 
     platform.configure(config);
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("varbinary(16)");
   }
 }
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java
index 89e7b087f..402f7bfa9 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/SqlserverPlatformTest.java
@@ -38,7 +38,7 @@ public class SqlserverPlatformTest {
   public void uuid_default() {
 
     platform.configure(new PlatformConfig());
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
 
     assertThat(dbType.renderType(0, 0)).isEqualTo("uniqueidentifier");
   }
@@ -52,7 +52,7 @@ public class SqlserverPlatformTest {
 
     platform.configure(config);
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("binary(16)");
   }
 
@@ -64,7 +64,7 @@ public class SqlserverPlatformTest {
 
     platform.configure(config);
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("nvarchar(40)");
   }
 }
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
index b9665298e..44cddd421 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformTypeConverterTest.java
@@ -14,7 +14,7 @@ public class PlatformTypeConverterTest {
   public void convert_withSuffix_expect_suffix() {
 
     PostgresPlatform pg = new PostgresPlatform();
-    DbPlatformTypeMapping dbTypeMap = pg.getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = pg.dbTypeMap();
 
     PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);
 
@@ -30,7 +30,7 @@ public class PlatformTypeConverterTest {
   public void testConvert_given_postgres() throws Exception {
 
     PostgresPlatform pg = new PostgresPlatform();
-    DbPlatformTypeMapping dbTypeMap = pg.getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = pg.dbTypeMap();
 
     PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);
 
@@ -52,7 +52,7 @@ public class PlatformTypeConverterTest {
 
 
     H2Platform platform = new H2Platform();
-    DbPlatformTypeMapping dbTypeMap = platform.getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = platform.dbTypeMap();
 
     PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);
 
@@ -69,7 +69,7 @@ public class PlatformTypeConverterTest {
   public void testConvertJsonTypes_given_postgres() {
 
     PostgresPlatform platform = new PostgresPlatform();
-    DbPlatformTypeMapping dbTypeMap = platform.getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = platform.dbTypeMap();
 
     PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);
 
@@ -84,7 +84,7 @@ public class PlatformTypeConverterTest {
   public void testConvertJsonTypes_given_h2() {
 
     H2Platform platform = new H2Platform();
-    DbPlatformTypeMapping dbTypeMap = platform.getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = platform.dbTypeMap();
 
     PlatformTypeConverter converter = new PlatformTypeConverter(dbTypeMap);
 
diff --git a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
index 37e701fe6..48d3b7750 100644
--- a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
@@ -78,7 +78,7 @@ public abstract class BaseTestCase {
   }
 
   public boolean isPlatformBooleanNative() {
-    return Types.BOOLEAN == spiEbeanServer().databasePlatform().getBooleanDbType();
+    return Types.BOOLEAN == spiEbeanServer().databasePlatform().booleanDbType();
   }
 
   public boolean isPlatformOrderNullsSupport() {
@@ -86,11 +86,11 @@ public abstract class BaseTestCase {
   }
 
   public boolean isPlatformSupportsDeleteTableAlias() {
-    return spiEbeanServer().databasePlatform().isSupportsDeleteTableAlias();
+    return spiEbeanServer().databasePlatform().supportsDeleteTableAlias();
   }
 
   public boolean isPersistBatchOnCascade() {
-    return spiEbeanServer().databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
+    return spiEbeanServer().databasePlatform().persistBatchOnCascade() != PersistBatch.NONE;
   }
 
   /**
@@ -101,7 +101,7 @@ public abstract class BaseTestCase {
   }
 
   protected Platform platform() {
-    return spiEbeanServer().databasePlatform().getPlatform().base();
+    return spiEbeanServer().databasePlatform().platform().base();
   }
 
   protected SpiEbeanServer spiEbeanServer() {
diff --git a/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java
index cc4d04326..0685992d0 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java
@@ -168,7 +168,7 @@ public abstract class BaseTestCase {
   }
 
   public boolean isPlatformCaseSensitive() {
-    return spiEbeanServer().databasePlatform().isCaseSensitiveCollation();
+    return spiEbeanServer().databasePlatform().caseSensitiveCollation();
   }
 
   public boolean isLimitOffset() {
@@ -248,7 +248,7 @@ public abstract class BaseTestCase {
   }
 
   public boolean isPlatformBooleanNative() {
-    return Types.BOOLEAN == spiEbeanServer().databasePlatform().getBooleanDbType();
+    return Types.BOOLEAN == spiEbeanServer().databasePlatform().booleanDbType();
   }
 
   public boolean isPlatformOrderNullsSupport() {
@@ -256,11 +256,11 @@ public abstract class BaseTestCase {
   }
 
   public boolean isPlatformSupportsDeleteTableAlias() {
-    return spiEbeanServer().databasePlatform().isSupportsDeleteTableAlias();
+    return spiEbeanServer().databasePlatform().supportsDeleteTableAlias();
   }
 
   public boolean isPersistBatchOnCascade() {
-    return spiEbeanServer().databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
+    return spiEbeanServer().databasePlatform().persistBatchOnCascade() != PersistBatch.NONE;
   }
 
   /**
@@ -279,11 +279,11 @@ public abstract class BaseTestCase {
   }
 
   protected Platform platform() {
-    return spiEbeanServer().databasePlatform().getPlatform().base();
+    return spiEbeanServer().databasePlatform().platform().base();
   }
 
   protected IdType idType() {
-    return spiEbeanServer().databasePlatform().getDbIdentity().getIdType();
+    return spiEbeanServer().databasePlatform().dbIdentity().getIdType();
   }
 
   protected SpiEbeanServer spiEbeanServer() {
diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java
index efa396b08..d92c94905 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java
@@ -92,7 +92,7 @@ public class PlatformNoGeneratedKeysTest {
     config.setName("h2_noGeneratedKeys");
 
     OtherH2Platform platform = new OtherH2Platform();
-    DbIdentity dbIdentity = platform.getDbIdentity();
+    DbIdentity dbIdentity = platform.dbIdentity();
     dbIdentity.setIdType(IdType.IDENTITY);
     dbIdentity.setSupportsIdentity(true);
     dbIdentity.setSupportsGetGeneratedKeys(false);
diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java
index 79f0b0ac8..bafb9e8f8 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java
@@ -20,7 +20,7 @@ class DbTypeMapTest {
   @Test
   void testLookupRender_given_postgresPlatformType() {
     PostgresPlatform pg = new PostgresPlatform();
-    DbPlatformTypeMapping dbTypeMap = pg.getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = pg.dbTypeMap();
 
     assertThat(dbTypeMap.lookup("clob", false).renderType(0, 0)).isEqualTo("text");
     assertThat(dbTypeMap.lookup("CLOB", false).renderType(0, 0)).isEqualTo("text");
@@ -36,7 +36,7 @@ class DbTypeMapTest {
 
   @Test
   void testLookupRender_given_mysql() {
-    DbPlatformTypeMapping dbTypeMap = new MySqlPlatform().getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = new MySqlPlatform().dbTypeMap();
 
     assertThat(dbTypeMap.lookup("clob", false).renderType(0, 0)).isEqualTo("longtext");
     assertThat(dbTypeMap.lookup("CLOB", false).renderType(0, 0)).isEqualTo("longtext");
@@ -52,7 +52,7 @@ class DbTypeMapTest {
 
   @Test
   void testLookupRender_given_sqlserver17() {
-    DbPlatformTypeMapping dbTypeMap = new SqlServer17Platform().getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = new SqlServer17Platform().dbTypeMap();
 
     assertThat(dbTypeMap.lookup("clob", false).renderType(0, 0)).isEqualTo("nvarchar(max)");
     assertThat(dbTypeMap.lookup("CLOB", false).renderType(0, 0)).isEqualTo("nvarchar(max)");
@@ -68,7 +68,7 @@ class DbTypeMapTest {
 
   @Test
   void testLookupRender_given_sqlserver16() {
-    DbPlatformTypeMapping dbTypeMap = new SqlServer16Platform().getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = new SqlServer16Platform().dbTypeMap();
 
     assertThat(dbTypeMap.lookup("clob", false).renderType(0, 0)).isEqualTo("text");
     assertThat(dbTypeMap.lookup("CLOB", false).renderType(0, 0)).isEqualTo("text");
@@ -84,7 +84,7 @@ class DbTypeMapTest {
 
   @Test
   void testLookupRender_given_oracle() {
-    DbPlatformTypeMapping dbTypeMap = new OraclePlatform().getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = new OraclePlatform().dbTypeMap();
 
     assertThat(dbTypeMap.lookup("clob", false).renderType(0, 0)).isEqualTo("clob");
     assertThat(dbTypeMap.lookup("CLOB", false).renderType(0, 0)).isEqualTo("clob");
@@ -100,7 +100,7 @@ class DbTypeMapTest {
 
   @Test
   void testLookupRender_given_h2() {
-    DbPlatformTypeMapping dbTypeMap = new H2Platform().getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = new H2Platform().dbTypeMap();
 
     assertThat(dbTypeMap.lookup("clob", false).renderType(0, 0)).isEqualTo("clob");
     assertThat(dbTypeMap.lookup("CLOB", false).renderType(0, 0)).isEqualTo("clob");
@@ -116,7 +116,7 @@ class DbTypeMapTest {
 
   @Test
   void testLookupRender_given_clickhouse() {
-    DbPlatformTypeMapping dbTypeMap = new ClickHousePlatform().getDbTypeMap();
+    DbPlatformTypeMapping dbTypeMap = new ClickHousePlatform().dbTypeMap();
 
     assertThat(dbTypeMap.lookup("clob", false).renderType(0, 0)).isEqualTo("String");
     assertThat(dbTypeMap.lookup("CLOB", false).renderType(0, 0)).isEqualTo("String");
diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java
index f7fc9392d..aa65aaaa5 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java
@@ -16,7 +16,7 @@ public class HanaPlatformTest {
 
     HanaPlatform platform = new HanaPlatform();
     platform.configure(new PlatformConfig());
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
 
     assertThat(dbType.renderType(0, 0)).isEqualTo("varchar(40)");
   }
@@ -30,7 +30,7 @@ public class HanaPlatformTest {
 
     platform.configure(config);
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("varbinary(16)");
   }
 }
diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java
index fbbb8924c..a81ac11a3 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java
@@ -15,7 +15,7 @@ public class SqlserverPlatformTest {
   public void uuid_default() {
 
     platform.configure(new PlatformConfig());
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
 
     assertThat(dbType.renderType(0, 0)).isEqualTo("uniqueidentifier");
   }
@@ -29,7 +29,7 @@ public class SqlserverPlatformTest {
 
     platform.configure(config);
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("binary(16)");
   }
 
@@ -41,7 +41,7 @@ public class SqlserverPlatformTest {
 
     platform.configure(config);
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("nvarchar(40)");
   }
 }
diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java
index 206b7f65d..4fe5836ad 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java
@@ -14,6 +14,6 @@ public class SqlServer2016PlatformTest {
   @Test
   public void testHistorySupport() {
     SqlServer17Platform platform = new SqlServer17Platform();
-    assertTrue(platform.getHistorySupport() instanceof SqlServerHistorySupport);
+    assertTrue(platform.historySupport() instanceof SqlServerHistorySupport);
   }
 }
diff --git a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
index 29da0d419..02378bc86 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
@@ -201,7 +201,7 @@ public class DbMigrationTest extends BaseTestCase {
       System.err.println("FIXME: Oracle history support seems to be broken");
       return;
     }
-    DbHistorySupport history = server().pluginApi().databasePlatform().getHistorySupport();
+    DbHistorySupport history = server().pluginApi().databasePlatform().historySupport();
     if (history == null) {
       return;
     }
diff --git a/ebean-test/src/test/java/io/ebean/xtest/platform/PlatformLikeTest.java b/ebean-test/src/test/java/io/ebean/xtest/platform/PlatformLikeTest.java
index db1e27aa4..131613c5f 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/platform/PlatformLikeTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/platform/PlatformLikeTest.java
@@ -46,22 +46,22 @@ class PlatformLikeTest {
   @Test
   void rawLike_escapeEmpty() {
     for (DatabasePlatform platform : List.of(h2, pg, pg9, yugabyte, cockroach, mysql, mysql55, maria)) {
-      assertThat(platform.getLikeClause(true)).isEqualTo("like ? escape''");
-      assertThat(platform.getLikeClause(false)).isEqualTo("like ? escape'|'");
+      assertThat(platform.likeClause(true)).isEqualTo("like ? escape''");
+      assertThat(platform.likeClause(false)).isEqualTo("like ? escape'|'");
     }
   }
 
   @Test
   void ansi_rawLike() {
     for (DatabasePlatform platform : List.of(sqlite, sqlAnywhere, sqlServer17, oracle, oracle11, oracle12, hana, db2Luw)) {
-      assertThat(platform.getLikeClause(true)).isEqualTo("like ?");
+      assertThat(platform.likeClause(true)).isEqualTo("like ?");
     }
   }
 
   @Test
   void escapeLike_noEscape() {
     for (DatabasePlatform platform : List.of(sqlite, sqlServer17)) {
-      assertThat(platform.getLikeClause(false)).isEqualTo("like ?");
+      assertThat(platform.likeClause(false)).isEqualTo("like ?");
     }
   }
 
@@ -69,7 +69,7 @@ class PlatformLikeTest {
   @Test
   void ansi_escapeLike() {
     for (DatabasePlatform platform : List.of(sqlAnywhere, oracle, oracle11, oracle12, hana, db2Luw)) {
-      assertThat(platform.getLikeClause(false)).isEqualTo("like ? escape'|'");
+      assertThat(platform.likeClause(false)).isEqualTo("like ? escape'|'");
     }
   }
 
diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
index 9998c1669..a0f48a5ed 100644
--- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
+++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
@@ -136,7 +136,7 @@ public class TestEncrypt extends BaseTestCase {
     assertEquals(EBasicEncrypt.Status.ONE, e2.getStatus());
 
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
-    DbEncrypt dbEncrypt = server.databasePlatform().getDbEncrypt();
+    DbEncrypt dbEncrypt = server.databasePlatform().dbEncrypt();
 
     if (dbEncrypt == null) {
       // can not test the where clause
diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
index 03102a19c..0589c1194 100644
--- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
+++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java
@@ -134,7 +134,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
     Transaction transaction = DB.beginTransaction();
     try {
       transaction.setBatchMode(true);
-      transaction.setBatchOnCascade(PersistBatch.ALL.equals(spiEbeanServer().databasePlatform().getPersistBatchOnCascade()));
+      transaction.setBatchOnCascade(PersistBatch.ALL.equals(spiEbeanServer().databasePlatform().persistBatchOnCascade()));
       transaction.setBatchSize(20);
 
       // escalate based on batchOnCascade value
diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
index c639cd563..d9501c731 100644
--- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
+++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java
@@ -90,7 +90,7 @@ public class TestBatchOnCascadeExceptionHandling extends BaseTestCase {
     Transaction txn = server.beginTransaction();
     try {
       assertThat(txn.isBatchMode()).isFalse();
-      assertThat(txn.isBatchOnCascade()).isSameAs(PersistBatch.ALL.equals(spiEbeanServer().databasePlatform().getPersistBatchOnCascade()));
+      assertThat(txn.isBatchOnCascade()).isSameAs(PersistBatch.ALL.equals(spiEbeanServer().databasePlatform().persistBatchOnCascade()));
 
       failingOperation.run();
       Assertions.fail("PersistenceException expected");
diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java
index 470469d41..6c0a1d27f 100644
--- a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java
+++ b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java
@@ -73,7 +73,7 @@ public class TestGeneratedKeys extends BaseTestCase {
 
   private long readSequenceValue(Transaction tx, String sequence) throws SQLException {
     String sql;
-    switch (spiEbeanServer().databasePlatform().getPlatform().base()) {
+    switch (spiEbeanServer().databasePlatform().platform().base()) {
       case H2 :
         sql = "select currval('" + sequence + "')";
         break;
@@ -92,7 +92,7 @@ public class TestGeneratedKeys extends BaseTestCase {
 
       default :
         throw new UnsupportedOperationException("reading sequence value from "
-            + spiEbeanServer().databasePlatform().getPlatform()
+            + spiEbeanServer().databasePlatform().platform()
             + " is not supported.");
 
     }
diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
index 36c45e538..ac5e0444f 100644
--- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
+++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java
@@ -92,6 +92,6 @@ public class TestElementCollectionBasicCache extends BaseTestCase {
 
   @Override
   public boolean isPersistBatchOnCascade() {
-    return ((SpiEbeanServer) DB.getDefault()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
+    return ((SpiEbeanServer) DB.getDefault()).databasePlatform().persistBatchOnCascade() != PersistBatch.NONE;
   }
 }
diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
index 0516f19f8..92e8935ac 100644
--- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
+++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java
@@ -98,6 +98,6 @@ public class TestElementCollectionBasicMapCache extends BaseTestCase {
 
   @Override
   public boolean isPersistBatchOnCascade() {
-    return ((SpiEbeanServer) DB.getDefault()).databasePlatform().getPersistBatchOnCascade() != PersistBatch.NONE;
+    return ((SpiEbeanServer) DB.getDefault()).databasePlatform().persistBatchOnCascade() != PersistBatch.NONE;
   }
 }
diff --git a/platforms/clickhouse/src/main/java/io/ebean/platform/clickhouse/ClickHousePlatform.java b/platforms/clickhouse/src/main/java/io/ebean/platform/clickhouse/ClickHousePlatform.java
index f7472b99c..32ed69ea9 100644
--- a/platforms/clickhouse/src/main/java/io/ebean/platform/clickhouse/ClickHousePlatform.java
+++ b/platforms/clickhouse/src/main/java/io/ebean/platform/clickhouse/ClickHousePlatform.java
@@ -48,7 +48,7 @@ public class ClickHousePlatform extends DatabasePlatform {
   }
 
   @Override
-  public boolean isNativeArrayType() {
+  public boolean nativeArrayType() {
     return true;
   }
 
diff --git a/platforms/h2/src/test/java/io/ebean/platform/h2/H2PlatformTest.java b/platforms/h2/src/test/java/io/ebean/platform/h2/H2PlatformTest.java
index 6c034d69f..fbbd5bc9c 100644
--- a/platforms/h2/src/test/java/io/ebean/platform/h2/H2PlatformTest.java
+++ b/platforms/h2/src/test/java/io/ebean/platform/h2/H2PlatformTest.java
@@ -41,6 +41,6 @@ class H2PlatformTest {
   }
 
   private String defaultDefn(DbType type, DatabasePlatform dbPlatform) {
-    return dbPlatform.getDbTypeMap().get(type).renderType(0, 0);
+    return dbPlatform.dbTypeMap().get(type).renderType(0, 0);
   }
 }
diff --git a/platforms/hana/src/main/java/io/ebean/platform/hana/HanaPlatform.java b/platforms/hana/src/main/java/io/ebean/platform/hana/HanaPlatform.java
index 529e95050..310968ad6 100644
--- a/platforms/hana/src/main/java/io/ebean/platform/hana/HanaPlatform.java
+++ b/platforms/hana/src/main/java/io/ebean/platform/hana/HanaPlatform.java
@@ -93,7 +93,7 @@ public class HanaPlatform extends DatabasePlatform {
   }
 
   @Override
-  public boolean isUseMigrationStoredProcedures() {
+  public boolean useMigrationStoredProcedures() {
     return true;
   }
 }
diff --git a/platforms/mysql/src/test/java/io/ebean/platform/mysql/MySqlPlatformTest.java b/platforms/mysql/src/test/java/io/ebean/platform/mysql/MySqlPlatformTest.java
index d65331043..054ecb7d3 100644
--- a/platforms/mysql/src/test/java/io/ebean/platform/mysql/MySqlPlatformTest.java
+++ b/platforms/mysql/src/test/java/io/ebean/platform/mysql/MySqlPlatformTest.java
@@ -2,7 +2,6 @@ package io.ebean.platform.mysql;
 
 import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.platform.mysql.MySqlPlatform;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -15,7 +14,7 @@ public class MySqlPlatformTest {
     MySqlPlatform platform = new MySqlPlatform();
     platform.configure(new PlatformConfig());
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("varchar(40)");
   }
 
@@ -28,7 +27,7 @@ public class MySqlPlatformTest {
     config.setDbUuid(PlatformConfig.DbUuid.AUTO_BINARY);
     platform.configure(config);
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("binary(16)");
   }
 
diff --git a/platforms/oracle/src/test/java/io/ebean/platform/oracle/OraclePlatformTest.java b/platforms/oracle/src/test/java/io/ebean/platform/oracle/OraclePlatformTest.java
index af2cc0c51..aacc69210 100644
--- a/platforms/oracle/src/test/java/io/ebean/platform/oracle/OraclePlatformTest.java
+++ b/platforms/oracle/src/test/java/io/ebean/platform/oracle/OraclePlatformTest.java
@@ -11,26 +11,26 @@ class OraclePlatformTest {
   @Test
   void columnAliasPrefix_Oracle11Platform() {
     Oracle11Platform platform11 = new Oracle11Platform();
-    assertThat(platform11.getColumnAliasPrefix()).isEqualTo("c");
+    assertThat(platform11.columnAliasPrefix()).isEqualTo("c");
   }
 
   @Test
   void columnAliasPrefix_Oracle12Platform() {
     Oracle12Platform platform12 = new Oracle12Platform();
-    assertThat(platform12.getColumnAliasPrefix()).isEqualTo("c");
+    assertThat(platform12.columnAliasPrefix()).isEqualTo("c");
   }
 
   @Test
   void columnAliasPrefix_OraclePlatform() {
     OraclePlatform platform = new OraclePlatform();
-    assertThat(platform.getColumnAliasPrefix()).isNull();
+    assertThat(platform.columnAliasPrefix()).isNull();
   }
 
   @Test
   void uuid_default() {
     OraclePlatform platform = new OraclePlatform();
     platform.configure(new PlatformConfig());
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("varchar2(40)");
   }
 
@@ -42,7 +42,7 @@ class OraclePlatformTest {
 
     platform.configure(config);
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     assertThat(dbType.renderType(0, 0)).isEqualTo("raw(16)");
   }
 }
diff --git a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatform.java b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatform.java
index 6257153dc..f59840998 100644
--- a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatform.java
+++ b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatform.java
@@ -113,7 +113,7 @@ public class PostgresPlatform extends DatabasePlatform {
    * So we can generate varchar[], int[], uuid[] column definitions and use the associated scalar types.
    */
   @Override
-  public boolean isNativeArrayType() {
+  public boolean nativeArrayType() {
     return true;
   }
 
diff --git a/platforms/postgres/src/test/java/io/ebean/platform/postgres/PostgresPlatformTest.java b/platforms/postgres/src/test/java/io/ebean/platform/postgres/PostgresPlatformTest.java
index b52e3d216..7fe897f40 100644
--- a/platforms/postgres/src/test/java/io/ebean/platform/postgres/PostgresPlatformTest.java
+++ b/platforms/postgres/src/test/java/io/ebean/platform/postgres/PostgresPlatformTest.java
@@ -19,7 +19,7 @@ class PostgresPlatformTest {
     PostgresPlatform platform = new PostgresPlatform();
     platform.configure(new PlatformConfig());
 
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
+    DbPlatformType dbType = platform.dbTypeMap().get(DbPlatformType.UUID);
     String columnDefn = dbType.renderType(0, 0);
 
     assertThat(columnDefn).isEqualTo("uuid");
@@ -85,7 +85,7 @@ class PostgresPlatformTest {
   }
 
   private String defaultDefn(DbType type, DatabasePlatform dbPlatform) {
-    return dbPlatform.getDbTypeMap().get(type).renderType(0, 0);
+    return dbPlatform.dbTypeMap().get(type).renderType(0, 0);
   }
 
 }
diff --git a/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasePlatform.java b/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasePlatform.java
index 3cf3ed287..be6f3da13 100644
--- a/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasePlatform.java
+++ b/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasePlatform.java
@@ -122,7 +122,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
   }
 
   @Override
-  public boolean isUseMigrationStoredProcedures() {
+  public boolean useMigrationStoredProcedures() {
     return true;
   }
 }
diff --git a/platforms/sqlserver/src/test/java/io/ebean/platform/sqlserver/SqlServerPlatformTest.java b/platforms/sqlserver/src/test/java/io/ebean/platform/sqlserver/SqlServerPlatformTest.java
index 18c186df7..75c844962 100644
--- a/platforms/sqlserver/src/test/java/io/ebean/platform/sqlserver/SqlServerPlatformTest.java
+++ b/platforms/sqlserver/src/test/java/io/ebean/platform/sqlserver/SqlServerPlatformTest.java
@@ -51,6 +51,6 @@ class SqlServerPlatformTest {
   }
 
   private String defaultDefn(DbType type, DatabasePlatform dbPlatform) {
-    return dbPlatform.getDbTypeMap().get(type).renderType(0, 0);
+    return dbPlatform.dbTypeMap().get(type).renderType(0, 0);
   }
 }

From 96b674114c74768738b8e1f65facc6a9aa701762 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 11:26:55 +1200
Subject: [PATCH 029/127] Remove the OnQueryOnly (rollback) feature

The better approach these days is to use the read-only datasource with autoCommit
---
 .../config/dbplatform/DatabasePlatform.java   |  36 -------
 .../server/transaction/JdbcTransaction.java   | 101 ++----------------
 .../transaction/TransactionManager.java       |  30 ------
 3 files changed, 7 insertions(+), 160 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
index 854ff0dc1..b64568e07 100644
--- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
+++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java
@@ -22,23 +22,6 @@ public class DatabasePlatform {
 
   private static final System.Logger log = EbeanVersion.log;
 
-  /**
-   * Behavior used when ending a query only transaction (at read committed isolation level).
-   */
-  public enum OnQueryOnly {
-
-    /**
-     * Rollback the transaction.
-     */
-    ROLLBACK,
-
-    /**
-     * Commit the transaction
-     */
-    COMMIT
-  }
-
-
   /**
    * Set to true for MySql, no other jdbc drivers need this workaround.
    */
@@ -59,11 +42,6 @@ public class DatabasePlatform {
    */
   protected boolean supportsNativeJavaTime = true;
 
-  /**
-   * The behaviour used when ending a read only transaction at read committed isolation level.
-   */
-  protected OnQueryOnly onQueryOnly = OnQueryOnly.COMMIT;
-
   /**
    * The open quote used by quoted identifiers.
    */
@@ -409,20 +387,6 @@ public class DatabasePlatform {
     return null;
   }
 
-  /**
-   * Return the behaviour to use when ending a read only transaction.
-   */
-  public OnQueryOnly getOnQueryOnly() {
-    return onQueryOnly;
-  }
-
-  /**
-   * Set the behaviour to use when ending a read only transaction.
-   */
-  public void setOnQueryOnly(OnQueryOnly onQueryOnly) {
-    this.onQueryOnly = onQueryOnly;
-  }
-
   /**
    * Return the DbEncrypt handler for this DB platform.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 35fb61307..4ae9efef8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -4,7 +4,6 @@ import io.ebean.ProfileLocation;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.config.DatabaseConfig;
-import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
 import io.ebean.event.changelog.BeanChange;
 import io.ebean.event.changelog.ChangeSet;
 import io.ebeaninternal.api.*;
@@ -33,154 +32,69 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   private static final Object PLACEHOLDER = new Object();
   private static final String illegalStateMessage = "Transaction is Inactive";
 
-  /**
-   * The associated TransactionManager.
-   */
   final TransactionManager manager;
-
-  /**
-   * The transaction id.
-   */
   private final String id;
-
+  private final String logPrefix;
   private final boolean logSql;
   private final boolean logSummary;
-
+  private final boolean explicit;
+  private final boolean onQueryOnlyCommit;
   /**
    * The user defined label to group execution statistics.
    */
   private String label;
-
-  /**
-   * Flag to indicate if this was an explicitly created Transaction.
-   */
-  private final boolean explicit;
-
-  /**
-   * Behaviour for ending query only transactions.
-   */
-  private final OnQueryOnly onQueryOnly;
-
-  /**
-   * The status of the transaction.
-   */
   private boolean active;
-
   private boolean rollbackOnly;
-
   private boolean nestedUseSavepoint;
-
-  /**
-   * The underlying Connection.
-   */
   Connection connection;
-
-  /**
-   * Used to queue up persist requests for batch execution.
-   */
   private BatchControl batchControl;
-
-  /**
-   * The event which holds persisted beans.
-   */
   private TransactionEvent event;
-
-  /**
-   * Holder of the objects fetched to ensure unique objects are used.
-   */
   private SpiPersistenceContext persistenceContext;
-
-  /**
-   * Used to give developers more control over the insert update and delete
-   * functionality.
-   */
   private boolean persistCascade = true;
-
-  /**
-   * Flag used for performance to skip commit or rollback of query only
-   * transactions in read committed transaction isolation.
-   */
   private boolean queryOnly = true;
-
   private boolean localReadOnly;
-
   private Boolean updateAllLoadedProperties;
-
   private boolean oldBatchMode;
-
   private boolean batchMode;
-
   private boolean batchOnCascadeMode;
-
   private int batchSize = -1;
-
   private boolean batchFlushOnQuery = true;
-
   private Boolean batchGetGeneratedKeys;
-
   private Boolean batchFlushOnMixed;
-
-  private final String logPrefix;
-
   private Object tenantId;
-
   /**
    * The depth used by batch processing to help the ordering of statements.
    */
   private int depth;
-
-  /**
-   * Set to true if the connection has autoCommit=true initially.
-   */
   private boolean autoCommit;
-
   private IdentityHashMap<Object, Object> persistingBeans;
-
   private HashSet<Integer> deletingBeansHash;
-
   private HashMap<String, String> m2mIntersectionSave;
-
   private Map<String, Object> userObjects;
-
   private List<TransactionCallback> callbackList;
-
   private boolean batchOnCascadeSet;
-
   private TChangeLogHolder changeLogHolder;
-
   private List<PersistDeferredRelationship> deferredList;
-
   /**
    * The mode for updating doc store indexes for this transaction.
    * Only set when you want to override the default behavior.
    */
   private DocStoreMode docStoreMode;
-
   private int docStoreBatchSize;
-
   /**
    * Explicit control over skipCache.
    */
   private Boolean skipCache;
-
   /**
    * Default skip cache behavior from {@link DatabaseConfig#isSkipCacheAfterWrite()}.
    */
   private final boolean skipCacheAfterWrite;
-
   DocStoreTransaction docStoreTxn;
-
   private ProfileStream profileStream;
-
   private ProfileLocation profileLocation;
-
   private final long startNanos;
-
   private boolean autoPersistUpdates;
 
-  /**
-   * Create a new JdbcTransaction.
-   */
   JdbcTransaction(String id, boolean explicit, Connection connection, TransactionManager manager) {
     try {
       this.active = true;
@@ -191,14 +105,13 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       this.connection = connection;
       this.persistenceContext = new DefaultPersistenceContext();
       this.startNanos = System.nanoTime();
-
       if (manager == null) {
         this.logSql = false;
         this.logSummary = false;
         this.skipCacheAfterWrite = true;
         this.batchMode = false;
         this.batchOnCascadeMode = false;
-        this.onQueryOnly = OnQueryOnly.ROLLBACK;
+        this.onQueryOnlyCommit = false;
       } else {
         this.autoPersistUpdates = explicit && manager.isAutoPersistUpdates();
         this.logSql = manager.isLogSql();
@@ -206,7 +119,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         this.skipCacheAfterWrite = manager.isSkipCacheAfterWrite();
         this.batchMode = manager.isPersistBatch();
         this.batchOnCascadeMode = manager.isPersistBatchOnCascade();
-        this.onQueryOnly = manager.onQueryOnly();
+        this.onQueryOnlyCommit = true;
       }
 
       checkAutoCommit(connection);
@@ -926,14 +839,14 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   private void connectionEndForQueryOnly() {
     try {
       withEachCallback(TransactionCallback::preCommit);
-      if (onQueryOnly == OnQueryOnly.COMMIT) {
+      if (onQueryOnlyCommit) {
         performCommit();
       } else {
         performRollback();
       }
       withEachCallback(TransactionCallback::postCommit);
     } catch (SQLException e) {
-      log.log(ERROR, "Error when ending a query only transaction via " + onQueryOnly, e);
+      log.log(ERROR, "Error when ending a query only transaction", e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 523315eee..2ee0ea4ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -10,7 +10,6 @@ import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeSet;
@@ -76,7 +75,6 @@ public class TransactionManager implements SpiTransactionManager {
    * Flag to indicate the default Isolation is READ COMMITTED. This enables us
    * to close queryOnly transactions rather than commit or rollback them.
    */
-  private final OnQueryOnly onQueryOnly;
   private final BackgroundExecutor backgroundExecutor;
   private final ClusterManager clusterManager;
   private final String serverName;
@@ -145,7 +143,6 @@ public class TransactionManager implements SpiTransactionManager {
     this.bulkEventListenerMap = new BulkEventListenerMap(options.config.getBulkTableEventListeners());
     this.prefix = "";
     this.externalTransPrefix = "e";
-    this.onQueryOnly = initOnQueryOnly(options.config.getDatabasePlatform().getOnQueryOnly());
 
     CurrentTenantProvider tenantProvider = options.config.getCurrentTenantProvider();
     this.transactionFactory = TransactionFactoryBuilder.build(this, dataSourceSupplier, tenantProvider);
@@ -253,26 +250,6 @@ public class TransactionManager implements SpiTransactionManager {
     return persistBatchOnCascade;
   }
 
-  /**
-   * Return the behaviour to use when a query only transaction is committed.
-   * <p>
-   * There is a potential optimisation available when read committed is the default
-   * isolation level. If it is, then Connections used only for queries do not require
-   * commit or rollback but instead can just be put back into the pool via close().
-   * <p>
-   * If the Isolation level is higher (say SERIALIZABLE) then Connections used
-   * just for queries do need to be committed or rollback after the query.
-   */
-  final OnQueryOnly initOnQueryOnly(OnQueryOnly dbPlatformOnQueryOnly) {
-    // first check for a system property 'override'
-    String systemPropertyValue = System.getProperty("ebean.transaction.onqueryonly");
-    if (systemPropertyValue != null) {
-      return OnQueryOnly.valueOf(systemPropertyValue.trim().toUpperCase());
-    }
-    // default to rollback if not defined on the platform
-    return dbPlatformOnQueryOnly == null ? OnQueryOnly.COMMIT : dbPlatformOnQueryOnly;
-  }
-
   public final String name() {
     return serverName;
   }
@@ -292,13 +269,6 @@ public class TransactionManager implements SpiTransactionManager {
     return dataSourceSupplier.getReadOnlyDataSource();
   }
 
-  /**
-   * Defines the type of behavior to use when closing a transaction that was used to query data only.
-   */
-  final OnQueryOnly onQueryOnly() {
-    return onQueryOnly;
-  }
-
   /**
    * Wrap the externally supplied Connection.
    */

From 807b0174632d719cd6f5cf24d0c586c2197416bc Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 11:29:25 +1200
Subject: [PATCH 030/127] Bump to ebean-agent 13.8.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 196211980..06e52d1b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.8.0</ebean-agent.version>
-    <ebean-maven-plugin.version>13.8.0</ebean-maven-plugin.version>
+    <ebean-agent.version>13.8.1</ebean-agent.version>
+    <ebean-maven-plugin.version>13.8.1</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

From 5414fa17cfca5b1c2d56d1747d58d872f2990c1a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 11:33:58 +1200
Subject: [PATCH 031/127] [maven-release-plugin] prepare release
 ebean-parent-13.8.1

---
 composites/ebean-clickhouse/pom.xml | 14 ++++++++-----
 composites/ebean-cockroach/pom.xml  | 14 ++++++++-----
 composites/ebean-db2/pom.xml        | 14 ++++++++-----
 composites/ebean-h2/pom.xml         | 14 ++++++++-----
 composites/ebean-hana/pom.xml       | 14 ++++++++-----
 composites/ebean-mariadb/pom.xml    | 14 ++++++++-----
 composites/ebean-mysql/pom.xml      | 14 ++++++++-----
 composites/ebean-nuodb/pom.xml      | 14 ++++++++-----
 composites/ebean-oracle/pom.xml     | 14 ++++++++-----
 composites/ebean-postgres/pom.xml   | 14 ++++++++-----
 composites/ebean-sqlite/pom.xml     | 14 ++++++++-----
 composites/ebean-sqlserver/pom.xml  | 14 ++++++++-----
 composites/ebean-yugabyte/pom.xml   | 14 ++++++++-----
 composites/ebean/pom.xml            | 14 ++++++++-----
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 30 +++++++++++++--------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 10 ++++-----
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 ++++++++++++++++-------------
 platforms/clickhouse/pom.xml        |  8 ++++++--
 platforms/db2/pom.xml               |  8 ++++++--
 platforms/h2/pom.xml                |  8 ++++++--
 platforms/hana/pom.xml              |  8 ++++++--
 platforms/hsqldb/pom.xml            |  8 ++++++--
 platforms/mariadb/pom.xml           | 10 ++++++---
 platforms/mysql/pom.xml             |  8 ++++++--
 platforms/nuodb/pom.xml             |  8 ++++++--
 platforms/oracle/pom.xml            |  8 ++++++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++++++--
 platforms/sqlanywhere/pom.xml       |  8 ++++++--
 platforms/sqlite/pom.xml            |  8 ++++++--
 platforms/sqlserver/pom.xml         |  8 ++++++--
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 45 files changed, 294 insertions(+), 182 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 1e8d82489..45c88ad14 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 2950decd7..e4a503902 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index a64cb0539..4a44295ea 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index e338b1cda..05bf528bf 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 7b6877a4b..ecab34bac 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 21d25d57c..e97483689 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 8fccac180..d66de6162 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 02236b1e0..db3c54b87 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index c8b84dfb0..ad72b868e 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 9451cd305..2723a77b5 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 6fb5f7f6f..f7f01607b 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 3d57702da..5bf044ccc 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index e043e36db..8cc1c3dc0 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index d2a0e18cd..49e9732e4 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 5d0892f77..db9deaef1 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 325b0a70a..eb6f35814 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index e4e5d8eed..9ddcfef9d 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.8.1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index e67c3c9f3..2d7f1c520 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,88 +89,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.8.1-SNAPSHOT</version>
+        <version>13.8.1</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 7cece551f..deaf2b685 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 12cfd5c72..4500aa3f3 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.8.1</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index b2d0a7b79..7fc076798 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 1e5e9ba87..26ff76557 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 5a5bf08f1..848e84d86 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.8.1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 493d5d33b..2b99a15cf 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 59a5320c8..bf33641cf 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index f716a18d9..d69a3df0e 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 73ac74db4..319fd3535 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 9bb408ca9..e6582a785 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 21ab14e0a..bff82871e 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,68 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 6cd83c906..3ac26051f 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 280c11930..8838d6c11 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index b8013788c..db1276dd1 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,4 +34,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index e211fa257..36babd837 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 3d25d9f07..ece0235b5 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index eee5fdbbd..58e12f498 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,14 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 7e196c053..6b282fa79 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 77430ce13..3aa298fca 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index dbe111589..a7371108d 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 9369ff4ac..3198432fb 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index ac2b678ae..e48a4b7f5 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 0773557c7..ec38cb114 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 84f95beaa..4f8305ba9 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 8cd92a10f..11d89c78f 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.8.1</tag>
+  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 06e52d1b6..d93bf5bb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.8.1-SNAPSHOT</version>
+  <version>13.8.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.8.1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index b48111966..ace55f1cc 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.1</version>
   </parent>
 
   <name>querybean generator</name>

From 981c3595a8abcde76594fe590c14f18298df8e62 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 11:34:05 +1200
Subject: [PATCH 032/127] [maven-release-plugin] prepare for next development
 iteration

---
 composites/ebean-clickhouse/pom.xml | 14 +++++--------
 composites/ebean-cockroach/pom.xml  | 14 +++++--------
 composites/ebean-db2/pom.xml        | 14 +++++--------
 composites/ebean-h2/pom.xml         | 14 +++++--------
 composites/ebean-hana/pom.xml       | 14 +++++--------
 composites/ebean-mariadb/pom.xml    | 14 +++++--------
 composites/ebean-mysql/pom.xml      | 14 +++++--------
 composites/ebean-nuodb/pom.xml      | 14 +++++--------
 composites/ebean-oracle/pom.xml     | 14 +++++--------
 composites/ebean-postgres/pom.xml   | 14 +++++--------
 composites/ebean-sqlite/pom.xml     | 14 +++++--------
 composites/ebean-sqlserver/pom.xml  | 14 +++++--------
 composites/ebean-yugabyte/pom.xml   | 14 +++++--------
 composites/ebean/pom.xml            | 14 +++++--------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 30 +++++++++++++--------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 10 ++++-----
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 +++++++++++++----------------
 platforms/clickhouse/pom.xml        |  8 ++------
 platforms/db2/pom.xml               |  8 ++------
 platforms/h2/pom.xml                |  8 ++------
 platforms/hana/pom.xml              |  8 ++------
 platforms/hsqldb/pom.xml            |  8 ++------
 platforms/mariadb/pom.xml           | 10 +++------
 platforms/mysql/pom.xml             |  8 ++------
 platforms/nuodb/pom.xml             |  8 ++------
 platforms/oracle/pom.xml            |  8 ++------
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++------
 platforms/sqlanywhere/pom.xml       |  8 ++------
 platforms/sqlite/pom.xml            |  8 ++------
 platforms/sqlserver/pom.xml         |  8 ++------
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 45 files changed, 182 insertions(+), 294 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 45c88ad14..d6bd4993e 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index e4a503902..a3d90b6ce 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 4a44295ea..cfa595dad 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 05bf528bf..6957ec69b 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index ecab34bac..e4691ba4b 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index e97483689..1fb2de6b9 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index d66de6162..5eb3ce012 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index db3c54b87..59448dd73 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index ad72b868e..9c6af9c74 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 2723a77b5..01fe240fc 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index f7f01607b..a7063e413 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 5bf044ccc..2e03fbfb1 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 8cc1c3dc0..5907aa7c8 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 49e9732e4..7a92394e4 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index db9deaef1..c137c8cd0 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index eb6f35814..8f24e0e2c 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 9ddcfef9d..8786b7890 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.8.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 2d7f1c520..0fdad6cdb 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,88 +89,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.8.1</version>
+        <version>13.8.2-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index deaf2b685..f1446c821 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 4500aa3f3..d9c91e99b 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.8.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 7fc076798..462021f3d 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 26ff76557..56651d1ad 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 848e84d86..6a73bfad1 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.8.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 2b99a15cf..2420cd104 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index bf33641cf..09c1ab9ac 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index d69a3df0e..4db6c0a3c 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 319fd3535..55c78b52b 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index e6582a785..95111a1b9 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index bff82871e..f24522379 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,68 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 3ac26051f..b3625bfdc 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 8838d6c11..77cbca755 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index db1276dd1..336c3a751 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,8 +34,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 36babd837..ed91baa0c 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index ece0235b5..c96d63348 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 58e12f498..ace67db3a 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 6b282fa79..e211ddbb8 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 3aa298fca..e9d6cabc1 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index a7371108d..b9a24a1cb 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 3198432fb..2f5dc658d 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index e48a4b7f5..814cf9963 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index ec38cb114..1937ac175 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 4f8305ba9..ea1c87258 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 11d89c78f..9cfb4236f 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.1</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.8.1</tag>
-  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index d93bf5bb4..3d04697d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.8.1</version>
+  <version>13.8.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.8.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index ace55f1cc..88d5bd0c1 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 8b086e0e4917466f4d29e1a48f77a2ff3c938e6d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 11:48:18 +1200
Subject: [PATCH 033/127] Bump to 13.8.2-SNAPSHOT after release

---
 ebean-kotlin/pom.xml      | 6 +++---
 tests/test-java16/pom.xml | 6 +++---
 tests/test-kotlin/pom.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index 1804821cc..63f6bef4a 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 6d67f544b..d59d2cf26 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.8.1-SNAPSHOT</version>
+              <version>13.8.2-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 5ff6af755..a1c5a5065 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.1-SNAPSHOT</version>
+      <version>13.8.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From 10c9b2addd4f5ccefa6b60dd80802e515f812539 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 12:16:37 +1200
Subject: [PATCH 034/127] Remove ScalarType.isDateTimeCapable() ... (only used
 by CSV reader)

So the complexity cost doesn't justify itself against only being used
by CSV reader to validate when assigning a date/time format to a property
/ expression path.
---
 .../main/java/io/ebean/plugin/ExpressionPath.java  |  6 ------
 .../main/java/io/ebean/core/type/ScalarType.java   | 14 --------------
 .../server/deploy/BeanFkeyProperty.java            |  5 -----
 .../ebeaninternal/server/deploy/BeanProperty.java  |  5 -----
 .../ebeaninternal/server/el/ElPropertyChain.java   |  6 ------
 .../ebeaninternal/server/text/csv/TCsvReader.java  |  4 ----
 .../server/type/ScalarTypeBaseDate.java            |  5 -----
 .../server/type/ScalarTypeBaseDateTime.java        |  5 -----
 .../server/type/ScalarTypeBigDecimal.java          |  5 -----
 .../server/type/ScalarTypeBytesEncrypted.java      |  5 -----
 .../server/type/ScalarTypeDouble.java              |  5 -----
 .../server/type/ScalarTypeEncryptedWrapper.java    |  5 -----
 .../ebeaninternal/server/type/ScalarTypeFloat.java |  5 -----
 .../server/type/ScalarTypeInteger.java             |  5 -----
 .../server/type/ScalarTypeJodaLocalTime.java       |  5 -----
 .../server/type/ScalarTypeLocalTime.java           |  5 -----
 .../ebeaninternal/server/type/ScalarTypeLong.java  |  5 -----
 .../server/type/ScalarTypeMathBigInteger.java      |  5 -----
 .../server/type/ScalarTypeStringBase.java          |  5 -----
 .../ebeaninternal/server/type/ScalarTypeTime.java  |  5 -----
 .../server/type/ScalarTypeWrapper.java             |  5 -----
 .../server/type/ScalarTypeDurationTest.java        |  5 -----
 .../type/ScalarTypeDurationWithNanosTest.java      |  5 -----
 .../server/type/ScalarTypeInstantTest.java         |  9 ++-------
 .../server/type/ScalarTypeLocalTimeTest.java       |  5 -----
 .../type/ScalarTypeLocalTimeWithNanosTest.java     |  5 -----
 .../server/type/ScalarTypeMonthDayTest.java        |  8 ++------
 .../server/type/ScalarTypePostgresHstoreTest.java  |  5 -----
 .../server/type/ScalarTypeYearTest.java            |  6 ------
 29 files changed, 4 insertions(+), 159 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java
index 29a5abdab..4b935474f 100644
--- a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java
+++ b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java
@@ -45,12 +45,6 @@ public interface ExpressionPath {
    */
   Object parseDateTime(long systemTimeMillis);
 
-  /**
-   * Return true if the last type is "DateTime capable" - can support
-   * {@link #parseDateTime(long)}.
-   */
-  boolean isDateTimeCapable();
-
   /**
    * Return the underlying JDBC type or 0 if this is not a scalar type.
    */
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index af3e73493..6de4b8cd3 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -163,20 +163,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    */
   DocPropertyType getDocType();
 
-  /**
-   * Return true if the type can accept long systemTimeMillis input.
-   * <p>
-   * This is used to determine if it is sensible to use the
-   * {@link #convertFromMillis(long)} method.
-   * <p>
-   * This includes the Date, Calendar, sql Date, Time, Timestamp, JODA types
-   * as well as Long, BigDecimal and String (although it generally is not
-   * expected to parse systemTimeMillis to a String or BigDecimal).
-   */
-  default boolean isDateTimeCapable() {
-    return false;
-  }
-
   /**
    * Convert the value into a long version value.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
index bd479b08d..fb02fdc74 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
@@ -180,11 +180,6 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     return prefix;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return false;
-  }
-
   @Override
   public int jdbcType() {
     return 0;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 2133ef767..f04adf431 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -940,11 +940,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return scalarType;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return scalarType != null && scalarType.isDateTimeCapable();
-  }
-
   @Override
   public int jdbcType() {
     return scalarType == null ? 0 : scalarType.getJdbcType();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index d10acaedc..9579bfc79 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -227,12 +227,6 @@ public final class ElPropertyChain implements ElPropertyValue {
     return lastBeanProperty;
   }
 
-
-  @Override
-  public boolean isDateTimeCapable() {
-    return scalarType != null && scalarType.isDateTimeCapable();
-  }
-
   @Override
   public int jdbcType() {
     return scalarType == null ? 0 : scalarType.getJdbcType();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
index ddd309760..62be82d5c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
@@ -123,11 +123,7 @@ public class TCsvReader<T> implements CsvReader<T> {
 
   @Override
   public void addDateTime(String propertyName, String dateTimeFormat, Locale locale) {
-
     ExpressionPath elProp = descriptor.expressionPath(propertyName);
-    if (!elProp.isDateTimeCapable()) {
-      throw new TextException("Property " + propertyName + " is not DateTime capable");
-    }
     if (dateTimeFormat == null) {
       dateTimeFormat = getDefaultDateTimeFormat(elProp.jdbcType());
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
index 4e55d34de..a736f6bcd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -82,11 +82,6 @@ abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
     return convertFromDate(ts);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public T jsonRead(JsonParser parser) throws IOException {
     if (JsonToken.VALUE_NUMBER_INT == parser.getCurrentToken()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
index aa1670df7..cd97fc731 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
@@ -160,11 +160,6 @@ abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
     }
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public T readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index 0a3e98b6c..815d5e193 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -62,11 +62,6 @@ class ScalarTypeBigDecimal extends ScalarTypeBase<BigDecimal> {
     return BigDecimal.valueOf(systemTimeMillis);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public BigDecimal readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
index ec753b307..301f5e2ae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
@@ -52,11 +52,6 @@ public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
     return byte[].class;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return baseType.isDateTimeCapable();
-  }
-
   @Override
   public boolean isJdbcNative() {
     return baseType.isJdbcNative();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
index 5877c5d4a..392cb3bdb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -61,11 +61,6 @@ final class ScalarTypeDouble extends ScalarTypeBase<Double> {
     return (double) systemTimeMillis;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public Double readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index 392fc1b86..e05c674a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -94,11 +94,6 @@ public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, Local
     return wrapped.getType();
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return wrapped.isDateTimeCapable();
-  }
-
   @Override
   public boolean isJdbcNative() {
     return false;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
index fd13f2082..66f2d206b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -61,11 +61,6 @@ final class ScalarTypeFloat extends ScalarTypeBase<Float> {
     return (float) systemTimeMillis;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public Float readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index 0e1ef6075..164646899 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -91,11 +91,6 @@ final class ScalarTypeInteger extends ScalarTypeBase<Integer> {
     throw new TextException("Not Supported");
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return false;
-  }
-
   @Override
   public Integer jsonRead(JsonParser parser) throws IOException {
     return parser.getIntValue();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
index 785069345..b9e434773 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
@@ -77,11 +77,6 @@ class ScalarTypeJodaLocalTime extends ScalarTypeBase<LocalTime> {
     return new LocalTime(systemTimeMillis, DateTimeZone.getDefault());
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public LocalTime readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
index f851bdcfa..b859b56c6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
@@ -86,11 +86,6 @@ class ScalarTypeLocalTime extends ScalarTypeBase<LocalTime> {
     return LocalTime.parse(value);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return false;
-  }
-
   @Override
   public LocalTime convertFromMillis(long systemTimeMillis) {
     throw new TextException("Not Supported");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
index 3409cc9ed..cb9427967 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
@@ -71,11 +71,6 @@ final class ScalarTypeLong extends ScalarTypeBase<Long> {
     return systemTimeMillis;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public Long readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index aa6d7d4b5..b6855e4ad 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -66,11 +66,6 @@ final class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
     return BigInteger.valueOf(systemTimeMillis);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public BigInteger readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
index d0ea5a278..6878fbb5b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
@@ -61,11 +61,6 @@ abstract class ScalarTypeStringBase extends ScalarTypeBase<String> {
     return String.valueOf(systemTimeMillis);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public String readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
index 8328edfbe..e8bcca79d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
@@ -62,11 +62,6 @@ final class ScalarTypeTime extends ScalarTypeBase<Time> {
     return new Time(systemTimeMillis);
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return true;
-  }
-
   @Override
   public Time readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
index f0e83bed3..e83611f77 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -99,11 +99,6 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
     return wrapperType;
   }
 
-  @Override
-  public boolean isDateTimeCapable() {
-    return scalarType.isDateTimeCapable();
-  }
-
   @Override
   public boolean isJdbcNative() {
     return false;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java
index 1a8fb3218..99c1606c2 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java
@@ -75,11 +75,6 @@ class ScalarTypeDurationTest {
     assertEquals(Duration.ofSeconds(1234), duration);
   }
 
-  @Test
-  void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   void testConvertFromMillis() {
     assertThrows(UnsupportedOperationException.class, () -> type.convertFromMillis(1000));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
index aca406df5..205dac263 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
@@ -75,11 +75,6 @@ class ScalarTypeDurationWithNanosTest {
     assertEquals(duration, val1);
   }
 
-  @Test
-  void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   void testConvertFromMillis() {
     assertThrows(UnsupportedOperationException.class, () -> type.convertFromMillis(1000));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
index c40950842..7c554b810 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java
@@ -11,7 +11,8 @@ import java.sql.Timestamp;
 import java.time.Instant;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class ScalarTypeInstantTest {
 
@@ -107,12 +108,6 @@ public class ScalarTypeInstantTest {
     assertEquals(now, val1);
   }
 
-  @Test
-  public void testIsDateTimeCapable() throws Exception {
-
-    assertTrue(type.isDateTimeCapable());
-  }
-
   @Test
   public void testConvertFromMillis() throws Exception {
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java
index e98cdef0f..4bc5c3f63 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java
@@ -77,11 +77,6 @@ public class ScalarTypeLocalTimeTest {
     assertEquals(localTime, val1);
   }
 
-  @Test
-  public void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   public void testConvertFromMillis() {
     assertThrows(TextException.class, () -> type.convertFromMillis(1234));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java
index 6e2e24057..36bf79d9f 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java
@@ -74,11 +74,6 @@ public class ScalarTypeLocalTimeWithNanosTest {
     assertEquals(localTime, val1);
   }
 
-  @Test
-  public void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   public void testConvertFromMillis() {
     assertThrows(TextException.class, () -> type.convertFromMillis(1234));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java
index efe128b91..05a1b20aa 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java
@@ -6,7 +6,8 @@ import java.sql.Date;
 import java.time.LocalDate;
 import java.time.MonthDay;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ScalarTypeMonthDayTest {
 
@@ -48,11 +49,6 @@ public class ScalarTypeMonthDayTest {
     assertEquals(value, monthDay);
   }
 
-  @Test
-  public void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   public void testConvertFromMillis() {
     assertThrows(RuntimeException.class, () -> type.convertFromMillis(1203));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
index 382cd1db0..1a6a4afd0 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
@@ -26,11 +26,6 @@ public class ScalarTypePostgresHstoreTest {
     assertTrue(hstore.isMutable());
   }
 
-  @Test
-  public void testIsDateTimeCapable() {
-    assertFalse(hstore.isDateTimeCapable());
-  }
-
   @Test
   public void testIsDirty() {
     Map<String, Object> emptyMap = new HashMap<>();
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java
index 9a0440b67..ec3252a33 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.text.TextException;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
@@ -71,11 +70,6 @@ class ScalarTypeYearTest {
     assertEquals(Year.of(2013), year);
   }
 
-  @Test
-  void testIsDateTimeCapable() {
-    assertFalse(type.isDateTimeCapable());
-  }
-
   @Test
   void testConvertFromMillis() {
     assertThrows(UnsupportedOperationException.class, () -> type.convertFromMillis(1000));

From 26f0605d72859f0aeb3d20946074bebbe53de7dc Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 12:25:38 +1200
Subject: [PATCH 035/127] Refactor ScalarType methods from getters to accessors

---
 .../java/io/ebean/core/type/ScalarType.java   | 16 +++++------
 .../BeanDescriptorElementEmbeddedMap.java     |  2 +-
 .../BeanDescriptorElementScalarMap.java       |  2 +-
 .../server/deploy/BeanProperty.java           |  8 +++---
 .../deploy/meta/DeployBeanProperty.java       |  6 ++--
 .../server/deploy/parse/AnnotationFields.java |  4 +--
 .../server/deploy/parse/DeployUtil.java       | 10 +++----
 .../server/el/ElPropertyChain.java            |  2 +-
 .../ebeaninternal/server/persist/Binder.java  |  8 +++---
 .../platform/AbstractMultiValueBind.java      |  2 +-
 .../persist/platform/MultiValueBind.java      |  2 +-
 .../platform/PostgresMultiValueBind.java      |  2 +-
 .../server/type/DefaultTypeManager.java       | 10 +++----
 .../type/PlatformArrayTypeJsonList.java       |  2 +-
 .../server/type/PlatformArrayTypeJsonSet.java |  2 +-
 .../server/type/ScalarTypeArrayBase.java      |  4 +--
 .../server/type/ScalarTypeArrayList.java      |  4 +--
 .../server/type/ScalarTypeArraySet.java       |  4 +--
 .../server/type/ScalarTypeBase.java           |  6 ++--
 .../server/type/ScalarTypeBaseDate.java       |  2 +-
 .../server/type/ScalarTypeBaseDateTime.java   |  2 +-
 .../server/type/ScalarTypeBaseVarchar.java    |  2 +-
 .../server/type/ScalarTypeBigDecimal.java     |  2 +-
 .../server/type/ScalarTypeBoolean.java        |  6 ++--
 .../server/type/ScalarTypeByte.java           |  4 +--
 .../server/type/ScalarTypeBytesBase.java      |  4 +--
 .../server/type/ScalarTypeBytesEncrypted.java | 20 ++++++-------
 .../server/type/ScalarTypeClass.java          |  2 +-
 .../server/type/ScalarTypeCurrency.java       |  2 +-
 .../server/type/ScalarTypeDouble.java         |  2 +-
 .../server/type/ScalarTypeDuration.java       |  2 +-
 .../type/ScalarTypeEncryptedWrapper.java      | 26 ++++++++---------
 .../server/type/ScalarTypeEnumStandard.java   |  4 +--
 .../type/ScalarTypeEnumWithMapping.java       |  2 +-
 .../server/type/ScalarTypeFile.java           |  4 +--
 .../server/type/ScalarTypeFloat.java          |  2 +-
 .../server/type/ScalarTypeInetAddress.java    |  2 +-
 .../server/type/ScalarTypeInteger.java        |  2 +-
 .../server/type/ScalarTypeJodaLocalTime.java  |  2 +-
 .../server/type/ScalarTypeJodaPeriod.java     |  2 +-
 .../server/type/ScalarTypeJsonCollection.java |  4 +--
 .../server/type/ScalarTypeJsonList.java       |  2 +-
 .../server/type/ScalarTypeJsonMap.java        |  6 ++--
 .../server/type/ScalarTypeJsonNode.java       |  4 +--
 .../type/ScalarTypeJsonObjectMapper.java      |  6 ++--
 .../server/type/ScalarTypeJsonSet.java        |  2 +-
 .../server/type/ScalarTypeLocalTime.java      |  2 +-
 .../server/type/ScalarTypeLocale.java         |  2 +-
 .../server/type/ScalarTypeLong.java           |  2 +-
 .../server/type/ScalarTypeMathBigInteger.java |  2 +-
 .../server/type/ScalarTypeMonthDay.java       |  2 +-
 .../server/type/ScalarTypeNotFound.java       |  8 +++---
 .../server/type/ScalarTypeOffsetTime.java     |  2 +-
 .../server/type/ScalarTypePeriod.java         |  2 +-
 .../server/type/ScalarTypePostgresHstore.java |  4 +--
 .../server/type/ScalarTypeShort.java          |  2 +-
 .../server/type/ScalarTypeStringBase.java     |  2 +-
 .../server/type/ScalarTypeTime.java           |  2 +-
 .../server/type/ScalarTypeTimeZone.java       |  2 +-
 .../server/type/ScalarTypeUUIDBase.java       |  2 +-
 .../server/type/ScalarTypeUUIDBinary.java     |  2 +-
 .../server/type/ScalarTypeUUIDVarchar.java    |  2 +-
 .../server/type/ScalarTypeWrapper.java        | 28 +++++++++----------
 .../server/type/ScalarTypeYear.java           |  2 +-
 .../server/type/ScalarTypeZoneId.java         |  2 +-
 .../server/type/ScalarTypeZoneOffset.java     |  2 +-
 .../server/type/DefaultTypeFactoryTest.java   |  6 ++--
 .../server/type/ScalarTypeJodaPeriodTest.java |  2 +-
 .../server/type/ScalarTypeOffsetTimeTest.java |  2 +-
 .../server/type/ScalarTypePeriodTest.java     |  2 +-
 .../type/ScalarTypePostgresHstoreTest.java    |  2 +-
 .../server/type/ScalarTypeTimeZoneTest.java   |  2 +-
 .../server/type/ScalarTypeZoneIdTest.java     |  2 +-
 .../server/type/ScalarTypeZoneOffsetTest.java |  2 +-
 .../server/type/TestTypeManager.java          |  6 ++--
 .../model/build/ModelBuildContext.java        |  2 +-
 .../io/ebean/postgis/ScalarTypePgisBase.java  |  8 +++---
 .../postgis/latte/ScalarTypeGeoLatteBase.java |  8 +++---
 78 files changed, 167 insertions(+), 167 deletions(-)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index 6de4b8cd3..9523fd9d5 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -34,7 +34,7 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
   /**
    * Return true for types that do mutation detection based on json content.
    */
-  default boolean isJsonMapper() {
+  default boolean jsonMapper() {
     return false;
   }
 
@@ -42,14 +42,14 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * Return true if this is a binary type and can not support parse() and format() from/to string.
    * This allows Ebean to optimise marshalling types to string.
    */
-  default boolean isBinaryType() {
+  default boolean binary() {
     return false;
   }
 
   /**
    * Return true if this is a mutable scalar type (like hstore).
    */
-  default boolean isMutable() {
+  default boolean mutable() {
     return false;
   }
 
@@ -67,7 +67,7 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * If a BeanProperty has no explicit length defined then this length should
    * be assigned.
    */
-  default int getLength() {
+  default int length() {
     return 0;
   }
 
@@ -77,7 +77,7 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * If it is native to JDBC then its values/instances do not need to be
    * converted to and from an associated JDBC type.
    */
-  boolean isJdbcNative();
+  boolean jdbcNative();
 
   /**
    * Return the type as per java.sql.Types that this maps to.
@@ -85,14 +85,14 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * This type should be consistent with the toJdbcType() method in converting
    * the type to the appropriate type for binding to preparedStatements.
    */
-  int getJdbcType();
+  int jdbcType();
 
   /**
    * Return the type that matches the bean property type.
    * <p>
    * This represents the 'logical' type rather than the JDBC type this maps to.
    */
-  Class<T> getType();
+  Class<T> type();
 
   /**
    * Read the value from the resultSet and convert if necessary to the logical
@@ -161,7 +161,7 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
   /**
    * Return the type this maps to for JSON document stores.
    */
-  DocPropertyType getDocType();
+  DocPropertyType docType();
 
   /**
    * Convert the value into a long version value.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
index 664e40da9..e6518ad50 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
@@ -23,7 +23,7 @@ class BeanDescriptorElementEmbeddedMap<T> extends BeanDescriptorElementEmbedded<
   BeanDescriptorElementEmbeddedMap(BeanDescriptorMap owner, DeployBeanDescriptor<T> deploy, ElementHelp elementHelp) {
     super(owner, deploy, elementHelp);
     this.scalarTypeKey = firstBaseScalarType();
-    this.stringKey = String.class.equals(scalarTypeKey.getType());
+    this.stringKey = String.class.equals(scalarTypeKey.type());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
index d9f6b4b25..a3da1779e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
@@ -28,7 +28,7 @@ class BeanDescriptorElementScalarMap<T> extends BeanDescriptorElement<T> {
     }
     this.scalarTypeKey = props[0].scalarType();
     this.scalarTypeVal = props[1].scalarType();
-    this.stringKey = String.class.equals(scalarTypeKey.getType());
+    this.stringKey = String.class.equals(scalarTypeKey.type());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index f04adf431..9468379a2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -416,7 +416,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    * Return true if the underlying type is mutable.
    */
   public boolean isMutableScalarType() {
-    return scalarType != null && scalarType.isMutable();
+    return scalarType != null && scalarType.mutable();
   }
 
   /**
@@ -703,7 +703,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
   }
 
   private Object cacheDataConvert(Object value) {
-    if (value == null || scalarType.isBinaryType()) {
+    if (value == null || scalarType.binary()) {
       return value;
     } else {
       // convert to string as an optimisation for java object serialisation
@@ -942,7 +942,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
 
   @Override
   public int jdbcType() {
-    return scalarType == null ? 0 : scalarType.getJdbcType();
+    return scalarType == null ? 0 : scalarType.jdbcType();
   }
 
   @Override
@@ -1467,7 +1467,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
    */
   public void docStoreMapping(DocMappingBuilder mapping, String prefix) {
     if (mapping.includesProperty(prefix, name)) {
-      DocPropertyType type = scalarType.getDocType();
+      DocPropertyType type = scalarType.docType();
       DocPropertyOptions options = docOptions.copy();
       if (isKeywordType(type, options)) {
         type = DocPropertyType.KEYWORD;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 655f4c101..847401b1c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -175,7 +175,7 @@ public class DeployBeanProperty {
     this.propertyType = propertyType;
     this.genericType = null;
     this.scalarType = wrapScalarType(propertyType, scalarType, typeConverter);
-    this.dbType = (scalarType == null) ? 0 : scalarType.getJdbcType();
+    this.dbType = (scalarType == null) ? 0 : scalarType.jdbcType();
   }
 
   public DeployBeanProperty(DeployBeanDescriptor<?> desc, Class<?> propertyType, Type genericType) {
@@ -240,7 +240,7 @@ public class DeployBeanProperty {
    */
   public int getDbLength() {
     if (dbLength == 0 && scalarType != null) {
-      return scalarType.getLength();
+      return scalarType.length();
     }
 
     return dbLength;
@@ -1145,7 +1145,7 @@ public class DeployBeanProperty {
   }
 
   boolean isJsonMapper() {
-    return scalarType != null && scalarType.isJsonMapper();
+    return scalarType != null && scalarType.jsonMapper();
   }
 
   boolean isJsonType() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 331b6926d..abedce6e4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -386,7 +386,7 @@ final class AnnotationFields extends AnnotationParser {
   private void setEncryption(DeployBeanProperty prop, boolean dbEncString, int dbLen) {
     util.checkEncryptKeyManagerDefined(prop.getFullBeanName());
     ScalarType<?> st = prop.getScalarType();
-    if (byte[].class.equals(st.getType())) {
+    if (byte[].class.equals(st.type())) {
       // Always using Java client encryption rather than DB for encryption
       // of binary data (partially as this is not supported on all db's etc)
       // This could be reviewed at a later stage.
@@ -401,7 +401,7 @@ final class AnnotationFields extends AnnotationParser {
       DbEncrypt dbEncrypt = util.getDbPlatform().dbEncrypt();
       if (dbEncrypt != null) {
         // check if we have a DB encryption function for this type
-        int jdbcType = prop.getScalarType().getJdbcType();
+        int jdbcType = prop.getScalarType().jdbcType();
         DbEncryptFunction dbEncryptFunction = dbEncrypt.getDbEncryptFunction(jdbcType);
         if (dbEncryptFunction != null) {
           // Use DB functions to encrypt and decrypt
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index a8cbe5fdf..459da0229 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -104,7 +104,7 @@ public final class DeployUtil {
       EnumType type = enumerated != null ? enumerated.value() : null;
       ScalarType<?> scalarType = typeManager.createEnumScalarType(enumClass, type);
       prop.setScalarType(scalarType);
-      prop.setDbType(scalarType.getJdbcType());
+      prop.setDbType(scalarType.jdbcType());
     } catch (IllegalStateException e) {
       throw new PersistenceException("Error mapping property " + prop.getFullBeanName() + " - " + e.getMessage());
     }
@@ -126,7 +126,7 @@ public final class DeployUtil {
     ScalarType<?> scalarType = getScalarType(property);
     if (scalarType != null) {
       // set the jdbc type this maps to
-      property.setDbType(scalarType.getJdbcType());
+      property.setDbType(scalarType.jdbcType());
       property.setScalarType(scalarType);
       property.checkPrimitiveBoolean();
     }
@@ -156,7 +156,7 @@ public final class DeployUtil {
    */
   void setDbMap(DeployBeanProperty prop, DbMap dbMap) {
     ScalarType<?> scalarType = typeManager.getDbMapScalarType();
-    int dbType = scalarType.getJdbcType();
+    int dbType = scalarType.jdbcType();
     prop.setDbType(dbType);
     prop.setScalarType(scalarType);
     if (dbType == Types.VARCHAR) {
@@ -176,7 +176,7 @@ public final class DeployUtil {
     if (scalarType == null) {
       throw new RuntimeException("No ScalarType for @DbArray type for [" + prop.getFullBeanName() + "]");
     }
-    int dbType = scalarType.getJdbcType();
+    int dbType = scalarType.jdbcType();
     prop.setDbType(dbType);
     prop.setScalarType(scalarType);
     if (scalarType instanceof ScalarTypeArray) {
@@ -240,7 +240,7 @@ public final class DeployUtil {
   void setLobType(DeployBeanProperty prop) {
     ScalarType<?> scalarType = prop.getScalarType();
     if (scalarType instanceof ScalarTypeWrapper) {
-      int lobType = scalarType.getJdbcType() == Types.VARCHAR ? dbCLOBType : dbBLOBType;
+      int lobType = scalarType.jdbcType() == Types.VARCHAR ? dbCLOBType : dbBLOBType;
       prop.setDbType(lobType);
     } else {
       // is String or byte[] ? used to determine if its a CLOB or BLOB
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index 9579bfc79..3a9631737 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -229,7 +229,7 @@ public final class ElPropertyChain implements ElPropertyValue {
 
   @Override
   public int jdbcType() {
-    return scalarType == null ? 0 : scalarType.getJdbcType();
+    return scalarType == null ? 0 : scalarType.jdbcType();
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index de8e16eb0..afb416012 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -145,7 +145,7 @@ public final class Binder {
   public boolean isMultiValueSupported(Class<?> cls) {
     try {
       ScalarType<?> scalarType = getScalarType(cls);
-      return multiValueBind.isTypeSupported(scalarType.getJdbcType());
+      return multiValueBind.isTypeSupported(scalarType.jdbcType());
     } catch (PersistenceException e) {
       return false;
     }
@@ -173,18 +173,18 @@ public final class Binder {
       Collection<?> values = wrapper.getValues();
 
       ScalarType<?> type = getScalarType(wrapper.getType());
-      int dbType = type.getJdbcType();
+      int dbType = type.jdbcType();
       // let the multiValueBind decide what to do with the value
       multiValueBind.bindMultiValues(dataBind, values, type, one -> bindObject(dataBind, one, dbType));
       return values;
 
     } else {
       ScalarType<?> type = getScalarType(value.getClass());
-      if (!type.isJdbcNative()) {
+      if (!type.jdbcNative()) {
         // convert to a JDBC native type
         value = type.toJdbcType(value);
       }
-      bindObject(dataBind, value, type.getJdbcType());
+      bindObject(dataBind, value, type.jdbcType());
       return value;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
index 2c2ed1645..f28805a01 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
@@ -44,7 +44,7 @@ abstract class AbstractMultiValueBind extends MultiValueBind {
 
   @Override
   public void bindMultiValues(DataBind dataBind, Collection<?> values, ScalarType<?> type, BindOne bindOne) throws SQLException {
-    String arrayType = getArrayType(type.getJdbcType());
+    String arrayType = getArrayType(type.jdbcType());
     if (arrayType == null) {
       super.bindMultiValues(dataBind, values, type, bindOne);
     } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
index 1a15b8438..dd06f4f29 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
@@ -44,7 +44,7 @@ public class MultiValueBind {
    */
   public void bindMultiValues(DataBind dataBind, Collection<?> values, ScalarType<?> type, BindOne bindOne) throws SQLException {
     for (Object value : values) {
-      if (!type.isJdbcNative()) {
+      if (!type.jdbcNative()) {
         value = type.toJdbcType(value);
       }
       bindOne.bind(value);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
index f7d86f55e..fa2cbb767 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/PostgresMultiValueBind.java
@@ -10,7 +10,7 @@ public final class PostgresMultiValueBind extends AbstractMultiValueBind {
 
   @Override
   public String getInExpression(boolean not, ScalarType<?> type, int size) {
-    int dbType = type.getJdbcType();
+    int dbType = type.jdbcType();
     if (dbType == ExtraDbTypes.UUID) {
       return (not) ? " != all(?::uuid[])" : " = any(?::uuid[])";
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index ca2c35609..8bb9680e7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -215,14 +215,14 @@ public final class DefaultTypeManager implements TypeManager {
    */
   @Override
   public void add(ScalarType<?> scalarType) {
-    typeMap.put(scalarType.getType(), scalarType);
+    typeMap.put(scalarType.type(), scalarType);
     logAdd(scalarType);
   }
 
   private void logAdd(ScalarType<?> scalarType) {
     if (log.isLoggable(TRACE)) {
       String msg = "ScalarType register [" + scalarType.getClass().getName() + "]";
-      msg += " for [" + scalarType.getType().getName() + "]";
+      msg += " for [" + scalarType.type().getName() + "]";
       log.log(TRACE, msg);
     }
   }
@@ -410,7 +410,7 @@ public final class DefaultTypeManager implements TypeManager {
     if (genericType instanceof Class<?>) {
       ScalarType<?> found = getScalarType((Class<?>)genericType);
       if (found != null) {
-        return found.getDocType();
+        return found.docType();
       }
     }
     return DocPropertyType.OBJECT;
@@ -468,7 +468,7 @@ public final class DefaultTypeManager implements TypeManager {
 
     scalarType = getScalarType(type);
     if (scalarType != null) {
-      if (jdbcType == 0 || scalarType.getJdbcType() == jdbcType) {
+      if (jdbcType == 0 || scalarType.jdbcType() == jdbcType) {
         // matching type
         return scalarType;
       }
@@ -851,7 +851,7 @@ public final class DefaultTypeManager implements TypeManager {
     databasePlatform.setDbFalseLiteral(booleanType.getDbFalseLiteral());
     // always register Types.BOOLEAN to our boolean type
     nativeMap.put(Types.BOOLEAN, booleanType);
-    if (booleanType.getJdbcType() == Types.BIT) {
+    if (booleanType.jdbcType() == Types.BIT) {
       // for MapBeans ... BIT types are assumed to be booleans
       nativeMap.put(Types.BIT, booleanType);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java
index 8b3232b28..c48b0343c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonList.java
@@ -36,6 +36,6 @@ class PlatformArrayTypeJsonList implements PlatformArrayTypeFactory {
   @Override
   public ScalarType<?> typeForEnum(ScalarType<?> scalarType, boolean nullable) {
     final ArrayElementConverter.EnumConverter converter = new ArrayElementConverter.EnumConverter(scalarType);
-    return new ScalarTypeJsonList.VarcharWithConverter(scalarType.getDocType(), nullable, false, converter);
+    return new ScalarTypeJsonList.VarcharWithConverter(scalarType.docType(), nullable, false, converter);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java
index a5c7595f7..d67722b8f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/PlatformArrayTypeJsonSet.java
@@ -36,6 +36,6 @@ class PlatformArrayTypeJsonSet implements PlatformArrayTypeFactory {
   @Override
   public ScalarType<?> typeForEnum(ScalarType<?> scalarType, boolean nullable) {
     final ArrayElementConverter.EnumConverter converter = new ArrayElementConverter.EnumConverter(scalarType);
-    return new ScalarTypeJsonSet.VarcharWithConverter(scalarType.getDocType(), nullable, false, converter);
+    return new ScalarTypeJsonSet.VarcharWithConverter(scalarType.docType(), nullable, false, converter);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
index b0d742956..87d96187b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
@@ -71,13 +71,13 @@ abstract class ScalarTypeArrayBase<T> extends ScalarTypeJsonCollection<T> {
   protected abstract T fromArray(Object[] array1);
 
   static String arrayTypeFor(ScalarType<?> scalarType) {
-    switch (scalarType.getJdbcType()) {
+    switch (scalarType.jdbcType()) {
       case Types.INTEGER:
         return "integer";
       case Types.VARCHAR:
         return "varchar";
       default:
-        throw new IllegalArgumentException("JdbcType [" + scalarType.getJdbcType() + "] not supported for @DbArray mapping on set.");
+        throw new IllegalArgumentException("JdbcType [" + scalarType.jdbcType() + "] not supported for @DbArray mapping on set.");
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index 56ec0127e..35bd40a97 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -77,7 +77,7 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements ScalarTyp
 
     @Override
     public ScalarTypeArrayList typeForEnum(ScalarType<?> scalarType, boolean nullable) {
-      return new ScalarTypeArrayList(nullable, arrayTypeFor(scalarType), scalarType.getDocType(), new ArrayElementConverter.EnumConverter(scalarType));
+      return new ScalarTypeArrayList(nullable, arrayTypeFor(scalarType), scalarType.docType(), new ArrayElementConverter.EnumConverter(scalarType));
     }
   }
 
@@ -92,7 +92,7 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements ScalarTyp
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return docPropertyType;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index 666d52b10..3a9b69849 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -71,7 +71,7 @@ class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements ScalarTypeA
 
     @Override
     public ScalarType<?> typeForEnum(ScalarType<?> scalarType, boolean nullable) {
-      return new ScalarTypeArraySet(nullable, arrayTypeFor(scalarType), scalarType.getDocType(), new ArrayElementConverter.EnumConverter(scalarType));
+      return new ScalarTypeArraySet(nullable, arrayTypeFor(scalarType), scalarType.docType(), new ArrayElementConverter.EnumConverter(scalarType));
     }
   }
 
@@ -86,7 +86,7 @@ class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements ScalarTypeA
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return docPropertyType;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java
index 93ab0a6a6..a3a01fe1a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java
@@ -19,17 +19,17 @@ abstract class ScalarTypeBase<T> implements ScalarType<T> {
   }
 
   @Override
-  public boolean isJdbcNative() {
+  public boolean jdbcNative() {
     return jdbcNative;
   }
 
   @Override
-  public int getJdbcType() {
+  public int jdbcType() {
     return jdbcType;
   }
 
   @Override
-  public Class<T> getType() {
+  public Class<T> type() {
     return type;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
index a736f6bcd..db7d392fd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -106,7 +106,7 @@ abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
   protected abstract String toIsoFormat(T value);
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.DATE;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
index cd97fc731..d42491d0d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
@@ -139,7 +139,7 @@ abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.DATETIME;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
index 75eaa17b5..86b142173 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
@@ -123,7 +123,7 @@ abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.TEXT;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index 815d5e193..d35679398 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -92,7 +92,7 @@ class ScalarTypeBigDecimal extends ScalarTypeBase<BigDecimal> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.DOUBLE;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
index 848b0fc2a..cc173aff7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
@@ -146,7 +146,7 @@ public final class ScalarTypeBoolean {
     }
 
     @Override
-    public int getLength() {
+    public int length() {
       return 1;
     }
 
@@ -233,7 +233,7 @@ public final class ScalarTypeBoolean {
     }
 
     @Override
-    public int getLength() {
+    public int length() {
       return Math.max(trueValue.length(), falseValue.length());
     }
 
@@ -358,7 +358,7 @@ public final class ScalarTypeBoolean {
     }
 
     @Override
-    public DocPropertyType getDocType() {
+    public DocPropertyType docType() {
       return DocPropertyType.BOOLEAN;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
index 5437ecb77..1d37a8566 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
@@ -25,7 +25,7 @@ final class ScalarTypeByte extends ScalarTypeBase<Byte> {
   }
 
   @Override
-  public boolean isBinaryType() {
+  public boolean binary() {
     return true;
   }
 
@@ -71,7 +71,7 @@ final class ScalarTypeByte extends ScalarTypeBase<Byte> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.BINARY;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java
index 51f811ede..32d0ba67c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java
@@ -22,7 +22,7 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase<byte[]> {
   }
 
   @Override
-  public boolean isBinaryType() {
+  public boolean binary() {
     return true;
   }
 
@@ -96,7 +96,7 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase<byte[]> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.BINARY;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
index 301f5e2ae..a49ea668c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
@@ -27,7 +27,7 @@ public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
   }
 
   @Override
-  public boolean isBinaryType() {
+  public boolean binary() {
     return true;
   }
 
@@ -38,23 +38,23 @@ public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
   }
 
   @Override
-  public int getJdbcType() {
-    return baseType.getJdbcType();
+  public int jdbcType() {
+    return baseType.jdbcType();
   }
 
   @Override
-  public int getLength() {
-    return baseType.getLength();
+  public int length() {
+    return baseType.length();
   }
 
   @Override
-  public Class<byte[]> getType() {
+  public Class<byte[]> type() {
     return byte[].class;
   }
 
   @Override
-  public boolean isJdbcNative() {
-    return baseType.isJdbcNative();
+  public boolean jdbcNative() {
+    return baseType.jdbcNative();
   }
 
   @Override
@@ -75,8 +75,8 @@ public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
-    return baseType.getDocType();
+  public DocPropertyType docType() {
+    return baseType.docType();
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
index 44fb1c475..f5e45a84e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
@@ -13,7 +13,7 @@ final class ScalarTypeClass extends ScalarTypeBaseVarchar<Class> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 255;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
index 194e43c32..cc2568e43 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
@@ -12,7 +12,7 @@ final class ScalarTypeCurrency extends ScalarTypeBaseVarchar<Currency> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 3;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
index 392cb3bdb..6e80cc5de 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -91,7 +91,7 @@ final class ScalarTypeDouble extends ScalarTypeBase<Double> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.DOUBLE;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
index 5daff6f4c..a3385b521 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
@@ -104,7 +104,7 @@ class ScalarTypeDuration extends ScalarTypeBase<Duration> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.KEYWORD;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index e05c674a1..605f1ccad 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -31,13 +31,13 @@ public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, Local
   }
 
   @Override
-  public boolean isBinaryType() {
-    return wrapped.isBinaryType();
+  public boolean binary() {
+    return wrapped.binary();
   }
 
   @Override
-  public boolean isMutable() {
-    return wrapped.isMutable();
+  public boolean mutable() {
+    return wrapped.mutable();
   }
 
   @Override
@@ -80,22 +80,22 @@ public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, Local
   }
 
   @Override
-  public int getJdbcType() {
-    return byteArrayType.getJdbcType();
+  public int jdbcType() {
+    return byteArrayType.jdbcType();
   }
 
   @Override
-  public int getLength() {
-    return byteArrayType.getLength();
+  public int length() {
+    return byteArrayType.length();
   }
 
   @Override
-  public Class<T> getType() {
-    return wrapped.getType();
+  public Class<T> type() {
+    return wrapped.type();
   }
 
   @Override
-  public boolean isJdbcNative() {
+  public boolean jdbcNative() {
     return false;
   }
 
@@ -146,8 +146,8 @@ public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, Local
   }
 
   @Override
-  public DocPropertyType getDocType() {
-    return wrapped.getDocType();
+  public DocPropertyType docType() {
+    return wrapped.docType();
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
index d33b06af4..a359ba3ef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
@@ -73,7 +73,7 @@ final class ScalarTypeEnumStandard {
     }
 
     @Override
-    public int getLength() {
+    public int length() {
       return length;
     }
 
@@ -248,7 +248,7 @@ final class ScalarTypeEnumStandard {
     }
 
     @Override
-    public DocPropertyType getDocType() {
+    public DocPropertyType docType() {
       return DocPropertyType.ENUM;
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
index 287c11f60..9054a4546 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
@@ -64,7 +64,7 @@ class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase implemen
    * Return the DB column length for storing the enum value.
    */
   @Override
-  public int getLength() {
+  public int length() {
     return length;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
index 73037a58a..23c59d744 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
@@ -43,7 +43,7 @@ final class ScalarTypeFile extends ScalarTypeBase<File> {
   }
 
   @Override
-  public boolean isBinaryType() {
+  public boolean binary() {
     return true;
   }
 
@@ -117,7 +117,7 @@ final class ScalarTypeFile extends ScalarTypeBase<File> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.BINARY;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
index 66f2d206b..5c65f26a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -91,7 +91,7 @@ final class ScalarTypeFloat extends ScalarTypeBase<Float> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.FLOAT;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
index 166a81280..613fb7f7c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
@@ -14,7 +14,7 @@ final class ScalarTypeInetAddress extends ScalarTypeBaseVarchar<InetAddress> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 50;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index 164646899..35e00d40f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -102,7 +102,7 @@ final class ScalarTypeInteger extends ScalarTypeBase<Integer> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.INTEGER;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
index b9e434773..617faa38f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
@@ -112,7 +112,7 @@ class ScalarTypeJodaLocalTime extends ScalarTypeBase<LocalTime> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.KEYWORD;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
index 5c319c6ef..731e44760 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
@@ -12,7 +12,7 @@ final class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar<Period> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 50;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java
index e78f6b02d..8ceee543f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java
@@ -52,7 +52,7 @@ abstract class ScalarTypeJsonCollection<T> extends ScalarTypeBase<T> implements
    * Consider as a mutable type. Use the isDirty() method to check for dirty state.
    */
   @Override
-  public boolean isMutable() {
+  public boolean mutable() {
     return true;
   }
 
@@ -76,7 +76,7 @@ abstract class ScalarTypeJsonCollection<T> extends ScalarTypeBase<T> implements
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return docPropertyType;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index 4abd85931..74b23c799 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -118,7 +118,7 @@ final class ScalarTypeJsonList {
     }
 
     @Override
-    public final boolean isJsonMapper() {
+    public final boolean jsonMapper() {
       return keepSource;
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
index 96030c23f..db5ee25b7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
@@ -123,7 +123,7 @@ abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
    * Map is a mutable type. Use the isDirty() method to check for dirty state.
    */
   @Override
-  public final boolean isMutable() {
+  public final boolean mutable() {
     return true;
   }
 
@@ -136,7 +136,7 @@ abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public final boolean isJsonMapper() {
+  public final boolean jsonMapper() {
     return keepSource;
   }
 
@@ -244,7 +244,7 @@ abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public final DocPropertyType getDocType() {
+  public final DocPropertyType docType() {
     return DocPropertyType.OBJECT;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
index 5efcb2c7b..69e1661d0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
@@ -100,7 +100,7 @@ abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
    * Map is a mutable type. Use the isDirty() method to check for dirty state.
    */
   @Override
-  public boolean isMutable() {
+  public boolean mutable() {
     return true;
   }
 
@@ -196,7 +196,7 @@ abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.OBJECT;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 94bfd4c88..c8bb1a88d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -70,12 +70,12 @@ final class ScalarTypeJsonObjectMapper {
     }
 
     @Override
-    public boolean isMutable() {
+    public boolean mutable() {
       return true;
     }
 
     @Override
-    public boolean isJsonMapper() {
+    public boolean jsonMapper() {
       return true;
     }
 
@@ -198,7 +198,7 @@ final class ScalarTypeJsonObjectMapper {
     }
 
     @Override
-    public final DocPropertyType getDocType() {
+    public final DocPropertyType docType() {
       return docType;
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index 354d793d7..32f8e67c5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -116,7 +116,7 @@ final class ScalarTypeJsonSet {
     }
 
     @Override
-    public final boolean isJsonMapper() {
+    public final boolean jsonMapper() {
       return keepSource;
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
index b859b56c6..ef417b786 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
@@ -102,7 +102,7 @@ class ScalarTypeLocalTime extends ScalarTypeBase<LocalTime> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.KEYWORD;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
index 88190593a..7eb53e37b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
@@ -12,7 +12,7 @@ final class ScalarTypeLocale extends ScalarTypeBaseVarchar<Locale> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 20;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
index cb9427967..93ed58576 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
@@ -101,7 +101,7 @@ final class ScalarTypeLong extends ScalarTypeBase<Long> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.LONG;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index b6855e4ad..f84fa4871 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -96,7 +96,7 @@ final class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.LONG;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
index f655894ee..a90b238bb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
@@ -111,7 +111,7 @@ final class ScalarTypeMonthDay extends ScalarTypeBase<MonthDay> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.KEYWORD;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java
index ef0495296..4f1305144 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java
@@ -24,17 +24,17 @@ class ScalarTypeNotFound implements ScalarType<Void> {
   private ScalarTypeNotFound() {  }
 
   @Override
-  public boolean isJdbcNative() {
+  public boolean jdbcNative() {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public int getJdbcType() {
+  public int jdbcType() {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public Class<Void> getType() {
+  public Class<Void> type() {
     throw new UnsupportedOperationException();
   }
 
@@ -79,7 +79,7 @@ class ScalarTypeNotFound implements ScalarType<Void> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     throw new UnsupportedOperationException();
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
index e1f241b51..72702721b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
@@ -12,7 +12,7 @@ final class ScalarTypeOffsetTime extends ScalarTypeBaseVarchar<OffsetTime> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 25;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
index 9b0175173..ceb34c865 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
@@ -12,7 +12,7 @@ final class ScalarTypePeriod extends ScalarTypeBaseVarchar<Period> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 20;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
index 2f33dc929..799ebef96 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
@@ -27,7 +27,7 @@ final class ScalarTypePostgresHstore extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public boolean isMutable() {
+  public boolean mutable() {
     return true;
   }
 
@@ -114,7 +114,7 @@ final class ScalarTypePostgresHstore extends ScalarTypeBase<Map> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.OBJECT;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
index 11bfa7b22..41c3716c4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
@@ -87,7 +87,7 @@ final class ScalarTypeShort extends ScalarTypeBase<Short> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.SHORT;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
index 6878fbb5b..457749757 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
@@ -91,7 +91,7 @@ abstract class ScalarTypeStringBase extends ScalarTypeBase<String> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.TEXT;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
index e8bcca79d..ffab3f274 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
@@ -93,7 +93,7 @@ final class ScalarTypeTime extends ScalarTypeBase<Time> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.KEYWORD;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
index a938a1c6a..cae7d2b08 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
@@ -12,7 +12,7 @@ final class ScalarTypeTimeZone extends ScalarTypeBaseVarchar<TimeZone> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 32;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
index db003d526..3ee9251b4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
@@ -79,7 +79,7 @@ abstract class ScalarTypeUUIDBase extends ScalarTypeBase<UUID> implements Scalar
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.UUID;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
index 078d51a12..e379ddc2c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
@@ -18,7 +18,7 @@ public final class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 16;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
index 19a9e0829..73effd474 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
@@ -17,7 +17,7 @@ final class ScalarTypeUUIDVarchar extends ScalarTypeUUIDBase {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 40;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
index e83611f77..0135b6c4e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -39,7 +39,7 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
 
   @Override
   public String toString() {
-    return "ScalarTypeWrapper " + wrapperType + " to " + scalarType.getType();
+    return "ScalarTypeWrapper " + wrapperType + " to " + scalarType.type();
   }
 
   @Override
@@ -48,13 +48,13 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
   }
 
   @Override
-  public boolean isBinaryType() {
-    return scalarType.isBinaryType();
+  public boolean binary() {
+    return scalarType.binary();
   }
 
   @Override
-  public boolean isMutable() {
-    return scalarType.isMutable();
+  public boolean mutable() {
+    return scalarType.mutable();
   }
 
   @Override
@@ -85,22 +85,22 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
   }
 
   @Override
-  public int getJdbcType() {
-    return scalarType.getJdbcType();
+  public int jdbcType() {
+    return scalarType.jdbcType();
   }
 
   @Override
-  public int getLength() {
-    return scalarType.getLength();
+  public int length() {
+    return scalarType.length();
   }
 
   @Override
-  public Class<B> getType() {
+  public Class<B> type() {
     return wrapperType;
   }
 
   @Override
-  public boolean isJdbcNative() {
+  public boolean jdbcNative() {
     return false;
   }
 
@@ -154,7 +154,7 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
     if (value == null) {
       return nullValue;
     }
-    if (getType().isAssignableFrom(value.getClass())) {
+    if (type().isAssignableFrom(value.getClass())) {
       return (B) value;
     }
     if (value instanceof String) {
@@ -188,8 +188,8 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
-    return scalarType.getDocType();
+  public DocPropertyType docType() {
+    return scalarType.docType();
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
index 7d19c248c..a1e5dd809 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
@@ -92,7 +92,7 @@ final class ScalarTypeYear extends ScalarTypeBase<Year> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return DocPropertyType.INTEGER;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
index 482752494..d1dca2b72 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
@@ -12,7 +12,7 @@ final class ScalarTypeZoneId extends ScalarTypeBaseVarchar<ZoneId> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 60;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
index 613b25c2d..2b960af74 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
@@ -12,7 +12,7 @@ final class ScalarTypeZoneOffset extends ScalarTypeBaseVarchar<ZoneOffset> {
   }
 
   @Override
-  public int getLength() {
+  public int length() {
     return 60;
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java
index 0a0a6c0b2..d5b83e7c8 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeFactoryTest.java
@@ -16,13 +16,13 @@ public class DefaultTypeFactoryTest {
   public void testCreateBoolean() throws Exception {
 
     ScalarType<Boolean> stIntBoolean = defaultTypeFactory.createBoolean("0", "1");
-    assertEquals(Types.INTEGER, stIntBoolean.getJdbcType());
+    assertEquals(Types.INTEGER, stIntBoolean.jdbcType());
 
     stIntBoolean = defaultTypeFactory.createBoolean("1", "2");
-    assertEquals(Types.INTEGER, stIntBoolean.getJdbcType());
+    assertEquals(Types.INTEGER, stIntBoolean.jdbcType());
 
     ScalarType<Boolean> stStringBoolean = defaultTypeFactory.createBoolean("Y", "N");
-    assertEquals(Types.VARCHAR, stStringBoolean.getJdbcType());
+    assertEquals(Types.VARCHAR, stStringBoolean.jdbcType());
 
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java
index aafbe3a92..32edd86b2 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java
@@ -11,7 +11,7 @@ public class ScalarTypeJodaPeriodTest {
 
   @Test
   public void getLength() {
-    assertThat(scalarType.getLength()).isEqualTo(50);
+    assertThat(scalarType.length()).isEqualTo(50);
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java
index a5aabbe7e..53ac757f1 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetTimeTest.java
@@ -13,7 +13,7 @@ public class ScalarTypeOffsetTimeTest {
   @Test
   public void testGetLength() throws Exception {
 
-    assertEquals(25, type.getLength());
+    assertEquals(25, type.length());
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java
index 29d6e6767..3f2c4e1bf 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePeriodTest.java
@@ -12,7 +12,7 @@ public class ScalarTypePeriodTest {
 
   @Test
   public void getLength() {
-    assertThat(scalarType.getLength()).isEqualTo(20);
+    assertThat(scalarType.length()).isEqualTo(20);
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
index 1a6a4afd0..4ad2b4e9a 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
@@ -23,7 +23,7 @@ public class ScalarTypePostgresHstoreTest {
 
   @Test
   public void testIsMutable() {
-    assertTrue(hstore.isMutable());
+    assertTrue(hstore.mutable());
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimeZoneTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimeZoneTest.java
index 894c20dc3..f122f50b6 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimeZoneTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimeZoneTest.java
@@ -10,6 +10,6 @@ class ScalarTypeTimeZoneTest {
 
   @Test
   void getLength() {
-    assertEquals(32, type.getLength());
+    assertEquals(32, type.length());
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java
index 4dfbfd886..e056d12a0 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneIdTest.java
@@ -13,7 +13,7 @@ public class ScalarTypeZoneIdTest {
   @Test
   public void testGetLength() throws Exception {
 
-    assertEquals(60, type.getLength());
+    assertEquals(60, type.length());
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java
index be581d818..18ae8e0c3 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZoneOffsetTest.java
@@ -15,7 +15,7 @@ public class ScalarTypeZoneOffsetTest {
   @Test
   public void testGetLength() throws Exception {
 
-    assertEquals(60, type.getLength());
+    assertEquals(60, type.length());
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
index 71108a4ac..342a02b5f 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
@@ -100,9 +100,9 @@ class TestTypeManager extends BaseTest {
     DefaultTypeManager typeManager = createTypeManager();
 
     ScalarType<?> scalarType = typeManager.getScalarType(Money.class);
-    assertEquals(Types.DECIMAL, scalarType.getJdbcType());
-    assertFalse(scalarType.isJdbcNative());
-    assertEquals(Money.class, scalarType.getType());
+    assertEquals(Types.DECIMAL, scalarType.jdbcType());
+    assertFalse(scalarType.jdbcNative());
+    assertEquals(Money.class, scalarType.type());
   }
 
   @Test
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
index b0e57619b..20730e372 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java
@@ -158,7 +158,7 @@ public class ModelBuildContext {
     if (p.isLocalEncrypted()) {
       // scalar type potentially wrapping varbinary db type
       ScalarType<Object> scalarType = p.scalarType();
-      int jdbcType = scalarType.getJdbcType();
+      int jdbcType = scalarType.jdbcType();
       return dbTypeMap.get(jdbcType);
     }
 
diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
index d96f45476..eb29fad3f 100644
--- a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
+++ b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
@@ -62,17 +62,17 @@ abstract class ScalarTypePgisBase<T extends Geometry> implements ScalarType<T> {
 
 
   @Override
-  public boolean isJdbcNative() {
+  public boolean jdbcNative() {
     return true;
   }
 
   @Override
-  public int getJdbcType() {
+  public int jdbcType() {
     return jdbcType;
   }
 
   @Override
-  public Class<T> getType() {
+  public Class<T> type() {
     return cls;
   }
 
@@ -117,7 +117,7 @@ abstract class ScalarTypePgisBase<T extends Geometry> implements ScalarType<T> {
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return null;
   }
 
diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
index c90b887f5..dfdee4881 100644
--- a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
+++ b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
@@ -28,17 +28,17 @@ abstract class ScalarTypeGeoLatteBase<T extends Geometry> implements ScalarType<
   }
 
   @Override
-  public boolean isJdbcNative() {
+  public boolean jdbcNative() {
     return true;
   }
 
   @Override
-  public int getJdbcType() {
+  public int jdbcType() {
     return jdbcType;
   }
 
   @Override
-  public Class<T> getType() {
+  public Class<T> type() {
     return cls;
   }
 
@@ -108,7 +108,7 @@ abstract class ScalarTypeGeoLatteBase<T extends Geometry> implements ScalarType<
   }
 
   @Override
-  public DocPropertyType getDocType() {
+  public DocPropertyType docType() {
     return null;
   }
 

From cd30c479512f268321ba4987d0355913822e21ec Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 12:42:12 +1200
Subject: [PATCH 036/127] Refactor move ScalarTypeBase to the ebean-core-type
 module (for external reuse)

Doing this in preparation for moving the joda-time scalar types into their own module
(so that they can become optional).
---
 .../main/java/io/ebean/core}/type/ScalarTypeBase.java    | 9 +++------
 .../io/ebeaninternal/server/type/ScalarTypeBaseDate.java | 1 +
 .../server/type/ScalarTypeBaseDateTime.java              | 1 +
 .../ebeaninternal/server/type/ScalarTypeBaseVarchar.java | 2 +-
 .../ebeaninternal/server/type/ScalarTypeBigDecimal.java  | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeBoolean.java  | 2 +-
 .../io/ebeaninternal/server/type/ScalarTypeByte.java     | 1 +
 .../ebeaninternal/server/type/ScalarTypeBytesBase.java   | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeDouble.java   | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeDuration.java | 2 +-
 .../server/type/ScalarTypeEnumStandard.java              | 2 +-
 .../io/ebeaninternal/server/type/ScalarTypeFile.java     | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeFloat.java    | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeInteger.java  | 1 +
 .../server/type/ScalarTypeJodaLocalTime.java             | 1 +
 .../server/type/ScalarTypeJsonCollection.java            | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeJsonMap.java  | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeJsonNode.java | 1 +
 .../server/type/ScalarTypeJsonObjectMapper.java          | 5 +----
 .../ebeaninternal/server/type/ScalarTypeLocalTime.java   | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeLong.java     | 1 +
 .../server/type/ScalarTypeMathBigInteger.java            | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeMonthDay.java | 1 +
 .../server/type/ScalarTypePostgresHstore.java            | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeShort.java    | 2 +-
 .../ebeaninternal/server/type/ScalarTypeStringBase.java  | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeTime.java     | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeUUIDBase.java | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeYear.java     | 2 +-
 29 files changed, 31 insertions(+), 16 deletions(-)
 rename {ebean-core/src/main/java/io/ebeaninternal/server => ebean-core-type/src/main/java/io/ebean/core}/type/ScalarTypeBase.java (72%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java
similarity index 72%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java
index a3a01fe1a..a65838ead 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java
@@ -1,18 +1,15 @@
-package io.ebeaninternal.server.type;
-
-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.ScalarType;
+package io.ebean.core.type;
 
 /**
  * Base ScalarType object.
  */
-abstract class ScalarTypeBase<T> implements ScalarType<T> {
+public abstract class ScalarTypeBase<T> implements ScalarType<T> {
 
   protected final Class<T> type;
   protected final boolean jdbcNative;
   protected final int jdbcType;
 
-  ScalarTypeBase(Class<T> type, boolean jdbcNative, int jdbcType) {
+  public ScalarTypeBase(Class<T> type, boolean jdbcNative, int jdbcType) {
     this.type = type;
     this.jdbcNative = jdbcNative;
     this.jdbcType = jdbcType;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
index db7d392fd..b70386214 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -7,6 +7,7 @@ import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
index d42491d0d..5c328dd39 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
@@ -6,6 +6,7 @@ import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
index 86b142173..6bdfedc88 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
-import io.ebean.text.TextException;
+import io.ebean.core.type.ScalarTypeBase;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index d35679398..4d6d0958d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
index cc173aff7..24c6b074a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
-import io.ebean.text.TextException;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
index 1d37a8566..d0e9e6c96 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java
index 32d0ba67c..a5647e8a7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
 
 import java.io.ByteArrayOutputStream;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
index 6e80cc5de..221b029a8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
index a3385b521..db0b6e678 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
-import io.ebean.text.TextException;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
index a359ba3ef..2bf5e8292 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
-import io.ebean.text.TextException;
+import io.ebean.core.type.ScalarTypeBase;
 
 import javax.persistence.EnumType;
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
index 23c59d744..823942445 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
 import io.ebeaninternal.api.CoreLog;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
index 5c65f26a1..8534d92ba 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index 35e00d40f..9805454e0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
index 617faa38f..7bc388aa9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalTime;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java
index 8ceee543f..d42d82b26 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonCollection.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
index db5ee25b7..a97b9911c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java
@@ -6,6 +6,7 @@ import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebean.util.IOUtils;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
index 69e1661d0..0c7959038 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
 import io.ebean.util.IOUtils;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index c8bb1a88d..2615e5e28 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -8,10 +8,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import io.ebean.annotation.MutationDetection;
-import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.DocPropertyType;
-import io.ebean.core.type.ScalarType;
+import io.ebean.core.type.*;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
index ef417b786..b223a8268 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
index 93ed58576..9164cd1ed 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index f84fa4871..97de16c82 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
index a90b238bb..95d339bc5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
index 799ebef96..92bd4a450 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
@@ -6,6 +6,7 @@ import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.json.ModifyAwareMap;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
index 41c3716c4..75619af5f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
-import io.ebean.text.TextException;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
index 457749757..1d863270f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
index ffab3f274..dd13a85bb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
index 3ee9251b4..dda89c9cc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DocPropertyType;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
index a1e5dd809..a001ebe08 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
-import io.ebean.text.TextException;
+import io.ebean.core.type.ScalarTypeBase;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;

From 7d1772cb54f3ba94a6cd6144992ae1cfc978b449 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 12:53:44 +1200
Subject: [PATCH 037/127] Refactor ScalarType remove loadIgnore() method to
 implement in BeanProperty & DynamicPropertyBase

---
 .../src/main/java/io/ebean/core/type/ScalarType.java        | 6 ------
 .../src/main/java/io/ebean/core/type/ScalarTypeBase.java    | 5 -----
 .../java/io/ebeaninternal/server/deploy/BeanProperty.java   | 2 +-
 .../io/ebeaninternal/server/deploy/DynamicPropertyBase.java | 2 +-
 .../ebeaninternal/server/type/ScalarTypeBytesEncrypted.java | 5 -----
 .../server/type/ScalarTypeEncryptedWrapper.java             | 5 -----
 .../io/ebeaninternal/server/type/ScalarTypeNotFound.java    | 5 -----
 .../io/ebeaninternal/server/type/ScalarTypeWrapper.java     | 5 -----
 .../src/main/java/io/ebean/postgis/ScalarTypePgisBase.java  | 5 -----
 .../java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java | 5 -----
 10 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index 9523fd9d5..304428924 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -101,12 +101,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
   @Override
   T read(DataReader reader) throws SQLException;
 
-  /**
-   * Ignore the reading of this value. Typically, this means moving the index
-   * position in the ResultSet.
-   */
-  void loadIgnore(DataReader reader);
-
   /**
    * Convert (if necessary) and bind the value to the preparedStatement.
    * <p>
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java
index a65838ead..40f092624 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java
@@ -36,9 +36,4 @@ public abstract class ScalarTypeBase<T> implements ScalarType<T> {
     return formatValue((T) value);
   }
 
-  @Override
-  public void loadIgnore(DataReader reader) {
-    reader.incrementPos(1);
-  }
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 9468379a2..4c38bc110 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -508,7 +508,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
 
   @Override
   public void loadIgnore(DbReadContext ctx) {
-    scalarType.loadIgnore(ctx.dataReader());
+    ctx.dataReader().incrementPos(1);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
index fe06c0f4c..c8711ea62 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyBase.java
@@ -65,7 +65,7 @@ abstract class DynamicPropertyBase implements STreeProperty {
 
   @Override
   public void loadIgnore(DbReadContext ctx) {
-    scalarType.loadIgnore(ctx.dataReader());
+    ctx.dataReader().incrementPos(1);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
index a49ea668c..c1419e010 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
@@ -57,11 +57,6 @@ public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
     return baseType.jdbcNative();
   }
 
-  @Override
-  public void loadIgnore(DataReader reader) {
-    baseType.loadIgnore(reader);
-  }
-
   @Override
   public void jsonWrite(JsonGenerator writer, byte[] value) throws IOException {
     writer.writeBinary(value);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index 605f1ccad..caa965190 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -99,11 +99,6 @@ public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, Local
     return false;
   }
 
-  @Override
-  public void loadIgnore(DataReader dataReader) {
-    wrapped.loadIgnore(dataReader);
-  }
-
   @Override
   @SuppressWarnings("unchecked")
   public String format(Object v) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java
index 4f1305144..3b84cc68b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java
@@ -43,11 +43,6 @@ class ScalarTypeNotFound implements ScalarType<Void> {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public void loadIgnore(DataReader reader) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public void bind(DataBinder binder, Void value) throws SQLException {
     throw new UnsupportedOperationException();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
index 0135b6c4e..1226280e2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -134,11 +134,6 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
     return converter.wrapValue(sv);
   }
 
-  @Override
-  public void loadIgnore(DataReader reader) {
-    reader.incrementPos(1);
-  }
-
   @Override
   public B read(DataReader reader) throws SQLException {
     S sv = scalarType.read(reader);
diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
index eb29fad3f..cd06256e5 100644
--- a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
+++ b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
@@ -86,11 +86,6 @@ abstract class ScalarTypePgisBase<T extends Geometry> implements ScalarType<T> {
 
   }
 
-  @Override
-  public void loadIgnore(DataReader reader) {
-    reader.incrementPos(1);
-  }
-
   @Override
   public Object toJdbcType(Object value) {
     return null;
diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
index dfdee4881..34bc43901 100644
--- a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
+++ b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
@@ -77,11 +77,6 @@ abstract class ScalarTypeGeoLatteBase<T extends Geometry> implements ScalarType<
 
   }
 
-  @Override
-  public void loadIgnore(DataReader reader) {
-    reader.incrementPos(1);
-  }
-
   @Override
   public Object toJdbcType(Object value) {
     return null;

From 186019da7f722aa84262b80816fbbaa9ca749517 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 13:00:30 +1200
Subject: [PATCH 038/127] Refactor ScalarType move format() default method from
 ScalarTypeBase to ScalarType

---
 .../src/main/java/io/ebean/core/type/ScalarType.java        | 5 ++++-
 .../src/main/java/io/ebean/core/type/ScalarTypeBase.java    | 6 ------
 .../io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java | 6 ------
 .../ebeaninternal/server/type/ScalarTypeBytesEncrypted.java | 5 -----
 .../server/type/ScalarTypeEncryptedWrapper.java             | 6 ------
 .../io/ebeaninternal/server/type/ScalarTypeNotFound.java    | 5 -----
 .../io/ebeaninternal/server/type/ScalarTypeWrapper.java     | 6 ------
 .../src/main/java/io/ebean/postgis/ScalarTypePgisBase.java  | 5 -----
 .../java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java | 5 -----
 9 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index 304428924..ae354110e 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -141,8 +141,11 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * <p>
    * This is so that ScalarType also implements the StringFormatter interface.
    */
+  @SuppressWarnings("unchecked")
   @Override
-  String format(Object value);
+  default String format(Object value) {
+    return formatValue((T) value);
+  }
 
   /**
    * Convert the string value to the appropriate java object.
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java
index 40f092624..3231016c2 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBase.java
@@ -30,10 +30,4 @@ public abstract class ScalarTypeBase<T> implements ScalarType<T> {
     return type;
   }
 
-  @Override
-  @SuppressWarnings("unchecked")
-  public String format(Object value) {
-    return formatValue((T) value);
-  }
-
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
index 6bdfedc88..71785fb3d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
@@ -88,12 +88,6 @@ abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
     return format(value);
   }
 
-  @Override
-  @SuppressWarnings("unchecked")
-  public String format(Object value) {
-    return formatValue((T) value);
-  }
-
   @Override
   public T readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
index c1419e010..118078b41 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
@@ -74,11 +74,6 @@ public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
     return baseType.docType();
   }
 
-  @Override
-  public String format(Object v) {
-    throw new RuntimeException("Not used");
-  }
-
   @Override
   public String formatValue(byte[] v) {
     throw new RuntimeException("Not used");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index caa965190..6f04227af 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -99,12 +99,6 @@ public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, Local
     return false;
   }
 
-  @Override
-  @SuppressWarnings("unchecked")
-  public String format(Object v) {
-    return formatValue((T) v);
-  }
-
   @Override
   public String formatValue(T v) {
     return wrapped.formatValue(v);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java
index 3b84cc68b..235ea7334 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeNotFound.java
@@ -63,11 +63,6 @@ class ScalarTypeNotFound implements ScalarType<Void> {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public String format(Object value) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public Void parse(String value) {
     throw new UnsupportedOperationException();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
index 1226280e2..ee707e1c2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -104,12 +104,6 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
     return false;
   }
 
-  @Override
-  @SuppressWarnings("unchecked")
-  public String format(Object v) {
-    return formatValue((B) v);
-  }
-
   @Override
   public String formatValue(B v) {
     S sv = converter.unwrapValue(v);
diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
index cd06256e5..6a825a8b6 100644
--- a/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
+++ b/ebean-postgis/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
@@ -101,11 +101,6 @@ abstract class ScalarTypePgisBase<T extends Geometry> implements ScalarType<T> {
     return null;
   }
 
-  @Override
-  public String format(Object value) {
-    return null;
-  }
-
   @Override
   public T parse(String value) {
     return null;
diff --git a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
index 34bc43901..cd6a74054 100644
--- a/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
+++ b/ebean-postgis/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
@@ -92,11 +92,6 @@ abstract class ScalarTypeGeoLatteBase<T extends Geometry> implements ScalarType<
     return null;
   }
 
-  @Override
-  public String format(Object value) {
-    return null;
-  }
-
   @Override
   public T parse(String value) {
     return null;

From d2da4f7e5238366cff035d2e115c27c092b0c9cb Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 13:12:35 +1200
Subject: [PATCH 039/127] Reorder methods on ScalarType only

---
 .../java/io/ebean/core/type/ScalarType.java   | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index ae354110e..83433ef69 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -2,7 +2,6 @@ package io.ebean.core.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-
 import io.ebean.text.StringFormatter;
 import io.ebean.text.StringParser;
 
@@ -94,6 +93,11 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    */
   Class<T> type();
 
+  /**
+   * Return the type this maps to for JSON document stores.
+   */
+  DocPropertyType docType();
+
   /**
    * Read the value from the resultSet and convert if necessary to the logical
    * bean property value.
@@ -129,6 +133,14 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    */
   T toBeanType(Object value);
 
+  /**
+   * Convert the string value to the appropriate java object.
+   * <p>
+   * Mostly used to support CSV, JSON and XML parsing.
+   */
+  @Override
+  T parse(String value);
+
   /**
    * Convert the type into a string representation.
    */
@@ -147,19 +159,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
     return formatValue((T) value);
   }
 
-  /**
-   * Convert the string value to the appropriate java object.
-   * <p>
-   * Mostly used to support CSV, JSON and XML parsing.
-   */
-  @Override
-  T parse(String value);
-
-  /**
-   * Return the type this maps to for JSON document stores.
-   */
-  DocPropertyType docType();
-
   /**
    * Convert the value into a long version value.
    */

From 216c43eea688894f284e07f92bb301eccdf5a3b1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 17:25:49 +1200
Subject: [PATCH 040/127] Extract CsvReader into separate ebean-csv-reader
 module

---
 ebean-api/src/main/java/io/ebean/DB.java      |  6 --
 .../src/main/java/io/ebean/Database.java      |  4 --
 .../io/ebean/text/csv/DefaultCsvCallback.java |  3 +-
 .../server/core/DefaultServer.java            |  5 --
 .../server/text/csv/package-info.java         |  1 -
 ebean-csv-reader/pom.xml                      | 69 +++++++++++++++++++
 .../server/text/csv/CsvUtilReader.java        |  0
 .../server/text/csv/TCsvReader.java           | 60 ++++++++--------
 .../server/text/csv}/TimeStringParser.java    |  4 +-
 .../server}/text/csv/TestCsvReader.java       | 29 +++++---
 .../text/csv/TestCsvReaderWithCallback.java   | 47 +++++++++++++
 .../server/text/csv/TimeStringParserTest.java |  6 +-
 .../src/test/java/org/example/BaseEntity.java | 48 +++++++++++++
 .../src/test/java/org/example/Country.java    | 31 +++++++++
 .../src/test/java/org/example/Customer.java   | 63 +++++++++++++++++
 .../src/test/java/org/example/DAddress.java   | 54 +++++++++++++++
 .../src/test/resources/application-test.yml   |  4 ++
 .../src/test/resources/test1.csv              |  0
 .../xtest/internal/api/TDSpiEbeanServer.java  |  4 --
 .../ebean/xtest/internal/api/TDSpiServer.java |  4 --
 .../text/csv/TestCsvReaderWithCallback.java   | 59 ----------------
 pom.xml                                       |  1 +
 22 files changed, 372 insertions(+), 130 deletions(-)
 delete mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/text/csv/package-info.java
 create mode 100644 ebean-csv-reader/pom.xml
 rename {ebean-core => ebean-csv-reader}/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java (100%)
 rename {ebean-core => ebean-csv-reader}/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java (89%)
 rename {ebean-api/src/main/java/io/ebean/text => ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv}/TimeStringParser.java (94%)
 rename {ebean-test/src/test/java/org/tests => ebean-csv-reader/src/test/java/io/ebeaninternal/server}/text/csv/TestCsvReader.java (50%)
 create mode 100644 ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReaderWithCallback.java
 rename ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java => ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TimeStringParserTest.java (79%)
 create mode 100644 ebean-csv-reader/src/test/java/org/example/BaseEntity.java
 create mode 100644 ebean-csv-reader/src/test/java/org/example/Country.java
 create mode 100644 ebean-csv-reader/src/test/java/org/example/Customer.java
 create mode 100644 ebean-csv-reader/src/test/java/org/example/DAddress.java
 create mode 100644 ebean-csv-reader/src/test/resources/application-test.yml
 rename {ebean-test => ebean-csv-reader}/src/test/resources/test1.csv (100%)
 delete mode 100644 ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java

diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java
index e922fd94e..b9558fd3c 100644
--- a/ebean-api/src/main/java/io/ebean/DB.java
+++ b/ebean-api/src/main/java/io/ebean/DB.java
@@ -785,12 +785,6 @@ public final class DB {
     return getDefault().createUpdate(beanType, ormUpdate);
   }
 
-  /**
-   * Create a CsvReader for a given beanType.
-   */
-  public static <T> CsvReader<T> createCsvReader(Class<T> beanType) {
-    return getDefault().createCsvReader(beanType);
-  }
 
   /**
    * Create a named query.
diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index 7c976eb0c..47df2b9fb 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -204,10 +204,6 @@ public interface Database {
    */
   <T> T createEntityBean(Class<T> type);
 
-  /**
-   * Create a CsvReader for a given beanType.
-   */
-  <T> CsvReader<T> createCsvReader(Class<T> beanType);
 
   /**
    * Create an Update query to perform a bulk update.
diff --git a/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java b/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
index 3fcc8cc51..57ec73388 100644
--- a/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
+++ b/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
@@ -49,6 +49,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
    */
   protected final int persistBatchSize;
 
+  protected boolean getGeneratedKeys = true;
   /**
    * The time the process started.
    */
@@ -164,7 +165,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
       if (persistBatchSize > 1) {
         transaction.setBatchMode(true);
         transaction.setBatchSize(persistBatchSize);
-        transaction.setGetGeneratedKeys(false);
+        transaction.setGetGeneratedKeys(getGeneratedKeys);
       } else {
         // explicitly turn off JDBC batching in case
         // is has been turned on globally
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 02acc09a7..e9af6750c 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
@@ -39,7 +39,6 @@ import io.ebeaninternal.server.grammer.EqlParser;
 import io.ebeaninternal.server.query.*;
 import io.ebeaninternal.server.querydefn.*;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
-import io.ebeaninternal.server.text.csv.TCsvReader;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 import io.ebeaninternal.server.transaction.RemoteTransactionEvent;
 import io.ebeaninternal.server.transaction.TransactionManager;
@@ -807,10 +806,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new ElFilter<>(desc(beanType));
   }
 
-  @Override
-  public <T> CsvReader<T> createCsvReader(Class<T> beanType) {
-    return new TCsvReader<>(this, desc(beanType));
-  }
 
   @Override
   public <T> UpdateQuery<T> update(Class<T> beanType) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/package-info.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/package-info.java
deleted file mode 100644
index 039bc09f3..000000000
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package io.ebeaninternal.server.text.csv;
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
new file mode 100644
index 000000000..147b10ea9
--- /dev/null
+++ b/ebean-csv-reader/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.8.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>ebean-csv-reader</artifactId>
+
+  <properties>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.8.2-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.8.2-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-test</artifactId>
+      <version>13.8.2-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <!-- for testing -->
+      <plugin>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.24</version>
+        <extensions>true</extensions>
+        <configuration>
+          <tiles>
+            <tile>io.ebean.tile:enhancement:13.6.5</tile>
+          </tiles>
+        </configuration>
+      </plugin>
+
+    </plugins>
+
+  </build>
+</project>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java b/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
similarity index 100%
rename from ebean-core/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
rename to ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
similarity index 89%
rename from ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
rename to ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
index 62be82d5c..9d144067c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
+++ b/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
@@ -2,16 +2,13 @@ package io.ebeaninternal.server.text.csv;
 
 import io.ebean.Database;
 import io.ebean.bean.EntityBean;
+import io.ebean.plugin.BeanType;
 import io.ebean.plugin.ExpressionPath;
 import io.ebean.text.StringParser;
 import io.ebean.text.TextException;
-import io.ebean.text.TimeStringParser;
 import io.ebean.text.csv.CsvCallback;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.csv.DefaultCsvCallback;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-import io.ebeaninternal.server.el.ElPropertyValue;
 
 import java.io.Reader;
 import java.sql.Types;
@@ -27,13 +24,13 @@ import java.util.Locale;
 /**
  * Implementation of the CsvReader
  */
-public class TCsvReader<T> implements CsvReader<T> {
+public class TCsvReader<T> {//implements CsvReader<T> {
 
   private static final TimeStringParser TIME_PARSER = new TimeStringParser();
 
   private final Database server;
 
-  private final BeanDescriptor<T> descriptor;
+  private final BeanType<T> descriptor;
 
   private final List<CsvColumn> columnList = new ArrayList<>();
 
@@ -55,73 +52,73 @@ public class TCsvReader<T> implements CsvReader<T> {
 
   private boolean addPropertiesFromHeader;
 
-  public TCsvReader(Database server, BeanDescriptor<T> descriptor) {
+  public TCsvReader(Database server, BeanType<T> descriptor) {
     this.server = server;
     this.descriptor = descriptor;
   }
 
-  @Override
+  ////@Override
   public void setDefaultLocale(Locale defaultLocale) {
     this.defaultLocale = defaultLocale;
   }
 
-  @Override
+  ////@Override
   public void setDefaultTimeFormat(String defaultTimeFormat) {
     this.defaultTimeFormat = defaultTimeFormat;
   }
 
-  @Override
+  ////@Override
   public void setDefaultDateFormat(String defaultDateFormat) {
     this.defaultDateFormat = defaultDateFormat;
   }
 
-  @Override
+  ////@Override
   public void setDefaultTimestampFormat(String defaultTimestampFormat) {
     this.defaultTimestampFormat = defaultTimestampFormat;
   }
 
-  @Override
+  ////@Override
   public void setPersistBatchSize(int persistBatchSize) {
     this.persistBatchSize = persistBatchSize;
   }
 
-  @Override
+  ////@Override
   public void setIgnoreHeader() {
     setHasHeader(true, false);
   }
 
-  @Override
+  ////@Override
   public void setAddPropertiesFromHeader() {
     setHasHeader(true, true);
   }
 
-  @Override
+  //@Override
   public void setHasHeader(boolean hasHeader, boolean addPropertiesFromHeader) {
     this.hasHeader = hasHeader;
     this.addPropertiesFromHeader = addPropertiesFromHeader;
   }
 
-  @Override
+  //@Override
   public void setLogInfoFrequency(int logInfoFrequency) {
     this.logInfoFrequency = logInfoFrequency;
   }
 
-  @Override
+  //@Override
   public void addIgnore() {
     columnList.add(ignoreColumn);
   }
 
-  @Override
+  //@Override
   public void addProperty(String propertyName) {
     addProperty(propertyName, null);
   }
 
-  @Override
+  //@Override
   public void addDateTime(String propertyName, String dateTimeFormat) {
     addDateTime(propertyName, dateTimeFormat, Locale.getDefault());
   }
 
-  @Override
+  //@Override
   public void addDateTime(String propertyName, String dateTimeFormat, Locale locale) {
     ExpressionPath elProp = descriptor.expressionPath(propertyName);
     if (dateTimeFormat == null) {
@@ -153,7 +150,7 @@ public class TCsvReader<T> implements CsvReader<T> {
     }
   }
 
-  @Override
+  //@Override
   public void addProperty(String propertyName, StringParser parser) {
 
     ExpressionPath elProp = descriptor.expressionPath(propertyName);
@@ -164,13 +161,13 @@ public class TCsvReader<T> implements CsvReader<T> {
     columnList.add(column);
   }
 
-  @Override
+  //@Override
   public void process(Reader reader) throws Exception {
     DefaultCsvCallback<T> callback = new DefaultCsvCallback<>(persistBatchSize, logInfoFrequency);
     process(reader, callback);
   }
 
-  @Override
+  //@Override
   public void process(Reader reader, CsvCallback<T> callback) throws Exception {
 
     if (reader == null) {
@@ -231,7 +228,8 @@ public class TCsvReader<T> implements CsvReader<T> {
 
   private void addPropertiesFromHeader(String[] line) {
     for (String aLine : line) {
-      ElPropertyValue elProp = descriptor.elGetValue(aLine);
+      ExpressionPath elProp = descriptor.expressionPath(aLine);
+      //ElPropertyValue elProp = descriptor.elGetValue(aLine);
       if (elProp == null) {
         throw new TextException("Property [" + aLine + "] not found");
       }
@@ -242,10 +240,10 @@ public class TCsvReader<T> implements CsvReader<T> {
       } else if (isDateTimeType(elProp.jdbcType())) {
         addDateTime(aLine, null, null);
 
-      } else if (elProp.isAssocProperty()) {
-        BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>) elProp.beanProperty();
-        String idProp = assocOne.descriptor().idBinder().getIdProperty();
-        addProperty(aLine + "." + idProp);
+//      } else if (elProp.isAssocProperty()) {
+//        BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>) elProp.beanProperty();
+//        String idProp = assocOne.descriptor().idBinder().getIdProperty();
+//        addProperty(aLine + "." + idProp);
       } else {
         addProperty(aLine);
       }
@@ -260,8 +258,8 @@ public class TCsvReader<T> implements CsvReader<T> {
   protected T buildBeanFromLineContent(int row, String[] line) {
 
     try {
-      EntityBean entityBean = descriptor.createEntityBean();
-      T bean = (T) entityBean;
+      T bean = descriptor.createBean();
+      EntityBean entityBean = (EntityBean)bean;
 
       for (int columnPos = 0; columnPos < line.length; columnPos++) {
         convertAndSetColumn(columnPos, line[columnPos], entityBean);
@@ -340,7 +338,7 @@ public class TCsvReader<T> implements CsvReader<T> {
       this.format = format;
     }
 
-    @Override
+    //@Override
     public Object parse(String value) {
       try {
         Date dt = dateFormat.parse(value);
diff --git a/ebean-api/src/main/java/io/ebean/text/TimeStringParser.java b/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TimeStringParser.java
similarity index 94%
rename from ebean-api/src/main/java/io/ebean/text/TimeStringParser.java
rename to ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TimeStringParser.java
index b7c6c9e06..9cdef79de 100644
--- a/ebean-api/src/main/java/io/ebean/text/TimeStringParser.java
+++ b/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TimeStringParser.java
@@ -1,4 +1,6 @@
-package io.ebean.text;
+package io.ebeaninternal.server.text.csv;
+
+import io.ebean.text.StringParser;
 
 import java.sql.Time;
 
diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java b/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReader.java
similarity index 50%
rename from ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java
rename to ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReader.java
index 7306753f0..bf9fb44ad 100644
--- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java
+++ b/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReader.java
@@ -1,28 +1,37 @@
-package org.tests.text.csv;
+package io.ebeaninternal.server.text.csv;
 
 import io.ebean.DB;
-import io.ebean.xtest.base.TransactionalTestCase;
-import io.ebean.text.csv.CsvReader;
+import io.ebean.Database;
+import io.ebean.plugin.BeanType;
 import io.ebean.util.IOUtils;
+import org.example.Country;
+import org.example.Customer;
 import org.junit.jupiter.api.Test;
-import org.tests.model.basic.Customer;
-import org.tests.model.basic.ResetBasicData;
 
 import java.io.Reader;
 import java.net.URL;
 import java.util.Locale;
 
-public class TestCsvReader extends TransactionalTestCase {
+class TestCsvReader {
 
   @Test
-  public void test() throws Exception {
+  void test() throws Exception {
 
-    ResetBasicData.reset();
+    Country country = new Country();
+    country.code("NZ");
+    DB.save(country);
+
+    Country au = new Country();
+    au.code("AU");
+    DB.save(au);
 
     URL resource = TestCsvReaderWithCallback.class.getResource("/test1.csv");
-    try (Reader reader =  IOUtils.newReader(resource.openStream())){
+    try (Reader reader = IOUtils.newReader(resource.openStream())) {
 
-      CsvReader<Customer> csvReader = DB.getDefault().createCsvReader(Customer.class);
+      Database database = DB.getDefault();
+      BeanType<Customer> type = database.pluginApi().beanType(Customer.class);
+      TCsvReader<Customer> csvReader = new TCsvReader<>(database, type);
+      //CsvReader<Customer> csvReader = DB.getDefault().createCsvReader(Customer.class);
 
       csvReader.setPersistBatchSize(2);
 
diff --git a/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReaderWithCallback.java b/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReaderWithCallback.java
new file mode 100644
index 000000000..77c9e4119
--- /dev/null
+++ b/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReaderWithCallback.java
@@ -0,0 +1,47 @@
+package io.ebeaninternal.server.text.csv;
+
+import org.junit.jupiter.api.Test;
+
+public class TestCsvReaderWithCallback {
+
+  @Test
+  public void test() throws Throwable {
+
+//    URL resource = TestCsvReaderWithCallback.class.getResource("/test1.csv");
+//    try (Reader reader = IOUtils.newReader(resource.openStream())) {
+//
+//      CsvReader<Customer> csvReader = DB.getDefault().createCsvReader(Customer.class);
+//
+//      csvReader.setPersistBatchSize(2);
+//      csvReader.setLogInfoFrequency(3);
+//
+//      csvReader.addIgnore();
+//      // csvReader.addProperty("id");
+//      csvReader.addProperty("status");
+//      csvReader.addProperty("name");
+//      csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH);
+//      csvReader.addProperty("billingAddress.line1");
+//      csvReader.addProperty("billingAddress.city");
+//      // processor.addReference("billingAddress.country.code");
+//      csvReader.addProperty("billingAddress.country.code");
+//
+//      int before = DB.find(Customer.class).findCount();
+//
+//      csvReader.process(reader, new DefaultCsvCallback<Customer>() {
+//
+//        @Override
+//        public void processBean(int row, String[] lineContent, Customer cust) {
+//
+//          server.save(cust.getBillingAddress(), transaction);
+//          server.save(cust, transaction);
+//
+//        }
+//
+//      });
+//
+//      int after = DB.find(Customer.class).findCount();
+//      Assertions.assertThat(after).isEqualTo(before + 9);
+//    }
+  }
+
+}
diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java b/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TimeStringParserTest.java
similarity index 79%
rename from ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java
rename to ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TimeStringParserTest.java
index 5f05cab76..550ba8034 100644
--- a/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java
+++ b/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TimeStringParserTest.java
@@ -1,14 +1,12 @@
-package org.tests.text.csv;
+package io.ebeaninternal.server.text.csv;
 
-import io.ebean.xtest.BaseTestCase;
-import io.ebean.text.TimeStringParser;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Time;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class TestTimeStringParser extends BaseTestCase {
+public class TimeStringParserTest {
 
   @Test
   public void testSimple() {
diff --git a/ebean-csv-reader/src/test/java/org/example/BaseEntity.java b/ebean-csv-reader/src/test/java/org/example/BaseEntity.java
new file mode 100644
index 000000000..d2be50575
--- /dev/null
+++ b/ebean-csv-reader/src/test/java/org/example/BaseEntity.java
@@ -0,0 +1,48 @@
+package org.example;
+
+import io.ebean.annotation.WhenCreated;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+import java.time.Instant;
+
+@MappedSuperclass
+public abstract class BaseEntity {
+
+  @Id
+  long id;
+
+  @Version
+  long version;
+
+  @WhenCreated
+  Instant whenCreated;
+
+  public long id() {
+    return id;
+  }
+
+  public BaseEntity id(long id) {
+    this.id = id;
+    return this;
+  }
+
+  public long version() {
+    return version;
+  }
+
+  public BaseEntity version(long version) {
+    this.version = version;
+    return this;
+  }
+
+  public Instant whenCreated() {
+    return whenCreated;
+  }
+
+  public BaseEntity whenCreated(Instant whenCreated) {
+    this.whenCreated = whenCreated;
+    return this;
+  }
+}
diff --git a/ebean-csv-reader/src/test/java/org/example/Country.java b/ebean-csv-reader/src/test/java/org/example/Country.java
new file mode 100644
index 000000000..15782fb2a
--- /dev/null
+++ b/ebean-csv-reader/src/test/java/org/example/Country.java
@@ -0,0 +1,31 @@
+package org.example;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class Country {
+
+  @Id
+  String code;
+
+  String name;
+
+  public String code() {
+    return code;
+  }
+
+  public Country code(String code) {
+    this.code = code;
+    return this;
+  }
+
+  public String name() {
+    return name;
+  }
+
+  public Country name(String name) {
+    this.name = name;
+    return this;
+  }
+}
diff --git a/ebean-csv-reader/src/test/java/org/example/Customer.java b/ebean-csv-reader/src/test/java/org/example/Customer.java
new file mode 100644
index 000000000..53a3fb9fa
--- /dev/null
+++ b/ebean-csv-reader/src/test/java/org/example/Customer.java
@@ -0,0 +1,63 @@
+package org.example;
+
+import javax.persistence.*;
+import java.time.LocalDate;
+
+import static javax.persistence.CascadeType.PERSIST;
+
+@Entity
+public class Customer extends BaseEntity {
+
+  enum Status {
+    NEW,
+    ACTIVE,
+    INACTIVE
+  }
+
+  @Enumerated(EnumType.STRING)
+  Status status;
+
+  String name;
+
+  LocalDate anniversary;
+
+  @ManyToOne(optional = false, cascade = PERSIST)
+  DAddress billingAddress;
+
+
+  public Status status() {
+    return status;
+  }
+
+  public Customer status(Status status) {
+    this.status = status;
+    return this;
+  }
+
+  public String name() {
+    return name;
+  }
+
+  public Customer name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  public LocalDate anniversary() {
+    return anniversary;
+  }
+
+  public Customer anniversary(LocalDate anniversary) {
+    this.anniversary = anniversary;
+    return this;
+  }
+
+  public DAddress billingAddress() {
+    return billingAddress;
+  }
+
+  public Customer billingAddress(DAddress billingAddress) {
+    this.billingAddress = billingAddress;
+    return this;
+  }
+}
diff --git a/ebean-csv-reader/src/test/java/org/example/DAddress.java b/ebean-csv-reader/src/test/java/org/example/DAddress.java
new file mode 100644
index 000000000..2c8c2337a
--- /dev/null
+++ b/ebean-csv-reader/src/test/java/org/example/DAddress.java
@@ -0,0 +1,54 @@
+package org.example;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+import static javax.persistence.CascadeType.PERSIST;
+
+@Entity
+public class DAddress extends BaseEntity {
+
+  String line1;
+
+  String line2;
+  String city;
+
+  @ManyToOne(optional = false)
+  Country country;
+
+  public String line1() {
+    return line1;
+  }
+
+  public DAddress line1(String line1) {
+    this.line1 = line1;
+    return this;
+  }
+
+  public String line2() {
+    return line2;
+  }
+
+  public DAddress line2(String line2) {
+    this.line2 = line2;
+    return this;
+  }
+
+  public String city() {
+    return city;
+  }
+
+  public DAddress city(String city) {
+    this.city = city;
+    return this;
+  }
+
+  public Country country() {
+    return country;
+  }
+
+  public DAddress country(Country country) {
+    this.country = country;
+    return this;
+  }
+}
diff --git a/ebean-csv-reader/src/test/resources/application-test.yml b/ebean-csv-reader/src/test/resources/application-test.yml
new file mode 100644
index 000000000..758521ea5
--- /dev/null
+++ b/ebean-csv-reader/src/test/resources/application-test.yml
@@ -0,0 +1,4 @@
+ebean:
+  test:
+    platform: h2
+    ddlMode: dropCreate
diff --git a/ebean-test/src/test/resources/test1.csv b/ebean-csv-reader/src/test/resources/test1.csv
similarity index 100%
rename from ebean-test/src/test/resources/test1.csv
rename to ebean-csv-reader/src/test/resources/test1.csv
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
index 34309393c..d4b1eaecf 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
@@ -356,10 +356,6 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
     return null;
   }
 
-  @Override
-  public <T> CsvReader<T> createCsvReader(Class<T> beanType) {
-    return null;
-  }
 
   @Override
   public <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
index 08f2bea9e..a69f25bd7 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
@@ -103,10 +103,6 @@ public class TDSpiServer implements SpiServer {
     return null;
   }
 
-  @Override
-  public <T> CsvReader<T> createCsvReader(Class<T> beanType) {
-    return null;
-  }
 
   @Override
   public <T> UpdateQuery<T> update(Class<T> beanType) {
diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
deleted file mode 100644
index cf55d67b1..000000000
--- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.tests.text.csv;
-
-import io.ebean.DB;
-import io.ebean.xtest.base.TransactionalTestCase;
-import io.ebean.text.csv.CsvReader;
-import io.ebean.text.csv.DefaultCsvCallback;
-import io.ebean.util.IOUtils;
-import org.junit.jupiter.api.Test;
-import org.tests.model.basic.Customer;
-
-import java.io.Reader;
-import java.net.URL;
-import java.util.Locale;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class TestCsvReaderWithCallback extends TransactionalTestCase {
-
-  @Test
-  public void test() throws Throwable {
-
-    URL resource = TestCsvReaderWithCallback.class.getResource("/test1.csv");
-    try (Reader reader = IOUtils.newReader(resource.openStream())) {
-
-      CsvReader<Customer> csvReader = DB.getDefault().createCsvReader(Customer.class);
-
-      csvReader.setPersistBatchSize(2);
-      csvReader.setLogInfoFrequency(3);
-
-      csvReader.addIgnore();
-      // csvReader.addProperty("id");
-      csvReader.addProperty("status");
-      csvReader.addProperty("name");
-      csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH);
-      csvReader.addProperty("billingAddress.line1");
-      csvReader.addProperty("billingAddress.city");
-      // processor.addReference("billingAddress.country.code");
-      csvReader.addProperty("billingAddress.country.code");
-
-      int before = DB.find(Customer.class).findCount();
-
-      csvReader.process(reader, new DefaultCsvCallback<Customer>() {
-
-        @Override
-        public void processBean(int row, String[] lineContent, Customer cust) {
-
-          server.save(cust.getBillingAddress(), transaction);
-          server.save(cust, transaction);
-
-        }
-
-      });
-
-      int after = DB.find(Customer.class).findCount();
-      assertThat(after).isEqualTo(before + 9);
-    }
-  }
-
-}
diff --git a/pom.xml b/pom.xml
index 3d04697d5..1bc7781db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
     <module>ebean-redis</module>
     <module>platforms</module>
     <module>composites</module>
+    <module>ebean-csv-reader</module>
     <!--    <module>ebean-kotlin</module>-->
 
   </modules>

From 1aac01ead086a8e96b3f3ce70663ae0f6a82a225 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 17:49:11 +1200
Subject: [PATCH 041/127] Extract CsvReader - move DefaultCsvCallback and add
 module-info

---
 ebean-api/src/main/java/io/ebean/DB.java      |   1 -
 .../src/main/java/io/ebean/Database.java      |   1 -
 .../java/io/ebean/text/csv/CsvReader.java     | 171 ------------------
 .../java/io/ebean/text/csv/package-info.java  |   4 -
 ebean-api/src/main/java/module-info.java      |   1 -
 .../server/core/DefaultServer.java            |   1 -
 .../io/ebean/csv/reader}/CsvCallback.java     |   2 +-
 .../csv/reader/CsvReader.java}                |  12 +-
 .../csv/reader}/CsvUtilReader.java            |   2 +-
 .../ebean/csv/reader}/DefaultCsvCallback.java |   2 +-
 .../csv/reader}/TimeStringParser.java         |   2 +-
 .../src/main/java/module-info.java            |   6 +
 .../csv/reader/CsvReaderTest.java}            |   8 +-
 .../reader}/TestCsvReaderWithCallback.java    |   2 +-
 .../csv/reader}/TimeStringParserTest.java     |   2 +-
 .../xtest/internal/api/TDSpiEbeanServer.java  |   1 -
 .../ebean/xtest/internal/api/TDSpiServer.java |   1 -
 17 files changed, 19 insertions(+), 200 deletions(-)
 delete mode 100644 ebean-api/src/main/java/io/ebean/text/csv/CsvReader.java
 delete mode 100644 ebean-api/src/main/java/io/ebean/text/csv/package-info.java
 rename {ebean-api/src/main/java/io/ebean/text/csv => ebean-csv-reader/src/main/java/io/ebean/csv/reader}/CsvCallback.java (98%)
 rename ebean-csv-reader/src/main/java/io/{ebeaninternal/server/text/csv/TCsvReader.java => ebean/csv/reader/CsvReader.java} (96%)
 rename ebean-csv-reader/src/main/java/io/{ebeaninternal/server/text/csv => ebean/csv/reader}/CsvUtilReader.java (99%)
 rename {ebean-api/src/main/java/io/ebean/text/csv => ebean-csv-reader/src/main/java/io/ebean/csv/reader}/DefaultCsvCallback.java (99%)
 rename ebean-csv-reader/src/main/java/io/{ebeaninternal/server/text/csv => ebean/csv/reader}/TimeStringParser.java (97%)
 create mode 100644 ebean-csv-reader/src/main/java/module-info.java
 rename ebean-csv-reader/src/test/java/io/{ebeaninternal/server/text/csv/TestCsvReader.java => ebean/csv/reader/CsvReaderTest.java} (82%)
 rename ebean-csv-reader/src/test/java/io/{ebeaninternal/server/text/csv => ebean/csv/reader}/TestCsvReaderWithCallback.java (97%)
 rename ebean-csv-reader/src/test/java/io/{ebeaninternal/server/text/csv => ebean/csv/reader}/TimeStringParserTest.java (94%)

diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java
index b9558fd3c..f20bcb740 100644
--- a/ebean-api/src/main/java/io/ebean/DB.java
+++ b/ebean-api/src/main/java/io/ebean/DB.java
@@ -5,7 +5,6 @@ import io.avaje.lang.Nullable;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
-import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 
 import javax.persistence.OptimisticLockException;
diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java
index 47df2b9fb..6dd0ab3cf 100644
--- a/ebean-api/src/main/java/io/ebean/Database.java
+++ b/ebean-api/src/main/java/io/ebean/Database.java
@@ -9,7 +9,6 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
-import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 
 import javax.persistence.OptimisticLockException;
diff --git a/ebean-api/src/main/java/io/ebean/text/csv/CsvReader.java b/ebean-api/src/main/java/io/ebean/text/csv/CsvReader.java
deleted file mode 100644
index b20232fc0..000000000
--- a/ebean-api/src/main/java/io/ebean/text/csv/CsvReader.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package io.ebean.text.csv;
-
-import io.ebean.text.StringParser;
-
-import java.io.Reader;
-import java.util.Locale;
-
-/**
- * Reads CSV data turning it into object graphs that you can be saved (inserted)
- * or processed yourself.
- * <p>
- * This first example doesn't use a {@link CsvCallback} and this means it will
- * automatically create a transaction, save the customers and commit the
- * transaction when successful.
- * </p>
- *
- * <pre>{@code
- * try {
- *   File f = new File("src/test/resources/test1.csv");
- *
- *   FileReader reader = new FileReader(f, encoding);
- *
- *   CsvReader<Customer> csvReader = DB.createCsvReader(Customer.class);
- *
- *   csvReader.setPersistBatchSize(20);
- *
- *   csvReader.addProperty("status");
- *   // ignore the next property
- *   csvReader.addIgnore();
- *   csvReader.addProperty("name");
- *   csvReader.addDateTime("anniversary", "dd-MMM-yyyy");
- *   csvReader.addProperty("billingAddress.line1");
- *   csvReader.addProperty("billingAddress.city");
- *
- *   csvReader.process(reader);
- *
- * } catch (Exception e) {
- *   throw new RuntimeException(e);
- * }
- * }</pre>
- *
- * @param <T> the entity bean type
- */
-public interface CsvReader<T> {
-
-  /**
-   * Explicitly set the default Locale.
-   */
-  void setDefaultLocale(Locale defaultLocale);
-
-  /**
-   * Set the default format to use for Time types.
-   */
-  void setDefaultTimeFormat(String defaultTimeFormat);
-
-  /**
-   * Set the default format to use for Date types.
-   */
-  void setDefaultDateFormat(String defaultDateFormat);
-
-  /**
-   * Set the default format to use for Timestamp types.
-   */
-  void setDefaultTimestampFormat(String defaultTimestampFormat);
-
-  /**
-   * Set the batch size for using JDBC statement batching.
-   * <p>
-   * By default this is set to 20 and setting this to 1 will disable the use of
-   * JDBC statement batching.
-   * </p>
-   */
-  void setPersistBatchSize(int persistBatchSize);
-
-  /**
-   * Set to true if there is a header row that should be ignored.
-   * <p>
-   * If addPropertiesFromHeader is true then all the properties are added using
-   * the default time,date and timestamp formats.
-   * <p>
-   * If you have a mix of dateTime formats you can not use this method and must
-   * add the properties yourself.
-   * </p>
-   */
-  void setHasHeader(boolean hasHeader, boolean addPropertiesFromHeader);
-
-  /**
-   * Same as setHasHeader(true,true);
-   * <p>
-   * This will use a header to define all the properties to load using the
-   * default formats for time, date and datetime types.
-   * </p>
-   */
-  void setAddPropertiesFromHeader();
-
-  /**
-   * Same as setHasHeader(true, false);
-   * <p>
-   * This indicates that there is a header but that it should be ignored.
-   * </p>
-   */
-  void setIgnoreHeader();
-
-  /**
-   * Set the frequency with which a INFO message will be logged showing the
-   * progress of the processing. You might set this to 1000 or 10000 etc.
-   * <p>
-   * If this is not set then no INFO messages will be logged.
-   * </p>
-   */
-  void setLogInfoFrequency(int logInfoFrequency);
-
-  /**
-   * Ignore the next column of data.
-   */
-  void addIgnore();
-
-  /**
-   * Define the property which will be loaded from the next column of data.
-   * <p>
-   * This takes into account the data type of the property and handles the
-   * String to object conversion automatically.
-   * </p>
-   */
-  void addProperty(String propertyName);
-
-  /**
-   * Define the next property and use a custom StringParser to convert the
-   * string content into the appropriate type for the property.
-   */
-  void addProperty(String propertyName, StringParser parser);
-
-  /**
-   * Add a property with a custom Date/Time/Timestamp format using the default
-   * Locale. This will convert the string into the appropriate java type for the
-   * given property (Date, Calendar, SQL Date, Time, Timestamp, JODA etc).
-   */
-  void addDateTime(String propertyName, String dateTimeFormat);
-
-  /**
-   * Add a property with a custom Date/Time/Timestamp format. This will convert
-   * the string into the appropriate java type for the given property (Date,
-   * Calendar, SQL Date, Time, Timestamp, JODA etc).
-   */
-  void addDateTime(String propertyName, String dateTimeFormat, Locale locale);
-
-  /**
-   * Automatically create a transaction if required to process all the CSV
-   * content from the reader.
-   * <p>
-   * This will check for a current transaction. If there is no current
-   * transaction then one is started and will commit (or rollback) at the end of
-   * processing. This will also set the persistBatchSize on the transaction.
-   * </p>
-   */
-  void process(Reader reader) throws Exception;
-
-  /**
-   * Process the CSV content passing the bean to the CsvCallback after each row.
-   * <p>
-   * This provides you with the ability to modify and process the bean.
-   * </p>
-   * <p>
-   * When using a CsvCallback the reader WILL NOT create a transaction or save
-   * the bean(s) for you. If you want to insert the processed beans you must
-   * create your own transaction and save the bean(s) yourself.
-   * </p>
-   */
-  void process(Reader reader, CsvCallback<T> callback) throws Exception;
-
-}
diff --git a/ebean-api/src/main/java/io/ebean/text/csv/package-info.java b/ebean-api/src/main/java/io/ebean/text/csv/package-info.java
deleted file mode 100644
index a14c9b1df..000000000
--- a/ebean-api/src/main/java/io/ebean/text/csv/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * CSV processing objects.
- */
-package io.ebean.text.csv;
diff --git a/ebean-api/src/main/java/module-info.java b/ebean-api/src/main/java/module-info.java
index e5128fb5f..a8fb4ea38 100644
--- a/ebean-api/src/main/java/module-info.java
+++ b/ebean-api/src/main/java/module-info.java
@@ -40,7 +40,6 @@ module io.ebean.api {
   exports io.ebean.service;
   exports io.ebean.text;
   exports io.ebean.text.json;
-  exports io.ebean.text.csv;
   exports io.ebean.util;
 
 }
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 e9af6750c..133fadef6 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
@@ -21,7 +21,6 @@ import io.ebean.plugin.BeanType;
 import io.ebean.plugin.Plugin;
 import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
-import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 import io.ebeaninternal.api.*;
 import io.ebeaninternal.api.SpiQuery.Type;
diff --git a/ebean-api/src/main/java/io/ebean/text/csv/CsvCallback.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvCallback.java
similarity index 98%
rename from ebean-api/src/main/java/io/ebean/text/csv/CsvCallback.java
rename to ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvCallback.java
index a3a501268..999e0fc75 100644
--- a/ebean-api/src/main/java/io/ebean/text/csv/CsvCallback.java
+++ b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvCallback.java
@@ -1,4 +1,4 @@
-package io.ebean.text.csv;
+package io.ebean.csv.reader;
 
 import io.ebean.Database;
 
diff --git a/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java
similarity index 96%
rename from ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
rename to ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java
index 9d144067c..1e40db770 100644
--- a/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java
+++ b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.csv;
+package io.ebean.csv.reader;
 
 import io.ebean.Database;
 import io.ebean.bean.EntityBean;
@@ -6,9 +6,6 @@ import io.ebean.plugin.BeanType;
 import io.ebean.plugin.ExpressionPath;
 import io.ebean.text.StringParser;
 import io.ebean.text.TextException;
-import io.ebean.text.csv.CsvCallback;
-import io.ebean.text.csv.CsvReader;
-import io.ebean.text.csv.DefaultCsvCallback;
 
 import java.io.Reader;
 import java.sql.Types;
@@ -24,7 +21,7 @@ import java.util.Locale;
 /**
  * Implementation of the CsvReader
  */
-public class TCsvReader<T> {//implements CsvReader<T> {
+public class CsvReader<T> {
 
   private static final TimeStringParser TIME_PARSER = new TimeStringParser();
 
@@ -52,9 +49,9 @@ public class TCsvReader<T> {//implements CsvReader<T> {
 
   private boolean addPropertiesFromHeader;
 
-  public TCsvReader(Database server, BeanType<T> descriptor) {
+  public CsvReader(Database server, Class<T> type) {
     this.server = server;
-    this.descriptor = descriptor;
+    this.descriptor = server.pluginApi().beanType(type);
   }
 
   ////@Override
@@ -229,7 +226,6 @@ public class TCsvReader<T> {//implements CsvReader<T> {
   private void addPropertiesFromHeader(String[] line) {
     for (String aLine : line) {
       ExpressionPath elProp = descriptor.expressionPath(aLine);
-      //ElPropertyValue elProp = descriptor.elGetValue(aLine);
       if (elProp == null) {
         throw new TextException("Property [" + aLine + "] not found");
       }
diff --git a/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvUtilReader.java
similarity index 99%
rename from ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
rename to ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvUtilReader.java
index 9b7ab4127..999b23908 100644
--- a/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/CsvUtilReader.java
+++ b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvUtilReader.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.csv;
+package io.ebean.csv.reader;
 
 // Original name: au.com.bytecode.opencsv.CSVReader
 // rbygrave: Made some Java Generics tweaks to remove warnings
diff --git a/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/DefaultCsvCallback.java
similarity index 99%
rename from ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
rename to ebean-csv-reader/src/main/java/io/ebean/csv/reader/DefaultCsvCallback.java
index 57ec73388..5bbba8dfd 100644
--- a/ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java
+++ b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/DefaultCsvCallback.java
@@ -1,4 +1,4 @@
-package io.ebean.text.csv;
+package io.ebean.csv.reader;
 
 import io.ebean.Database;
 import io.ebean.EbeanVersion;
diff --git a/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TimeStringParser.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/TimeStringParser.java
similarity index 97%
rename from ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TimeStringParser.java
rename to ebean-csv-reader/src/main/java/io/ebean/csv/reader/TimeStringParser.java
index 9cdef79de..ed2dc7964 100644
--- a/ebean-csv-reader/src/main/java/io/ebeaninternal/server/text/csv/TimeStringParser.java
+++ b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/TimeStringParser.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.csv;
+package io.ebean.csv.reader;
 
 import io.ebean.text.StringParser;
 
diff --git a/ebean-csv-reader/src/main/java/module-info.java b/ebean-csv-reader/src/main/java/module-info.java
new file mode 100644
index 000000000..51ea42195
--- /dev/null
+++ b/ebean-csv-reader/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module io.ebean.csv.reader {
+
+  requires io.ebean.api;
+
+  exports io.ebean.csv.reader;
+}
diff --git a/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReader.java b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java
similarity index 82%
rename from ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReader.java
rename to ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java
index bf9fb44ad..642f453c0 100644
--- a/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReader.java
+++ b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java
@@ -1,8 +1,7 @@
-package io.ebeaninternal.server.text.csv;
+package io.ebean.csv.reader;
 
 import io.ebean.DB;
 import io.ebean.Database;
-import io.ebean.plugin.BeanType;
 import io.ebean.util.IOUtils;
 import org.example.Country;
 import org.example.Customer;
@@ -12,7 +11,7 @@ import java.io.Reader;
 import java.net.URL;
 import java.util.Locale;
 
-class TestCsvReader {
+class CsvReaderTest {
 
   @Test
   void test() throws Exception {
@@ -29,8 +28,7 @@ class TestCsvReader {
     try (Reader reader = IOUtils.newReader(resource.openStream())) {
 
       Database database = DB.getDefault();
-      BeanType<Customer> type = database.pluginApi().beanType(Customer.class);
-      TCsvReader<Customer> csvReader = new TCsvReader<>(database, type);
+      CsvReader<Customer> csvReader = new CsvReader<>(database, Customer.class);
       //CsvReader<Customer> csvReader = DB.getDefault().createCsvReader(Customer.class);
 
       csvReader.setPersistBatchSize(2);
diff --git a/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReaderWithCallback.java b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TestCsvReaderWithCallback.java
similarity index 97%
rename from ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReaderWithCallback.java
rename to ebean-csv-reader/src/test/java/io/ebean/csv/reader/TestCsvReaderWithCallback.java
index 77c9e4119..6066a62e3 100644
--- a/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TestCsvReaderWithCallback.java
+++ b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TestCsvReaderWithCallback.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.csv;
+package io.ebean.csv.reader;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TimeStringParserTest.java b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TimeStringParserTest.java
similarity index 94%
rename from ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TimeStringParserTest.java
rename to ebean-csv-reader/src/test/java/io/ebean/csv/reader/TimeStringParserTest.java
index 550ba8034..bff00c0b4 100644
--- a/ebean-csv-reader/src/test/java/io/ebeaninternal/server/text/csv/TimeStringParserTest.java
+++ b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/TimeStringParserTest.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.csv;
+package io.ebean.csv.reader;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
index d4b1eaecf..124b04a9d 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
@@ -15,7 +15,6 @@ import io.ebean.meta.MetaInfoManager;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
-import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 import io.ebeaninternal.api.*;
 import io.ebeaninternal.api.SpiQuery.Type;
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
index a69f25bd7..3fa7f84b8 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java
@@ -13,7 +13,6 @@ import io.ebean.meta.MetaInfoManager;
 import io.ebean.plugin.BeanType;
 import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
-import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 
 import javax.annotation.Nullable;

From efe80a534c95bdeb70b6f931452b6df42d13351e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 22:09:38 +1200
Subject: [PATCH 042/127] Extract CsvReader - remove built in date, time,
 dateTime parsing - use StringParser instead

Just always use our own StringParser lambda function instead for parsing date, time and dateTime types.
---
 .../java/io/ebean/text/StringFormatter.java   |   1 +
 .../main/java/io/ebean/text/StringParser.java |   1 +
 ebean-csv-reader/pom.xml                      |   2 +
 .../java/io/ebean/csv/reader/CsvReader.java   | 144 +-----------------
 .../io/ebean/csv/reader/CsvReaderTest.java    |  12 +-
 5 files changed, 17 insertions(+), 143 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/text/StringFormatter.java b/ebean-api/src/main/java/io/ebean/text/StringFormatter.java
index a7aa2631b..613e97129 100644
--- a/ebean-api/src/main/java/io/ebean/text/StringFormatter.java
+++ b/ebean-api/src/main/java/io/ebean/text/StringFormatter.java
@@ -6,6 +6,7 @@ package io.ebean.text;
  * Basic interface to support CSV, JSON and XML processing.
  * </p>
  */
+@FunctionalInterface
 public interface StringFormatter {
 
   /**
diff --git a/ebean-api/src/main/java/io/ebean/text/StringParser.java b/ebean-api/src/main/java/io/ebean/text/StringParser.java
index f76421944..4fe51abe8 100644
--- a/ebean-api/src/main/java/io/ebean/text/StringParser.java
+++ b/ebean-api/src/main/java/io/ebean/text/StringParser.java
@@ -5,6 +5,7 @@ package io.ebean.text;
  * <p>
  * Basic interface to support CSV, JSON and XML processing.
  */
+@FunctionalInterface
 public interface StringParser {
 
   /**
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index 147b10ea9..d9f69a67c 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -23,12 +23,14 @@
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
       <version>13.8.2-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
       <version>13.8.2-SNAPSHOT</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
diff --git a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java
index 1e40db770..98193e197 100644
--- a/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java
+++ b/ebean-csv-reader/src/main/java/io/ebean/csv/reader/CsvReader.java
@@ -8,23 +8,15 @@ import io.ebean.text.StringParser;
 import io.ebean.text.TextException;
 
 import java.io.Reader;
-import java.sql.Types;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 /**
  * Implementation of the CsvReader
  */
 public class CsvReader<T> {
 
-  private static final TimeStringParser TIME_PARSER = new TimeStringParser();
-
   private final Database server;
 
   private final BeanType<T> descriptor;
@@ -37,11 +29,6 @@ public class CsvReader<T> {
 
   private int logInfoFrequency = 1000;
 
-  private String defaultTimeFormat = "HH:mm:ss";
-  private String defaultDateFormat = "yyyy-MM-dd";
-  private String defaultTimestampFormat = "yyyy-MM-dd hh:mm:ss.fffffffff";
-  private Locale defaultLocale = Locale.getDefault();
-
   /**
    * The batch size used for JDBC statement batching.
    */
@@ -54,102 +41,37 @@ public class CsvReader<T> {
     this.descriptor = server.pluginApi().beanType(type);
   }
 
-  ////@Override
-  public void setDefaultLocale(Locale defaultLocale) {
-    this.defaultLocale = defaultLocale;
-  }
-
-  ////@Override
-  public void setDefaultTimeFormat(String defaultTimeFormat) {
-    this.defaultTimeFormat = defaultTimeFormat;
-  }
-
-  ////@Override
-  public void setDefaultDateFormat(String defaultDateFormat) {
-    this.defaultDateFormat = defaultDateFormat;
-  }
-
-  ////@Override
-  public void setDefaultTimestampFormat(String defaultTimestampFormat) {
-    this.defaultTimestampFormat = defaultTimestampFormat;
-  }
-
-  ////@Override
   public void setPersistBatchSize(int persistBatchSize) {
     this.persistBatchSize = persistBatchSize;
   }
 
-  ////@Override
   public void setIgnoreHeader() {
     setHasHeader(true, false);
   }
 
-  ////@Override
   public void setAddPropertiesFromHeader() {
     setHasHeader(true, true);
   }
 
-  //@Override
   public void setHasHeader(boolean hasHeader, boolean addPropertiesFromHeader) {
     this.hasHeader = hasHeader;
     this.addPropertiesFromHeader = addPropertiesFromHeader;
   }
 
-  //@Override
   public void setLogInfoFrequency(int logInfoFrequency) {
     this.logInfoFrequency = logInfoFrequency;
   }
 
-  //@Override
   public void addIgnore() {
     columnList.add(ignoreColumn);
   }
 
-  //@Override
   public void addProperty(String propertyName) {
     addProperty(propertyName, null);
   }
 
-  //@Override
-  public void addDateTime(String propertyName, String dateTimeFormat) {
-    addDateTime(propertyName, dateTimeFormat, Locale.getDefault());
-  }
 
-  //@Override
-  public void addDateTime(String propertyName, String dateTimeFormat, Locale locale) {
-    ExpressionPath elProp = descriptor.expressionPath(propertyName);
-    if (dateTimeFormat == null) {
-      dateTimeFormat = getDefaultDateTimeFormat(elProp.jdbcType());
-    }
-
-    if (locale == null) {
-      locale = defaultLocale;
-    }
-
-    SimpleDateFormat sdf = new SimpleDateFormat(dateTimeFormat, locale);
-    DateTimeParser parser = new DateTimeParser(sdf, dateTimeFormat, elProp);
-
-    CsvColumn column = new CsvColumn(elProp, parser);
-    columnList.add(column);
-  }
-
-  private String getDefaultDateTimeFormat(int jdbcType) {
-    switch (jdbcType) {
-      case Types.TIME:
-        return defaultTimeFormat;
-      case Types.DATE:
-        return defaultDateFormat;
-      case Types.TIMESTAMP:
-        return defaultTimestampFormat;
-
-      default:
-        throw new RuntimeException("Expected java.sql.Types TIME,DATE or TIMESTAMP but got [" + jdbcType + "]");
-    }
-  }
-
-  //@Override
   public void addProperty(String propertyName, StringParser parser) {
-
     ExpressionPath elProp = descriptor.expressionPath(propertyName);
     if (parser == null) {
       parser = elProp.stringParser();
@@ -158,15 +80,12 @@ public class CsvReader<T> {
     columnList.add(column);
   }
 
-  //@Override
   public void process(Reader reader) throws Exception {
     DefaultCsvCallback<T> callback = new DefaultCsvCallback<>(persistBatchSize, logInfoFrequency);
     process(reader, callback);
   }
 
-  //@Override
   public void process(Reader reader, CsvCallback<T> callback) throws Exception {
-
     if (reader == null) {
       throw new NullPointerException("reader is null?");
     }
@@ -224,43 +143,22 @@ public class CsvReader<T> {
   }
 
   private void addPropertiesFromHeader(String[] line) {
-    for (String aLine : line) {
-      ExpressionPath elProp = descriptor.expressionPath(aLine);
+    for (String headerElement : line) {
+      ExpressionPath elProp = descriptor.expressionPath(headerElement);
       if (elProp == null) {
-        throw new TextException("Property [" + aLine + "] not found");
-      }
-
-      if (Types.TIME == elProp.jdbcType()) {
-        addProperty(aLine, TIME_PARSER);
-
-      } else if (isDateTimeType(elProp.jdbcType())) {
-        addDateTime(aLine, null, null);
-
-//      } else if (elProp.isAssocProperty()) {
-//        BeanPropertyAssocOne<?> assocOne = (BeanPropertyAssocOne<?>) elProp.beanProperty();
-//        String idProp = assocOne.descriptor().idBinder().getIdProperty();
-//        addProperty(aLine + "." + idProp);
-      } else {
-        addProperty(aLine);
+        throw new TextException("Property [" + headerElement + "] not found");
       }
+      addProperty(headerElement);
     }
   }
 
-  private boolean isDateTimeType(int t) {
-    return t == Types.TIMESTAMP || t == Types.DATE || t == Types.TIME;
-  }
-
-  @SuppressWarnings("unchecked")
   protected T buildBeanFromLineContent(int row, String[] line) {
-
     try {
       T bean = descriptor.createBean();
-      EntityBean entityBean = (EntityBean)bean;
-
+      EntityBean entityBean = (EntityBean) bean;
       for (int columnPos = 0; columnPos < line.length; columnPos++) {
         convertAndSetColumn(columnPos, line[columnPos], entityBean);
       }
-
       return bean;
 
     } catch (RuntimeException e) {
@@ -270,13 +168,10 @@ public class CsvReader<T> {
   }
 
   protected void convertAndSetColumn(int columnPos, String strValue, EntityBean bean) {
-
     strValue = strValue.trim();
-
     if (strValue.isEmpty()) {
       return;
     }
-
     CsvColumn c = columnList.get(columnPos);
     c.convertAndSet(strValue, bean);
   }
@@ -309,7 +204,6 @@ public class CsvReader<T> {
      * Convert the string to the appropriate value and set it to the bean.
      */
     public void convertAndSet(String strValue, EntityBean bean) {
-
       if (parser != null && path != null) {
         Object value = parser.parse(strValue);
         path.pathSet(bean, value);
@@ -317,32 +211,4 @@ public class CsvReader<T> {
     }
   }
 
-  /**
-   * A StringParser for converting custom date/time/datetime strings into
-   * appropriate java types (Date, Calendar, SQL Date, Time, Timestamp, JODA
-   * etc).
-   */
-  private static class DateTimeParser implements StringParser {
-
-    private final DateFormat dateFormat;
-    private final ExpressionPath path;
-    private final String format;
-
-    DateTimeParser(DateFormat dateFormat, String format, ExpressionPath path) {
-      this.dateFormat = dateFormat;
-      this.path = path;
-      this.format = format;
-    }
-
-    //@Override
-    public Object parse(String value) {
-      try {
-        Date dt = dateFormat.parse(value);
-        return path.parseDateTime(dt.getTime());
-      } catch (ParseException e) {
-        throw new TextException("Error parsing [{}] using format[" + format + "]", value, e);
-      }
-    }
-
-  }
 }
diff --git a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java
index 642f453c0..8a871a62d 100644
--- a/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java
+++ b/ebean-csv-reader/src/test/java/io/ebean/csv/reader/CsvReaderTest.java
@@ -9,10 +9,13 @@ import org.junit.jupiter.api.Test;
 
 import java.io.Reader;
 import java.net.URL;
-import java.util.Locale;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 class CsvReaderTest {
 
+  final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("dd-MMM-yyyy");
+
   @Test
   void test() throws Exception {
 
@@ -29,15 +32,16 @@ class CsvReaderTest {
 
       Database database = DB.getDefault();
       CsvReader<Customer> csvReader = new CsvReader<>(database, Customer.class);
-      //CsvReader<Customer> csvReader = DB.getDefault().createCsvReader(Customer.class);
 
       csvReader.setPersistBatchSize(2);
 
       csvReader.addIgnore();
-      // csvReader.addProperty("id");
       csvReader.addProperty("status");
       csvReader.addProperty("name");
-      csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH);
+
+      // supplier a StringParser for custom date, time, dateTime formats
+      csvReader.addProperty("anniversary", (String content) -> LocalDate.parse(content, dateFormatter));
+      // OLD WAY: csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH);
       csvReader.addProperty("billingAddress.line1");
       csvReader.addProperty("billingAddress.city");
       csvReader.addProperty("billingAddress.country.code");

From ccf790a630d463c8de1bbe79a267037a77f4965c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 22:15:15 +1200
Subject: [PATCH 043/127] Extract CsvReader - provider scope for ebean-core

---
 ebean-csv-reader/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index d9f69a67c..8b1f0e33a 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -30,7 +30,7 @@
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
       <version>13.8.2-SNAPSHOT</version>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>

From f01d8174e81e4d54693293923b1f7ce6d7648a24 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 22:17:20 +1200
Subject: [PATCH 044/127] Extract CsvReader - fix parent pom version

---
 ebean-csv-reader/pom.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index 8b1f0e33a..769c4e592 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -2,21 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.1-SNAPSHOT</version>
+    <version>13.8.2-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean-csv-reader</artifactId>
 
-  <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
   <dependencies>
 
     <dependency>

From c5e8b217e3bd11b6c4bed5b44742784735549e6b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 25 Aug 2022 22:37:47 +1200
Subject: [PATCH 045/127] Refactor ScalarType, remove convertFromMillis()
 method (no longer needed)

Due to the move and change of CsvReader using StringParser ScalarType no longer
needs that general convertFromMillis() method. Note that date and dateTime ScalarTypes
still retain this conversion method.
---
 .../src/main/java/io/ebean/plugin/ExpressionPath.java  |  6 ------
 .../src/main/java/io/ebean/core/type/ScalarType.java   |  9 ---------
 .../ebeaninternal/server/deploy/BeanFkeyProperty.java  |  5 -----
 .../io/ebeaninternal/server/deploy/BeanProperty.java   |  5 -----
 .../io/ebeaninternal/server/el/ElPropertyChain.java    |  5 -----
 .../ebeaninternal/server/type/ScalarTypeBaseDate.java  |  1 -
 .../server/type/ScalarTypeBaseDateTime.java            |  1 -
 .../server/type/ScalarTypeBigDecimal.java              |  5 -----
 .../server/type/ScalarTypeBytesEncrypted.java          |  5 -----
 .../io/ebeaninternal/server/type/ScalarTypeDouble.java |  5 -----
 .../server/type/ScalarTypeEncryptedWrapper.java        |  5 -----
 .../io/ebeaninternal/server/type/ScalarTypeFloat.java  |  5 -----
 .../ebeaninternal/server/type/ScalarTypeInteger.java   |  6 ------
 .../server/type/ScalarTypeJodaLocalTime.java           |  1 -
 .../ebeaninternal/server/type/ScalarTypeLocalTime.java |  5 -----
 .../io/ebeaninternal/server/type/ScalarTypeLong.java   |  5 -----
 .../server/type/ScalarTypeMathBigInteger.java          |  5 -----
 .../server/type/ScalarTypeStringBase.java              |  5 -----
 .../io/ebeaninternal/server/type/ScalarTypeTime.java   |  1 -
 .../ebeaninternal/server/type/ScalarTypeWrapper.java   |  9 ---------
 .../server/type/ScalarTypeDurationTest.java            |  5 -----
 .../server/type/ScalarTypeDurationWithNanosTest.java   |  5 -----
 .../server/type/ScalarTypeLocalTimeTest.java           |  9 ++-------
 .../server/type/ScalarTypeLocalTimeWithNanosTest.java  |  9 ++-------
 .../server/type/ScalarTypeMonthDayTest.java            |  6 ------
 .../server/type/ScalarTypePostgresHstoreTest.java      | 10 ----------
 .../ebeaninternal/server/type/ScalarTypeYearTest.java  |  5 -----
 27 files changed, 4 insertions(+), 139 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java
index 4b935474f..975349700 100644
--- a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java
+++ b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java
@@ -39,12 +39,6 @@ public interface ExpressionPath {
    */
   StringParser stringParser();
 
-  /**
-   * For DateTime capable scalar types convert the long systemTimeMillis into
-   * an appropriate java time (Date,Timestamp,Time,Calendar, JODA type etc).
-   */
-  Object parseDateTime(long systemTimeMillis);
-
   /**
    * Return the underlying JDBC type or 0 if this is not a scalar type.
    */
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
index 83433ef69..9047befb0 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java
@@ -166,15 +166,6 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * Convert the systemTimeMillis into the appropriate java object.
-   * <p>
-   * For non dateTime types this will throw an exception.
-   */
-  default T convertFromMillis(long dateTime) {
-    throw new UnsupportedOperationException();
-  }
-
   /**
    * Read the value from binary input.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
index fb02fdc74..01cd82de6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java
@@ -190,11 +190,6 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     return null;
   }
 
-  @Override
-  public Object parseDateTime(long systemTimeMillis) {
-    throw new RuntimeException("ElPropertyDeploy only - not implemented");
-  }
-
   @Override
   public StringParser stringParser() {
     throw new RuntimeException("ElPropertyDeploy only - not implemented");
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 4c38bc110..1fc421739 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -945,11 +945,6 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return scalarType == null ? 0 : scalarType.jdbcType();
   }
 
-  @Override
-  public Object parseDateTime(long systemTimeMillis) {
-    return scalarType.convertFromMillis(systemTimeMillis);
-  }
-
   /**
    * Return the DB max length (varchar) or precision (decimal).
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
index 3a9631737..b04bacb24 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java
@@ -232,11 +232,6 @@ public final class ElPropertyChain implements ElPropertyValue {
     return scalarType == null ? 0 : scalarType.jdbcType();
   }
 
-  @Override
-  public Object parseDateTime(long systemTimeMillis) {
-    return scalarType.convertFromMillis(systemTimeMillis);
-  }
-
   @Override
   public StringParser stringParser() {
     return scalarType;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
index b70386214..2928c7955 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
@@ -77,7 +77,6 @@ abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
     }
   }
 
-  @Override
   public T convertFromMillis(long systemTimeMillis) {
     Date ts = new Date(systemTimeMillis);
     return convertFromDate(ts);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
index 5c328dd39..c77dca488 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
@@ -54,7 +54,6 @@ abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
   /**
    * Convert from epoch millis to the value.
    */
-  @Override
   public abstract T convertFromMillis(long systemTimeMillis);
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index 4d6d0958d..9dedf97e7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -58,11 +58,6 @@ class ScalarTypeBigDecimal extends ScalarTypeBase<BigDecimal> {
     return new BigDecimal(value);
   }
 
-  @Override
-  public BigDecimal convertFromMillis(long systemTimeMillis) {
-    return BigDecimal.valueOf(systemTimeMillis);
-  }
-
   @Override
   public BigDecimal readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
index 118078b41..3fdc0f5b2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
@@ -84,11 +84,6 @@ public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
     return baseType.parse(value);
   }
 
-  @Override
-  public byte[] convertFromMillis(long systemTimeMillis) {
-    return baseType.convertFromMillis(systemTimeMillis);
-  }
-
   @Override
   public byte[] read(DataReader reader) throws SQLException {
     byte[] data = baseType.read(reader);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
index 221b029a8..97cd742dd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -57,11 +57,6 @@ final class ScalarTypeDouble extends ScalarTypeBase<Double> {
     return Double.valueOf(value);
   }
 
-  @Override
-  public Double convertFromMillis(long systemTimeMillis) {
-    return (double) systemTimeMillis;
-  }
-
   @Override
   public Double readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index 6f04227af..627d32a65 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -109,11 +109,6 @@ public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, Local
     return wrapped.parse(value);
   }
 
-  @Override
-  public T convertFromMillis(long systemTimeMillis) {
-    return wrapped.convertFromMillis(systemTimeMillis);
-  }
-
   @Override
   public T toBeanType(Object value) {
     return wrapped.toBeanType(value);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
index 8534d92ba..61ba766f0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -57,11 +57,6 @@ final class ScalarTypeFloat extends ScalarTypeBase<Float> {
     return Float.valueOf(value);
   }
 
-  @Override
-  public Float convertFromMillis(long systemTimeMillis) {
-    return (float) systemTimeMillis;
-  }
-
   @Override
   public Float readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index 9805454e0..b9d621679 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -6,7 +6,6 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebean.text.TextException;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
@@ -87,11 +86,6 @@ final class ScalarTypeInteger extends ScalarTypeBase<Integer> {
     return Integer.valueOf(value);
   }
 
-  @Override
-  public Integer convertFromMillis(long systemTimeMillis) {
-    throw new TextException("Not Supported");
-  }
-
   @Override
   public Integer jsonRead(JsonParser parser) throws IOException {
     return parser.getIntValue();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
index 7bc388aa9..94134db9f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
@@ -73,7 +73,6 @@ class ScalarTypeJodaLocalTime extends ScalarTypeBase<LocalTime> {
     return new LocalTime(value);
   }
 
-  @Override
   public LocalTime convertFromMillis(long systemTimeMillis) {
     return new LocalTime(systemTimeMillis, DateTimeZone.getDefault());
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
index b223a8268..6711de132 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
@@ -87,11 +87,6 @@ class ScalarTypeLocalTime extends ScalarTypeBase<LocalTime> {
     return LocalTime.parse(value);
   }
 
-  @Override
-  public LocalTime convertFromMillis(long systemTimeMillis) {
-    throw new TextException("Not Supported");
-  }
-
   @Override
   public LocalTime jsonRead(JsonParser parser) throws IOException {
     return LocalTime.parse(parser.getValueAsString());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
index 9164cd1ed..daff9db26 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
@@ -67,11 +67,6 @@ final class ScalarTypeLong extends ScalarTypeBase<Long> {
     return value;
   }
 
-  @Override
-  public Long convertFromMillis(long systemTimeMillis) {
-    return systemTimeMillis;
-  }
-
   @Override
   public Long readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index 97de16c82..ce8a87dbe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -62,11 +62,6 @@ final class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
     return new BigInteger(value);
   }
 
-  @Override
-  public BigInteger convertFromMillis(long systemTimeMillis) {
-    return BigInteger.valueOf(systemTimeMillis);
-  }
-
   @Override
   public BigInteger readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
index 1d863270f..6fffec61e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
@@ -57,11 +57,6 @@ abstract class ScalarTypeStringBase extends ScalarTypeBase<String> {
     return value;
   }
 
-  @Override
-  public String convertFromMillis(long systemTimeMillis) {
-    return String.valueOf(systemTimeMillis);
-  }
-
   @Override
   public String readData(DataInput dataInput) throws IOException {
     if (!dataInput.readBoolean()) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
index dd13a85bb..eb017211d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
@@ -58,7 +58,6 @@ final class ScalarTypeTime extends ScalarTypeBase<Time> {
     return Time.valueOf(value);
   }
 
-  @Override
   public Time convertFromMillis(long systemTimeMillis) {
     return new Time(systemTimeMillis);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
index ee707e1c2..0df64102b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -119,15 +119,6 @@ public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
     return converter.wrapValue(sv);
   }
 
-  @Override
-  public B convertFromMillis(long systemTimeMillis) {
-    S sv = scalarType.convertFromMillis(systemTimeMillis);
-    if (sv == null) {
-      return nullValue;
-    }
-    return converter.wrapValue(sv);
-  }
-
   @Override
   public B read(DataReader reader) throws SQLException {
     S sv = scalarType.read(reader);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java
index 99c1606c2..88e317c48 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java
@@ -75,11 +75,6 @@ class ScalarTypeDurationTest {
     assertEquals(Duration.ofSeconds(1234), duration);
   }
 
-  @Test
-  void testConvertFromMillis() {
-    assertThrows(UnsupportedOperationException.class, () -> type.convertFromMillis(1000));
-  }
-
   @Test
   void testJsonRead() throws Exception {
     Duration duration = Duration.ofSeconds(1234);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
index 205dac263..2bbb4b6b8 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
@@ -75,11 +75,6 @@ class ScalarTypeDurationWithNanosTest {
     assertEquals(duration, val1);
   }
 
-  @Test
-  void testConvertFromMillis() {
-    assertThrows(UnsupportedOperationException.class, () -> type.convertFromMillis(1000));
-  }
-
   @Test
   void testJsonRead() throws Exception {
     Duration duration = Duration.ofSeconds(323, 1500000);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java
index 4bc5c3f63..cc04dc9ed 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.text.TextException;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
@@ -10,7 +9,8 @@ import java.io.ObjectOutputStream;
 import java.sql.Time;
 import java.time.LocalTime;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class ScalarTypeLocalTimeTest {
 
@@ -77,11 +77,6 @@ public class ScalarTypeLocalTimeTest {
     assertEquals(localTime, val1);
   }
 
-  @Test
-  public void testConvertFromMillis() {
-    assertThrows(TextException.class, () -> type.convertFromMillis(1234));
-  }
-
   @Test
   public void testJsonRead() throws Exception {
     LocalTime localTime = LocalTime.of(9, 23, 45);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java
index 36bf79d9f..cfb1fdc6d 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.text.TextException;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
@@ -9,7 +8,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.time.LocalTime;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class ScalarTypeLocalTimeWithNanosTest {
 
@@ -74,11 +74,6 @@ public class ScalarTypeLocalTimeWithNanosTest {
     assertEquals(localTime, val1);
   }
 
-  @Test
-  public void testConvertFromMillis() {
-    assertThrows(TextException.class, () -> type.convertFromMillis(1234));
-  }
-
   @Test
   public void testJsonRead() throws Exception {
     LocalTime localTime = LocalTime.of(9, 23, 45);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java
index 05a1b20aa..ca23dbbc2 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeMonthDayTest.java
@@ -7,7 +7,6 @@ import java.time.LocalDate;
 import java.time.MonthDay;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ScalarTypeMonthDayTest {
 
@@ -49,11 +48,6 @@ public class ScalarTypeMonthDayTest {
     assertEquals(value, monthDay);
   }
 
-  @Test
-  public void testConvertFromMillis() {
-    assertThrows(RuntimeException.class, () -> type.convertFromMillis(1203));
-  }
-
   @Test
   public void testJson() throws Exception {
     MonthDay value = MonthDay.of(4, 29);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
index 4ad2b4e9a..4f2ddd6ab 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java
@@ -45,16 +45,6 @@ public class ScalarTypePostgresHstoreTest {
     assertEquals("rob", map.get("name"));
   }
 
-  @Test
-  @SuppressWarnings("unchecked")
-  public void testParseDateTime() {
-    assertThrows(RuntimeException.class, () -> {
-      Map<String, Object> map = (Map<String, Object>) hstore.convertFromMillis(1234L);
-      assertEquals(1, map.size());
-      assertEquals("rob", map.get("name"));
-    });
-  }
-
   @Test
   public void testJsonWrite() throws Exception {
     Map<String, Object> map = new LinkedHashMap<>();
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java
index ec3252a33..f42090397 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java
@@ -70,11 +70,6 @@ class ScalarTypeYearTest {
     assertEquals(Year.of(2013), year);
   }
 
-  @Test
-  void testConvertFromMillis() {
-    assertThrows(UnsupportedOperationException.class, () -> type.convertFromMillis(1000));
-  }
-
   @Test
   void testJson() throws Exception {
     JsonTester<Year> jsonTester = new JsonTester<>(type);

From 5667f1b118a0fd9c1c467ea8da8c08d056f4980c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 12:20:36 +1200
Subject: [PATCH 046/127] ScalarTypeCharArray - remove unused method
 jsonWrite() with incorrect params

---
 .../io/ebeaninternal/server/type/ScalarTypeCharArray.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
index 869614f9d..28380b48d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
@@ -75,8 +75,4 @@ final class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
   public char[] jsonRead(JsonParser parser) throws IOException {
     return parser.getValueAsString().toCharArray();
   }
-
-  public void jsonWrite(JsonGenerator ctx, String name, char[] value) throws IOException {
-    ctx.writeStringField(name, String.valueOf(value));
-  }
 }

From 13a913428e28c412a2e77005779f2aef556200e9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 12:24:15 +1200
Subject: [PATCH 047/127] DecimalUtils - remove unused methods converting
 between Instance and BigDecimal

---
 .../server/type/DecimalUtils.java             | 10 --------
 .../server/type/DecimalUtilsTest.java         | 23 +++++++------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
index 13ceb73c2..1e75c32a9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
@@ -61,16 +61,6 @@ final class DecimalUtils {
     return new BigDecimal(toDecimal(secs, instant.getNanos()));
   }
 
-  static Instant toInstant(BigDecimal value) {
-    long seconds = value.longValue();
-    int nanoseconds = extractNanosecondDecimal(value, seconds);
-    return Instant.ofEpochSecond(seconds, nanoseconds);
-  }
-
-  static BigDecimal toDecimal(Instant instant) {
-    return new BigDecimal(toDecimal(instant.getEpochSecond(), instant.getNano()));
-  }
-
   static String toDecimal(long seconds, int nanoseconds) {
     StringBuilder string = new StringBuilder(Integer.toString(nanoseconds));
     if (string.length() < 9)
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java
index 7a7d19dd3..7f6d9f98a 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java
@@ -9,29 +9,22 @@ import java.time.Instant;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class DecimalUtilsTest {
+class DecimalUtilsTest {
 
   @Test
-  public void testToDecimal() throws Exception {
-
+  void testToDecimal() {
     Instant now = Instant.now();
-    BigDecimal value = DecimalUtils.toDecimal(now);
+    Timestamp sourceTimestamp = Timestamp.from(now);
 
-    Instant instant = DecimalUtils.toInstant(value);
-    Timestamp timestamp = DecimalUtils.toTimestamp(value);
-    BigDecimal decimal = DecimalUtils.toDecimal(timestamp);
+    BigDecimal decimal = DecimalUtils.toDecimal(sourceTimestamp);
+    Timestamp timestamp = DecimalUtils.toTimestamp(decimal);
 
-    Instant instant1 = timestamp.toInstant();
-
-    assertEquals(instant, instant1);
-    assertEquals(value, decimal);
-    assertEquals(now, instant);
+    assertEquals(now, timestamp.toInstant());
+    assertEquals(sourceTimestamp, timestamp);
   }
 
   @Test
-  public void testDuration() throws Exception {
-
-
+  void testDuration() {
     Duration duration = Duration.ofSeconds(323, 1500000);
 
     BigDecimal bigDecimal = DecimalUtils.toDecimal(duration);

From 5b22506b9bc72ea4c2d0d8db1b1fd741a4bb37da Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 12:28:29 +1200
Subject: [PATCH 048/127] Refactor move ScalarTypeBaseVarchar to
 ebean-core-type module

---
 .../ebean/core}/type/ScalarTypeBaseVarchar.java   | 15 ++++++---------
 .../ebeaninternal/server/type/ScalarTypeChar.java |  1 +
 .../server/type/ScalarTypeCharArray.java          |  2 +-
 .../ebeaninternal/server/type/ScalarTypeCidr.java |  1 +
 .../server/type/ScalarTypeClass.java              |  2 ++
 .../server/type/ScalarTypeCurrency.java           |  2 ++
 .../ebeaninternal/server/type/ScalarTypeInet.java |  1 +
 .../server/type/ScalarTypeInetAddress.java        |  1 +
 .../type/ScalarTypeInetAddressPostgres.java       |  1 +
 .../server/type/ScalarTypeJodaPeriod.java         |  1 +
 .../server/type/ScalarTypeLocale.java             |  2 ++
 .../server/type/ScalarTypeOffsetTime.java         |  2 ++
 .../ebeaninternal/server/type/ScalarTypePath.java |  2 ++
 .../server/type/ScalarTypePeriod.java             |  2 ++
 .../server/type/ScalarTypeTimeZone.java           |  2 ++
 .../ebeaninternal/server/type/ScalarTypeURI.java  |  1 +
 .../ebeaninternal/server/type/ScalarTypeURL.java  |  1 +
 .../server/type/ScalarTypeZoneId.java             |  2 ++
 .../server/type/ScalarTypeZoneOffset.java         |  2 ++
 19 files changed, 33 insertions(+), 10 deletions(-)
 rename {ebean-core/src/main/java/io/ebeaninternal/server => ebean-core-type/src/main/java/io/ebean/core}/type/ScalarTypeBaseVarchar.java (84%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseVarchar.java
similarity index 84%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseVarchar.java
index 71785fb3d..99c83561b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseVarchar.java
@@ -1,11 +1,7 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.DocPropertyType;
-import io.ebean.core.type.ScalarTypeBase;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -17,13 +13,13 @@ import java.sql.Types;
  * Base ScalarType for types which converts to and from a VARCHAR database
  * column.
  */
-abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
+public abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
 
-  ScalarTypeBaseVarchar(Class<T> type) {
+  public ScalarTypeBaseVarchar(Class<T> type) {
     super(type, false, Types.VARCHAR);
   }
 
-  ScalarTypeBaseVarchar(Class<T> type, boolean jdbcNative, int jdbcType) {
+  public ScalarTypeBaseVarchar(Class<T> type, boolean jdbcNative, int jdbcType) {
     super(type, jdbcNative, jdbcType);
   }
 
@@ -102,7 +98,8 @@ abstract class ScalarTypeBaseVarchar<T> extends ScalarTypeBase<T> {
     if (value == null) {
       dataOutput.writeBoolean(false);
     } else {
-      ScalarHelp.writeUTF(dataOutput, convertToDbString(value));
+      dataOutput.writeBoolean(true);
+      dataOutput.writeUTF(convertToDbString(value));
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
index 6be7012b6..c7d9760b7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
index 28380b48d..13a06d931 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
@@ -1,9 +1,9 @@
 package io.ebeaninternal.server.type;
 
-import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.IOException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
index 6c9f18b82..e355c2936 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebean.types.Cidr;
 
 import java.sql.SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
index f5e45a84e..3fae086ec 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
+
 import javax.persistence.PersistenceException;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
index cc2568e43..ad38e6efb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
+
 import java.util.Currency;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
index 122fdcc5a..40f52aca6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebean.types.Inet;
 
 import java.sql.SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
index 613fb7f7c..8d0fefd0a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebean.text.TextException;
 
 import java.net.InetAddress;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
index a4ff9074d..a09e7cfb0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebean.text.TextException;
 
 import java.net.InetAddress;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
index 731e44760..abe0c9da3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
 import org.joda.time.Period;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
index 7eb53e37b..5afed0e38 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
+
 import java.util.Locale;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
index 72702721b..7807e1118 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
+
 import java.time.OffsetTime;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java
index a5e318881..40c1d948d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
index ceb34c865..91d0e074f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
+
 import java.time.Period;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
index cae7d2b08..df4798276 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
+
 import java.util.TimeZone;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
index f7c9bcc81..56d34d534 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebean.text.TextException;
 
 import java.net.URI;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
index c93cd2a38..841de15c2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebean.text.TextException;
 
 import java.net.MalformedURLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
index d1dca2b72..98979a538 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
+
 import java.time.ZoneId;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
index 2b960af74..17cbfdfb8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.ScalarTypeBaseVarchar;
+
 import java.time.ZoneOffset;
 
 /**

From 09e20934d78d9536548513e6f5887c8f1cefbda8 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 12:30:50 +1200
Subject: [PATCH 049/127] Refactor move ScalarTypeBaseDate to ebean-core-type
 module

---
 .../main/java/io/ebean/core}/type/ScalarTypeBaseDate.java   | 6 +++---
 .../java/io/ebeaninternal/server/type/ScalarTypeDate.java   | 3 ++-
 .../server/type/ScalarTypeJodaDateMidnight.java             | 3 ++-
 .../ebeaninternal/server/type/ScalarTypeJodaLocalDate.java  | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeLocalDate.java   | 1 +
 .../io/ebeaninternal/server/type/ScalarTypeUtilDate.java    | 3 ++-
 .../ebeaninternal/server/type/ScalarTypeYearMonthDate.java  | 1 +
 7 files changed, 12 insertions(+), 6 deletions(-)
 rename {ebean-core/src/main/java/io/ebeaninternal/server => ebean-core-type/src/main/java/io/ebean/core}/type/ScalarTypeBaseDate.java (94%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java
similarity index 94%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java
index 2928c7955..21df015e3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -19,11 +19,11 @@ import java.sql.Types;
 /**
  * Base class for Date types.
  */
-abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
+public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
 
   protected final JsonConfig.Date mode;
 
-  ScalarTypeBaseDate(JsonConfig.Date mode, Class<T> type, boolean jdbcNative, int jdbcType) {
+  public ScalarTypeBaseDate(JsonConfig.Date mode, Class<T> type, boolean jdbcNative, int jdbcType) {
     super(type, jdbcNative, jdbcType);
     this.mode = mode;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
index 84d7330da..eaf883cff 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.Date;
@@ -12,7 +13,7 @@ import java.sql.Types;
 /**
  * ScalarType for java.sql.Date.
  */
-final class ScalarTypeDate extends ScalarTypeBaseDate<java.sql.Date> {
+final class ScalarTypeDate extends ScalarTypeBaseDate<Date> {
 
   ScalarTypeDate(JsonConfig.Date mode) {
     super(mode, Date.class, true, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
index 9a7990a6d..03c4e5897 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 import org.joda.time.DateMidnight;
 
@@ -11,7 +12,7 @@ import java.sql.Types;
  * ScalarType for Joda DateMidnight. This maps to a JDBC Date.
  */
 @SuppressWarnings("deprecation")
-final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<org.joda.time.DateMidnight> {
+final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<DateMidnight> {
 
   /**
    * Instantiates a new scalar type joda date midnight.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index f5f85a4db..92a17a8f7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 import java.sql.Date;
 import java.sql.Types;
 
+import io.ebean.core.type.ScalarTypeBaseDate;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
index c3e26ce56..0461faddc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
@@ -8,6 +8,7 @@ import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index 725d76055..0f4c952c1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.SQLException;
@@ -89,7 +90,7 @@ final class ScalarTypeUtilDate {
     }
   }
 
-  static final class DateType extends ScalarTypeBaseDate<java.util.Date> {
+  static final class DateType extends ScalarTypeBaseDate<Date> {
 
     DateType(JsonConfig.Date mode) {
       super(mode, Date.class, false, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
index e7ee97287..c662c8ca0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.Date;

From 6f249c7b7210dd0c3b95221e942f52aaa9c19ad0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 12:36:04 +1200
Subject: [PATCH 050/127] No effective change, tidy ScalarTypeBaseDate only

---
 .../ebean/core/type/ScalarTypeBaseDate.java   | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java
index 21df015e3..5d76cfade 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java
@@ -28,6 +28,11 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
     this.mode = mode;
   }
 
+  /**
+   * Convert the value to ISO8601 format.
+   */
+  protected abstract String toIsoFormat(T value);
+
   /**
    * Convert the target value to millis.
    */
@@ -54,32 +59,27 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
 
   @Override
   public T read(DataReader reader) throws SQLException {
-    Date ts = reader.getDate();
-    return ts == null ? null : convertFromDate(ts);
+    final Date date = reader.getDate();
+    return date == null ? null : convertFromDate(date);
   }
 
   @Override
-  public String formatValue(T t) {
-    Date date = convertToDate(t);
-    // format all dates into epoch millis
-    long epochMillis = date.getTime();
-    return Long.toString(epochMillis);
+  public String formatValue(T value) {
+    final Date date = convertToDate(value);
+    return Long.toString(date.getTime());
   }
 
   @Override
   public T parse(String value) {
     try {
-      long epochMillis = Long.parseLong(value);
-      return convertFromDate(new Date(epochMillis));
+      return convertFromDate(new Date(Long.parseLong(value)));
     } catch (NumberFormatException e) {
-      Date date = Date.valueOf(value);
-      return convertFromDate(date);
+      return convertFromDate(Date.valueOf(value));
     }
   }
 
   public T convertFromMillis(long systemTimeMillis) {
-    Date ts = new Date(systemTimeMillis);
-    return convertFromDate(ts);
+    return convertFromDate(new Date(systemTimeMillis));
   }
 
   @Override
@@ -100,11 +100,6 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
     }
   }
 
-  /**
-   * Convert the value to ISO8601 format.
-   */
-  protected abstract String toIsoFormat(T value);
-
   @Override
   public DocPropertyType docType() {
     return DocPropertyType.DATE;
@@ -115,9 +110,7 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
     if (!dataInput.readBoolean()) {
       return null;
     } else {
-      long val = dataInput.readLong();
-      Date date = new Date(val);
-      return convertFromDate(date);
+      return convertFromDate(new Date(dataInput.readLong()));
     }
   }
 
@@ -127,8 +120,7 @@ public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
       dataOutput.writeBoolean(false);
     } else {
       dataOutput.writeBoolean(true);
-      Date date = convertToDate(value);
-      dataOutput.writeLong(date.getTime());
+      dataOutput.writeLong(convertToDate(value).getTime());
     }
   }
 

From f319ee66ad72792067729fdbfad1b44e71ba1288 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 13:02:42 +1200
Subject: [PATCH 051/127] Refactor move ScalarTypeBaseDateTime to
 ebean-core-type module

---
 ebean-core-type/pom.xml                         |  7 +++++++
 .../java/io/ebean/core}/type/DecimalUtils.java  | 14 +++++++-------
 .../ebean/core}/type/IsoJsonDateTimeParser.java |  8 ++++----
 .../core}/type/ScalarTypeBaseDateTime.java      | 14 ++++----------
 .../io/ebean/core}/type/DecimalUtilsTest.java   |  3 +--
 .../core}/type/IsoJsonDateTimeParserTest.java   | 17 ++++++++---------
 .../server/type/ScalarTypeCalendar.java         |  3 ++-
 .../server/type/ScalarTypeDuration.java         |  5 +----
 .../server/type/ScalarTypeInstant.java          |  1 +
 .../server/type/ScalarTypeJodaDateTime.java     |  1 +
 .../type/ScalarTypeJodaLocalDateTime.java       |  1 +
 .../server/type/ScalarTypeLocalDateTime.java    |  1 +
 .../server/type/ScalarTypeOffsetDateTime.java   |  3 ++-
 .../server/type/ScalarTypeTimestamp.java        |  3 ++-
 .../server/type/ScalarTypeUtilDate.java         |  5 +++--
 .../server/type/ScalarTypeZonedDateTime.java    |  1 +
 .../server/type/ScalarTypeCalendarTest.java     |  3 ++-
 .../type/ScalarTypeDurationWithNanosTest.java   |  1 +
 .../type/ScalarTypeOffsetDateTimeTest.java      |  3 ++-
 .../server/type/ScalarTypeTimestampTest.java    |  3 ++-
 .../server/type/ScalarTypeUtilDateTest.java     |  5 ++++-
 .../type/ScalarTypeZonedDateTimeTest.java       |  3 ++-
 22 files changed, 59 insertions(+), 46 deletions(-)
 rename {ebean-core/src/main/java/io/ebeaninternal/server => ebean-core-type/src/main/java/io/ebean/core}/type/DecimalUtils.java (85%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server => ebean-core-type/src/main/java/io/ebean/core}/type/IsoJsonDateTimeParser.java (67%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server => ebean-core-type/src/main/java/io/ebean/core}/type/ScalarTypeBaseDateTime.java (89%)
 rename {ebean-core/src/test/java/io/ebeaninternal/server => ebean-core-type/src/test/java/io/ebean/core}/type/DecimalUtilsTest.java (95%)
 rename {ebean-core/src/test/java/io/ebeaninternal/server => ebean-core-type/src/test/java/io/ebean/core}/type/IsoJsonDateTimeParserTest.java (72%)

diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index f1446c821..495945250 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -26,6 +26,13 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
 </project>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java b/ebean-core-type/src/main/java/io/ebean/core/type/DecimalUtils.java
similarity index 85%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/DecimalUtils.java
index 1e75c32a9..9259e05e2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DecimalUtils.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/DecimalUtils.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 /*
  * Copyright 2013 FasterXML.com
@@ -27,7 +27,7 @@ import java.time.Instant;
  * @author Nick Williams
  * @since 2.2.0
  */
-final class DecimalUtils {
+public final class DecimalUtils {
 
   private static final char[] ZEROES = new char[]{'0', '0', '0', '0', '0', '0', '0', '0', '0'};
 
@@ -37,17 +37,17 @@ final class DecimalUtils {
     throw new RuntimeException("DecimalUtils cannot be instantiated.");
   }
 
-  static Duration toDuration(BigDecimal value) {
+  public static Duration toDuration(BigDecimal value) {
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
     return Duration.ofSeconds(seconds, nanoseconds);
   }
 
-  static BigDecimal toDecimal(Duration instant) {
+  public static BigDecimal toDecimal(Duration instant) {
     return new BigDecimal(toDecimal(instant.getSeconds(), instant.getNano()));
   }
 
-  static Timestamp toTimestamp(BigDecimal value) {
+  public static Timestamp toTimestamp(BigDecimal value) {
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
     Timestamp ts = new Timestamp(seconds * 1000);
@@ -55,13 +55,13 @@ final class DecimalUtils {
     return ts;
   }
 
-  static BigDecimal toDecimal(Timestamp instant) {
+  public static BigDecimal toDecimal(Timestamp instant) {
     long millis = instant.getTime();
     long secs = millis / 1000;
     return new BigDecimal(toDecimal(secs, instant.getNanos()));
   }
 
-  static String toDecimal(long seconds, int nanoseconds) {
+  public static String toDecimal(long seconds, int nanoseconds) {
     StringBuilder string = new StringBuilder(Integer.toString(nanoseconds));
     if (string.length() < 9)
       string.insert(0, ZEROES, 0, 9 - string.length());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java b/ebean-core-type/src/main/java/io/ebean/core/type/IsoJsonDateTimeParser.java
similarity index 67%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/IsoJsonDateTimeParser.java
index fd4373062..d269d0b32 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/IsoJsonDateTimeParser.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/IsoJsonDateTimeParser.java
@@ -1,21 +1,21 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 
-final class IsoJsonDateTimeParser {
+public final class IsoJsonDateTimeParser {
 
   private static final DateTimeFormatter ISO_MILLIS = new DateTimeFormatterBuilder()
     .parseCaseInsensitive()
     .appendInstant(3)
     .toFormatter();
 
-  static Instant parseIso(String jsonDateTime) {
+  public static Instant parseIso(String jsonDateTime) {
     return Instant.parse(jsonDateTime);
   }
 
-  static String formatIso(Instant value) {
+  public static String formatIso(Instant value) {
     return ISO_MILLIS.format(value);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDateTime.java
similarity index 89%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDateTime.java
index c77dca488..a627c7e81 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDateTime.java
@@ -1,12 +1,8 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.config.JsonConfig;
-import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.DocPropertyType;
-import io.ebean.core.type.ScalarTypeBase;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -17,16 +13,14 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.Instant;
 
-import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.parseIso;
-
 /**
  * Base type for DateTime types.
  */
-abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
+public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
 
   protected final JsonConfig.DateTime mode;
 
-  ScalarTypeBaseDateTime(JsonConfig.DateTime mode, Class<T> type, boolean jdbcNative, int jdbcType) {
+  public ScalarTypeBaseDateTime(JsonConfig.DateTime mode, Class<T> type, boolean jdbcNative, int jdbcType) {
     super(type, jdbcNative, jdbcType);
     this.mode = mode;
   }
@@ -75,7 +69,7 @@ abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
    * Convert the value to ISO8601 format.
    */
   protected T fromJsonISO8601(String value) {
-    return convertFromInstant(parseIso(value));
+    return convertFromInstant(IsoJsonDateTimeParser.parseIso(value));
   }
 
   @Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java b/ebean-core-type/src/test/java/io/ebean/core/type/DecimalUtilsTest.java
similarity index 95%
rename from ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java
rename to ebean-core-type/src/test/java/io/ebean/core/type/DecimalUtilsTest.java
index 7f6d9f98a..44bc322f2 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DecimalUtilsTest.java
+++ b/ebean-core-type/src/test/java/io/ebean/core/type/DecimalUtilsTest.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 import org.junit.jupiter.api.Test;
 
@@ -32,6 +32,5 @@ class DecimalUtilsTest {
 
     assertEquals(duration, duration1);
     assertEquals("PT5M23.0015S", duration1.toString());
-
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java b/ebean-core-type/src/test/java/io/ebean/core/type/IsoJsonDateTimeParserTest.java
similarity index 72%
rename from ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java
rename to ebean-core-type/src/test/java/io/ebean/core/type/IsoJsonDateTimeParserTest.java
index 75e600ee6..b854881b8 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/IsoJsonDateTimeParserTest.java
+++ b/ebean-core-type/src/test/java/io/ebean/core/type/IsoJsonDateTimeParserTest.java
@@ -1,5 +1,4 @@
-package io.ebeaninternal.server.type;
-
+package io.ebean.core.type;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,37 +6,37 @@ import java.time.Instant;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class IsoJsonDateTimeParserTest {
+class IsoJsonDateTimeParserTest {
 
   private IsoJsonDateTimeParser parser = new IsoJsonDateTimeParser();
 
   @Test
-  public void parseFormat_when_hasMillis() {
+  void parseFormat_when_hasMillis() {
     parseAndFormat("2016-02-28T20:39:00.123Z", "2016-02-28T20:39:00.123Z");
   }
 
   @Test
-  public void parseFormat_when_noMillis() {
+  void parseFormat_when_noMillis() {
     parseAndFormat("2016-02-28T20:39:00Z", "2016-02-28T20:39:00.000Z");
   }
 
   @Test
-  public void parseFormat_when_millis_1dp() {
+  void parseFormat_when_millis_1dp() {
     parseAndFormat("2016-02-28T20:39:00.0Z", "2016-02-28T20:39:00.000Z");
   }
 
   @Test
-  public void parseFormat_when_millis_2dp() {
+  void parseFormat_when_millis_2dp() {
     parseAndFormat("2016-02-28T20:39:00.00Z", "2016-02-28T20:39:00.000Z");
   }
 
   @Test
-  public void parseFormat_when_millis_3dp() {
+  void parseFormat_when_millis_3dp() {
     parseAndFormat("2016-02-28T20:39:00.000Z", "2016-02-28T20:39:00.000Z");
   }
 
   @Test
-  public void parseFormat_when_millis_3dp_2() {
+  void parseFormat_when_millis_3dp_2() {
     parseAndFormat("2016-02-28T20:39:32.999000Z", "2016-02-28T20:39:32.999Z");
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
index 9028523b4..6584d8360 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.ScalarTypeBaseDateTime;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.Date;
@@ -11,7 +12,7 @@ import java.sql.Types;
 import java.time.Instant;
 import java.util.Calendar;
 
-import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
+import static io.ebean.core.type.IsoJsonDateTimeParser.formatIso;
 
 /**
  * ScalarType for java.util.Calendar.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
index db0b6e678..34899fe68 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
@@ -2,10 +2,7 @@ package io.ebeaninternal.server.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.DocPropertyType;
-import io.ebean.core.type.ScalarTypeBase;
+import io.ebean.core.type.*;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
index d3fbee011..76654be74 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDateTime;
 
 import java.sql.Timestamp;
 import java.sql.Types;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
index 0291f31dd..0eea396f9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDateTime;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 import org.joda.time.DateTime;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
index 913d290be..07d289c4d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDateTime;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 import org.joda.time.LocalDateTime;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index 5e697029d..3de0184e1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.config.JsonConfig;
 import io.ebean.config.dbplatform.ExtraDbTypes;
+import io.ebean.core.type.ScalarTypeBaseDateTime;
 
 import java.io.IOException;
 import java.sql.Timestamp;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
index f7e151238..b105f646a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDateTime;
 
 import java.sql.Timestamp;
 import java.sql.Types;
@@ -8,7 +9,7 @@ import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 
-import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
+import static io.ebean.core.type.IsoJsonDateTimeParser.formatIso;
 
 /**
  * ScalarType for java.sql.Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
index a99b8cc56..60529df63 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarTypeBaseDateTime;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.SQLException;
@@ -10,7 +11,7 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.Instant;
 
-import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
+import static io.ebean.core.type.IsoJsonDateTimeParser.formatIso;
 
 /**
  * ScalarType for java.sql.Timestamp.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index 0f4c952c1..f171afdef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -4,6 +4,7 @@ import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarTypeBaseDate;
+import io.ebean.core.type.ScalarTypeBaseDateTime;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.SQLException;
@@ -12,14 +13,14 @@ import java.sql.Types;
 import java.time.Instant;
 import java.util.Date;
 
-import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
+import static io.ebean.core.type.IsoJsonDateTimeParser.formatIso;
 
 /**
  * ScalarType for java.util.Date.
  */
 final class ScalarTypeUtilDate {
 
-  static final class TimestampType extends ScalarTypeBaseDateTime<java.util.Date> {
+  static final class TimestampType extends ScalarTypeBaseDateTime<Date> {
 
     TimestampType(JsonConfig.DateTime mode) {
       super(mode, java.util.Date.class, false, Types.TIMESTAMP);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
index 533489e6f..0bed9d923 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDateTime;
 
 import java.sql.Timestamp;
 import java.sql.Types;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java
index 4edc4c059..0e6d4a588 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.IsoJsonDateTimeParser;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Types;
@@ -17,7 +18,7 @@ public class ScalarTypeCalendarTest {
 
     Calendar instance = Calendar.getInstance();
     String asUtc = type.toJsonISO8601(instance);
-    Calendar calendar = type.fromJsonISO8601(asUtc);
+    Calendar calendar = type.convertFromInstant(IsoJsonDateTimeParser.parseIso(asUtc)); //type.fromJsonISO8601(asUtc);
 
     assertThat(instance).isEqualTo(calendar);
   }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
index 2bbb4b6b8..bbe446746 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.type;
 
+import io.ebean.core.type.DecimalUtils;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
index 835546e1a..53c02bde7 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.IsoJsonDateTimeParser;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
@@ -122,7 +123,7 @@ public class ScalarTypeOffsetDateTimeTest {
     OffsetDateTime now = OffsetDateTime.now();
     String asJson = typeIso.toJsonISO8601(now);
 
-    OffsetDateTime value = typeIso.fromJsonISO8601(asJson);
+    OffsetDateTime value = typeIso.convertFromInstant(IsoJsonDateTimeParser.parseIso(asJson)); //typeIso.fromJsonISO8601(asJson);
     assertThat(now).isEqualToIgnoringNanos(value);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java
index 9c9412025..176813c48 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.IsoJsonDateTimeParser;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
@@ -17,7 +18,7 @@ public class ScalarTypeTimestampTest {
     Timestamp now = new Timestamp(System.currentTimeMillis());
     String asJson = typeIso.toJsonISO8601(now);
 
-    Timestamp value = typeIso.fromJsonISO8601(asJson);
+    Timestamp value = typeIso.convertFromInstant(IsoJsonDateTimeParser.parseIso(asJson)); //typeIso.fromJsonISO8601(asJson);
     assertThat(now).isEqualTo(value);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
index b8e1149e9..18fe8aac4 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
@@ -1,9 +1,11 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.IsoJsonDateTimeParser;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.util.Date;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,7 +35,8 @@ public class ScalarTypeUtilDateTest {
     Date now = new Date();
     String asJson = typeIso.toJsonISO8601(now);
 
-    Date value = typeIso.fromJsonISO8601(asJson);
+    Instant instant = IsoJsonDateTimeParser.parseIso(asJson);
+    Date value = new java.util.Date(instant.toEpochMilli()); // typeIso.fromJsonISO8601(asJson);
     assertThat(now).isEqualTo(value);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
index f7942b397..96bc8d7db 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.IsoJsonDateTimeParser;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
@@ -124,7 +125,7 @@ public class ScalarTypeZonedDateTimeTest {
     ZonedDateTime now = ZonedDateTime.now();
     String asJson = typeIso.toJsonISO8601(now);
 
-    ZonedDateTime value = typeIso.fromJsonISO8601(asJson);
+    ZonedDateTime value = type.convertFromInstant(IsoJsonDateTimeParser.parseIso(asJson)); //typeIso.fromJsonISO8601(asJson);
     assertThat(now).isEqualTo(value);
   }
 }

From a13f581a65bdb8e9472d6e2d2082d4b674baedd4 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 13:15:55 +1200
Subject: [PATCH 052/127] Refactor ScalarTypeBaseDateTime, merge into
 ScalarTypeUtils both IsoJsonDateTimeParser and DecimalUtils

That is, merge the static util methods into ScalarTypeUtils
---
 .../core/type/IsoJsonDateTimeParser.java      | 21 -------
 .../core/type/ScalarTypeBaseDateTime.java     |  6 +-
 ...DecimalUtils.java => ScalarTypeUtils.java} | 56 ++++++++++++-------
 .../io/ebean/core/type/DecimalUtilsTest.java  |  8 +--
 .../core/type/IsoJsonDateTimeParserTest.java  |  6 +-
 .../server/type/ScalarTypeCalendar.java       |  4 +-
 .../server/type/ScalarTypeDuration.java       |  4 +-
 .../server/type/ScalarTypeOffsetDateTime.java |  4 +-
 .../server/type/ScalarTypeTimestamp.java      |  4 +-
 .../server/type/ScalarTypeUtilDate.java       |  4 +-
 .../server/type/ScalarTypeCalendarTest.java   |  4 +-
 .../type/ScalarTypeDurationWithNanosTest.java |  6 +-
 .../type/ScalarTypeOffsetDateTimeTest.java    |  4 +-
 .../server/type/ScalarTypeTimestampTest.java  |  4 +-
 .../server/type/ScalarTypeUtilDateTest.java   |  4 +-
 .../type/ScalarTypeZonedDateTimeTest.java     |  4 +-
 16 files changed, 69 insertions(+), 74 deletions(-)
 delete mode 100644 ebean-core-type/src/main/java/io/ebean/core/type/IsoJsonDateTimeParser.java
 rename ebean-core-type/src/main/java/io/ebean/core/type/{DecimalUtils.java => ScalarTypeUtils.java} (63%)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/IsoJsonDateTimeParser.java b/ebean-core-type/src/main/java/io/ebean/core/type/IsoJsonDateTimeParser.java
deleted file mode 100644
index d269d0b32..000000000
--- a/ebean-core-type/src/main/java/io/ebean/core/type/IsoJsonDateTimeParser.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.ebean.core.type;
-
-import java.time.Instant;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-
-public final class IsoJsonDateTimeParser {
-
-  private static final DateTimeFormatter ISO_MILLIS = new DateTimeFormatterBuilder()
-    .parseCaseInsensitive()
-    .appendInstant(3)
-    .toFormatter();
-
-  public static Instant parseIso(String jsonDateTime) {
-    return Instant.parse(jsonDateTime);
-  }
-
-  public static String formatIso(Instant value) {
-    return ISO_MILLIS.format(value);
-  }
-}
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDateTime.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDateTime.java
index a627c7e81..0ee2cb82f 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDateTime.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDateTime.java
@@ -69,7 +69,7 @@ public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
    * Convert the value to ISO8601 format.
    */
   protected T fromJsonISO8601(String value) {
-    return convertFromInstant(IsoJsonDateTimeParser.parseIso(value));
+    return convertFromInstant(ScalarTypeUtils.parseInstant(value));
   }
 
   @Override
@@ -95,7 +95,7 @@ public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
    * Helper method that given epoch seconds and nanos return a JSON nanos formatted string.
    */
   protected String toJsonNanos(long epochSecs, int nanos) {
-    return DecimalUtils.toDecimal(epochSecs, nanos);
+    return ScalarTypeUtils.toDecimal(epochSecs, nanos);
   }
 
   @Override
@@ -106,7 +106,7 @@ public abstract class ScalarTypeBaseDateTime<T> extends ScalarTypeBase<T> {
       }
       case VALUE_NUMBER_FLOAT: {
         BigDecimal value = parser.getDecimalValue();
-        Timestamp timestamp = DecimalUtils.toTimestamp(value);
+        Timestamp timestamp = ScalarTypeUtils.toTimestamp(value);
         return convertFromTimestamp(timestamp);
       }
       default: {
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/DecimalUtils.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeUtils.java
similarity index 63%
rename from ebean-core-type/src/main/java/io/ebean/core/type/DecimalUtils.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeUtils.java
index 9259e05e2..1e7915316 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/DecimalUtils.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeUtils.java
@@ -1,25 +1,11 @@
 package io.ebean.core.type;
 
-/*
- * Copyright 2013 FasterXML.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
 
 /**
  * Utilities to aid in the translation of decimal types to/from multiple parts.
@@ -27,26 +13,50 @@ import java.time.Instant;
  * @author Nick Williams
  * @since 2.2.0
  */
-public final class DecimalUtils {
+public final class ScalarTypeUtils {
 
   private static final char[] ZEROES = new char[]{'0', '0', '0', '0', '0', '0', '0', '0', '0'};
 
   private static final BigDecimal ONE_BILLION = new BigDecimal(1000000000L);
 
-  private DecimalUtils() {
-    throw new RuntimeException("DecimalUtils cannot be instantiated.");
+  private static final DateTimeFormatter ISO_MILLIS = new DateTimeFormatterBuilder()
+    .parseCaseInsensitive()
+    .appendInstant(3)
+    .toFormatter();
+
+  /**
+   * Parse using ISO8601.
+   */
+  public static Instant parseInstant(String jsonDateTime) {
+    return Instant.parse(jsonDateTime);
   }
 
+  /**
+   * Format using ISO8601.
+   */
+  public static String formatInstant(Instant value) {
+    return ISO_MILLIS.format(value);
+  }
+
+  /**
+   * Convert decimal to duration with nanos.
+   */
   public static Duration toDuration(BigDecimal value) {
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
     return Duration.ofSeconds(seconds, nanoseconds);
   }
 
+  /**
+   * Convert duration to decimal with nanos.
+   */
   public static BigDecimal toDecimal(Duration instant) {
     return new BigDecimal(toDecimal(instant.getSeconds(), instant.getNano()));
   }
 
+  /**
+   * Convert decimal to timestamp with nanos.
+   */
   public static Timestamp toTimestamp(BigDecimal value) {
     long seconds = value.longValue();
     int nanoseconds = extractNanosecondDecimal(value, seconds);
@@ -55,12 +65,18 @@ public final class DecimalUtils {
     return ts;
   }
 
+  /**
+   * Convert timestamp to decimal with nanos.
+   */
   public static BigDecimal toDecimal(Timestamp instant) {
     long millis = instant.getTime();
     long secs = millis / 1000;
     return new BigDecimal(toDecimal(secs, instant.getNanos()));
   }
 
+  /**
+   * Convert to decimal string with nanos.
+   */
   public static String toDecimal(long seconds, int nanoseconds) {
     StringBuilder string = new StringBuilder(Integer.toString(nanoseconds));
     if (string.length() < 9)
@@ -68,7 +84,7 @@ public final class DecimalUtils {
     return seconds + "." + string;
   }
 
-  static int extractNanosecondDecimal(BigDecimal value, long integer) {
+  private static int extractNanosecondDecimal(BigDecimal value, long integer) {
     return value.subtract(new BigDecimal(integer)).multiply(ONE_BILLION).intValue();
   }
 }
diff --git a/ebean-core-type/src/test/java/io/ebean/core/type/DecimalUtilsTest.java b/ebean-core-type/src/test/java/io/ebean/core/type/DecimalUtilsTest.java
index 44bc322f2..91a7c631c 100644
--- a/ebean-core-type/src/test/java/io/ebean/core/type/DecimalUtilsTest.java
+++ b/ebean-core-type/src/test/java/io/ebean/core/type/DecimalUtilsTest.java
@@ -16,8 +16,8 @@ class DecimalUtilsTest {
     Instant now = Instant.now();
     Timestamp sourceTimestamp = Timestamp.from(now);
 
-    BigDecimal decimal = DecimalUtils.toDecimal(sourceTimestamp);
-    Timestamp timestamp = DecimalUtils.toTimestamp(decimal);
+    BigDecimal decimal = ScalarTypeUtils.toDecimal(sourceTimestamp);
+    Timestamp timestamp = ScalarTypeUtils.toTimestamp(decimal);
 
     assertEquals(now, timestamp.toInstant());
     assertEquals(sourceTimestamp, timestamp);
@@ -27,8 +27,8 @@ class DecimalUtilsTest {
   void testDuration() {
     Duration duration = Duration.ofSeconds(323, 1500000);
 
-    BigDecimal bigDecimal = DecimalUtils.toDecimal(duration);
-    Duration duration1 = DecimalUtils.toDuration(bigDecimal);
+    BigDecimal bigDecimal = ScalarTypeUtils.toDecimal(duration);
+    Duration duration1 = ScalarTypeUtils.toDuration(bigDecimal);
 
     assertEquals(duration, duration1);
     assertEquals("PT5M23.0015S", duration1.toString());
diff --git a/ebean-core-type/src/test/java/io/ebean/core/type/IsoJsonDateTimeParserTest.java b/ebean-core-type/src/test/java/io/ebean/core/type/IsoJsonDateTimeParserTest.java
index b854881b8..12740b552 100644
--- a/ebean-core-type/src/test/java/io/ebean/core/type/IsoJsonDateTimeParserTest.java
+++ b/ebean-core-type/src/test/java/io/ebean/core/type/IsoJsonDateTimeParserTest.java
@@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 class IsoJsonDateTimeParserTest {
 
-  private IsoJsonDateTimeParser parser = new IsoJsonDateTimeParser();
+  private ScalarTypeUtils parser = new ScalarTypeUtils();
 
   @Test
   void parseFormat_when_hasMillis() {
@@ -41,8 +41,8 @@ class IsoJsonDateTimeParserTest {
   }
 
   private void parseAndFormat(String input, String expected) {
-    Instant timestamp = parser.parseIso(input);
-    String format = parser.formatIso(timestamp);
+    Instant timestamp = parser.parseInstant(input);
+    String format = parser.formatInstant(timestamp);
     assertThat(format).isEqualTo(expected);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
index 6584d8360..50ee64539 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
@@ -12,7 +12,7 @@ import java.sql.Types;
 import java.time.Instant;
 import java.util.Calendar;
 
-import static io.ebean.core.type.IsoJsonDateTimeParser.formatIso;
+import static io.ebean.core.type.ScalarTypeUtils.formatInstant;
 
 /**
  * ScalarType for java.util.Calendar.
@@ -66,7 +66,7 @@ final class ScalarTypeCalendar extends ScalarTypeBaseDateTime<Calendar> {
 
   @Override
   protected String toJsonISO8601(Calendar value) {
-    return formatIso(value.toInstant());
+    return formatInstant(value.toInstant());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
index 34899fe68..2e5a29996 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
@@ -27,11 +27,11 @@ class ScalarTypeDuration extends ScalarTypeBase<Duration> {
   }
 
   BigDecimal convertToBigDecimal(Duration value) {
-    return (value == null) ? null : DecimalUtils.toDecimal(value);
+    return (value == null) ? null : ScalarTypeUtils.toDecimal(value);
   }
 
   Duration convertFromBigDecimal(BigDecimal value) {
-    return (value == null) ? null : DecimalUtils.toDuration(value);
+    return (value == null) ? null : ScalarTypeUtils.toDuration(value);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
index b105f646a..0f0b053cf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
@@ -9,7 +9,7 @@ import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 
-import static io.ebean.core.type.IsoJsonDateTimeParser.formatIso;
+import static io.ebean.core.type.ScalarTypeUtils.formatInstant;
 
 /**
  * ScalarType for java.sql.Timestamp.
@@ -30,7 +30,7 @@ final class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateTi
 
   @Override
   protected String toJsonISO8601(OffsetDateTime value) {
-    return formatIso(value.toInstant());
+    return formatInstant(value.toInstant());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
index 60529df63..0f2a45402 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
@@ -11,7 +11,7 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.Instant;
 
-import static io.ebean.core.type.IsoJsonDateTimeParser.formatIso;
+import static io.ebean.core.type.ScalarTypeUtils.formatInstant;
 
 /**
  * ScalarType for java.sql.Timestamp.
@@ -29,7 +29,7 @@ final class ScalarTypeTimestamp extends ScalarTypeBaseDateTime<Timestamp> {
 
   @Override
   protected String toJsonISO8601(Timestamp value) {
-    return formatIso(value.toInstant());
+    return formatInstant(value.toInstant());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index f171afdef..ae8d670d5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -13,7 +13,7 @@ import java.sql.Types;
 import java.time.Instant;
 import java.util.Date;
 
-import static io.ebean.core.type.IsoJsonDateTimeParser.formatIso;
+import static io.ebean.core.type.ScalarTypeUtils.formatInstant;
 
 /**
  * ScalarType for java.util.Date.
@@ -33,7 +33,7 @@ final class ScalarTypeUtilDate {
 
     @Override
     protected String toJsonISO8601(Date value) {
-      return formatIso(value.toInstant());
+      return formatInstant(value.toInstant());
     }
 
     @Override
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java
index 0e6d4a588..1004ce2ac 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeCalendarTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
-import io.ebean.core.type.IsoJsonDateTimeParser;
+import io.ebean.core.type.ScalarTypeUtils;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Types;
@@ -18,7 +18,7 @@ public class ScalarTypeCalendarTest {
 
     Calendar instance = Calendar.getInstance();
     String asUtc = type.toJsonISO8601(instance);
-    Calendar calendar = type.convertFromInstant(IsoJsonDateTimeParser.parseIso(asUtc)); //type.fromJsonISO8601(asUtc);
+    Calendar calendar = type.convertFromInstant(ScalarTypeUtils.parseInstant(asUtc)); //type.fromJsonISO8601(asUtc);
 
     assertThat(instance).isEqualTo(calendar);
   }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
index bbe446746..dd94703f2 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.type;
 
-import io.ebean.core.type.DecimalUtils;
+import io.ebean.core.type.ScalarTypeUtils;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
@@ -41,7 +41,7 @@ class ScalarTypeDurationWithNanosTest {
   @Test
   void testToJdbcType() throws Exception {
     Duration duration = Duration.ofSeconds(323, 1500000);
-    BigDecimal bigDecimal = DecimalUtils.toDecimal(duration);
+    BigDecimal bigDecimal = ScalarTypeUtils.toDecimal(duration);
 
     Object val1 = type.toJdbcType(duration);
     Object val2 = type.toJdbcType(bigDecimal);
@@ -53,7 +53,7 @@ class ScalarTypeDurationWithNanosTest {
   @Test
   void testToBeanType() throws Exception {
     Duration duration = Duration.ofSeconds(323, 1500000);
-    BigDecimal bigDecimal = DecimalUtils.toDecimal(duration);
+    BigDecimal bigDecimal = ScalarTypeUtils.toDecimal(duration);
 
     Duration val1 = type.toBeanType(duration);
     Duration val2 = type.toBeanType(bigDecimal);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
index 53c02bde7..be8a7aefb 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
-import io.ebean.core.type.IsoJsonDateTimeParser;
+import io.ebean.core.type.ScalarTypeUtils;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
@@ -123,7 +123,7 @@ public class ScalarTypeOffsetDateTimeTest {
     OffsetDateTime now = OffsetDateTime.now();
     String asJson = typeIso.toJsonISO8601(now);
 
-    OffsetDateTime value = typeIso.convertFromInstant(IsoJsonDateTimeParser.parseIso(asJson)); //typeIso.fromJsonISO8601(asJson);
+    OffsetDateTime value = typeIso.convertFromInstant(ScalarTypeUtils.parseInstant(asJson)); //typeIso.fromJsonISO8601(asJson);
     assertThat(now).isEqualToIgnoringNanos(value);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java
index 176813c48..3b70aef74 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeTimestampTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
-import io.ebean.core.type.IsoJsonDateTimeParser;
+import io.ebean.core.type.ScalarTypeUtils;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
@@ -18,7 +18,7 @@ public class ScalarTypeTimestampTest {
     Timestamp now = new Timestamp(System.currentTimeMillis());
     String asJson = typeIso.toJsonISO8601(now);
 
-    Timestamp value = typeIso.convertFromInstant(IsoJsonDateTimeParser.parseIso(asJson)); //typeIso.fromJsonISO8601(asJson);
+    Timestamp value = typeIso.convertFromInstant(ScalarTypeUtils.parseInstant(asJson)); //typeIso.fromJsonISO8601(asJson);
     assertThat(now).isEqualTo(value);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
index 18fe8aac4..4824c1fcb 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
-import io.ebean.core.type.IsoJsonDateTimeParser;
+import io.ebean.core.type.ScalarTypeUtils;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
@@ -35,7 +35,7 @@ public class ScalarTypeUtilDateTest {
     Date now = new Date();
     String asJson = typeIso.toJsonISO8601(now);
 
-    Instant instant = IsoJsonDateTimeParser.parseIso(asJson);
+    Instant instant = ScalarTypeUtils.parseInstant(asJson);
     Date value = new java.util.Date(instant.toEpochMilli()); // typeIso.fromJsonISO8601(asJson);
     assertThat(now).isEqualTo(value);
   }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
index 96bc8d7db..6938b0be0 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
-import io.ebean.core.type.IsoJsonDateTimeParser;
+import io.ebean.core.type.ScalarTypeUtils;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
@@ -125,7 +125,7 @@ public class ScalarTypeZonedDateTimeTest {
     ZonedDateTime now = ZonedDateTime.now();
     String asJson = typeIso.toJsonISO8601(now);
 
-    ZonedDateTime value = type.convertFromInstant(IsoJsonDateTimeParser.parseIso(asJson)); //typeIso.fromJsonISO8601(asJson);
+    ZonedDateTime value = type.convertFromInstant(ScalarTypeUtils.parseInstant(asJson)); //typeIso.fromJsonISO8601(asJson);
     assertThat(now).isEqualTo(value);
   }
 }

From 4c13a3a7790d1876fcc7377d79e0fb055a7a6809 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 14:51:19 +1200
Subject: [PATCH 053/127] Refactor move package - server.type.DataBind to
 server.bind, server.text.json -> server.json

The DataBind classes don't need to be in with server.type anymore.
The server.text.json package can just reduce package nesting.
---
 .../java/io/ebeaninternal/api/NoopQueryBindCapture.java     | 2 +-
 .../main/java/io/ebeaninternal/api/SpiQueryBindCapture.java | 2 +-
 .../io/ebeaninternal/server/{type => bind}/DataBind.java    | 2 +-
 .../server/{type => bind}/DataBindCapture.java              | 6 +++---
 .../{type/bindcapture => bind/capture}/BindCapture.java     | 2 +-
 .../bindcapture => bind/capture}/BindCaptureEntry.java      | 2 +-
 .../bindcapture => bind/capture}/BindCaptureStatement.java  | 2 +-
 .../capture}/BindCaptureStatementBase.java                  | 2 +-
 .../bindcapture => bind/capture}/BindCaptureTypes.java      | 2 +-
 .../io/ebeaninternal/server/core/InternalConfiguration.java | 2 +-
 .../java/io/ebeaninternal/server/deploy/BeanDescriptor.java | 2 +-
 .../java/io/ebeaninternal/server/deploy/BeanProperty.java   | 1 +
 .../java/io/ebeaninternal/server/deploy/id/IdBinder.java    | 2 +-
 .../io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java | 2 +-
 .../io/ebeaninternal/server/deploy/id/IdBinderEmpty.java    | 2 +-
 .../io/ebeaninternal/server/deploy/id/IdBinderSimple.java   | 2 +-
 .../server/expression/DefaultExpressionRequest.java         | 2 +-
 .../server/{text => }/json/DJsonBeanReader.java             | 2 +-
 .../ebeaninternal/server/{text => }/json/DJsonContext.java  | 2 +-
 .../ebeaninternal/server/{text => }/json/DJsonScalar.java   | 2 +-
 .../io/ebeaninternal/server/{text => }/json/PathStack.java  | 2 +-
 .../io/ebeaninternal/server/{text => }/json/ReadJson.java   | 2 +-
 .../io/ebeaninternal/server/{text => }/json/WriteJson.java  | 2 +-
 .../main/java/io/ebeaninternal/server/persist/Binder.java   | 1 +
 .../io/ebeaninternal/server/persist/dml/DmlHandler.java     | 2 +-
 .../server/persist/platform/AbstractMultiValueBind.java     | 2 +-
 .../server/persist/platform/MultiValueBind.java             | 2 +-
 .../io/ebeaninternal/server/query/CQueryBindCapture.java    | 2 +-
 .../main/java/io/ebeaninternal/server/query/CQueryPlan.java | 4 ++--
 .../io/ebeaninternal/server/query/CQueryPlanManager.java    | 2 +-
 .../io/ebeaninternal/server/query/CQueryPredicates.java     | 2 +-
 .../java/io/ebeaninternal/server/query/QueryPlanLogger.java | 2 +-
 .../ebeaninternal/server/query/QueryPlanLoggerExplain.java  | 2 +-
 .../ebeaninternal/server/query/QueryPlanLoggerOracle.java   | 2 +-
 .../ebeaninternal/server/query/QueryPlanLoggerPostgres.java | 2 +-
 .../server/query/QueryPlanLoggerSqlServer.java              | 2 +-
 .../ebeaninternal/server/querydefn/OrmUpdateProperties.java | 2 +-
 .../docstore/api/mapping/DocPropertyAdapter.java            | 2 +-
 ebean-core/src/main/java/module-info.java                   | 2 +-
 .../server/type/BasePlatformArrayTypeFactoryTest.java       | 1 +
 .../test/java/io/ebeaninternal/server/type/JsonTester.java  | 2 +-
 .../xtest/internal/server/text/json/DJsonScalarTest.java    | 2 +-
 .../xtest/internal/server/text/json/WriteJsonDirtyTest.java | 2 +-
 .../org/tests/text/json/TestJsonBeanDescriptorParse.java    | 2 +-
 44 files changed, 47 insertions(+), 44 deletions(-)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{type => bind}/DataBind.java (99%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{type => bind}/DataBindCapture.java (84%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCapture.java (93%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCaptureEntry.java (81%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCaptureStatement.java (98%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCaptureStatementBase.java (99%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{type/bindcapture => bind/capture}/BindCaptureTypes.java (99%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/DJsonBeanReader.java (96%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/DJsonContext.java (99%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/DJsonScalar.java (96%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/PathStack.java (91%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/ReadJson.java (99%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/{text => }/json/WriteJson.java (99%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java
index 33ee06b54..f8b1dd65a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NoopQueryBindCapture.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCapture;
 
 final class NoopQueryBindCapture implements SpiQueryBindCapture {
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java
index db5cbd9b6..3f3a5b768 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryBindCapture.java
@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCapture;
 
 /**
  * Capture query bind values and with those actual database query plans.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBind.java
similarity index 99%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBind.java
index b4ce613be..8ca702c29 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBind.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebeaninternal.server.bind;
 
 import io.ebean.core.type.DataBinder;
 import io.ebeaninternal.api.CoreLog;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBindCapture.java
similarity index 84%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBindCapture.java
index 659d0ef06..78924bafe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DataBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBindCapture.java
@@ -1,8 +1,8 @@
-package io.ebeaninternal.server.type;
+package io.ebeaninternal.server.bind;
 
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
-import io.ebeaninternal.server.type.bindcapture.BindCaptureStatement;
+import io.ebeaninternal.server.bind.capture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCaptureStatement;
 
 /**
  * Special DataBind used to capture bind values for obtaining explain plans.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCapture.java
similarity index 93%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCapture.java
index 3e75d68a3..c51fb9e97 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCapture.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type.bindcapture;
+package io.ebeaninternal.server.bind.capture;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureEntry.java
similarity index 81%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureEntry.java
index 3bb7d3f95..b1f4ef6ae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureEntry.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureEntry.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type.bindcapture;
+package io.ebeaninternal.server.bind.capture;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatement.java
similarity index 98%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatement.java
index 916c1c355..04ad70753 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatement.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatement.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type.bindcapture;
+package io.ebeaninternal.server.bind.capture;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatementBase.java
similarity index 99%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatementBase.java
index ba4e01524..6e547dcaf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureStatementBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatementBase.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type.bindcapture;
+package io.ebeaninternal.server.bind.capture;
 
 import java.io.InputStream;
 import java.io.Reader;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureTypes.java
similarity index 99%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureTypes.java
index b2e36f828..c8cf8496b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/bindcapture/BindCaptureTypes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureTypes.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type.bindcapture;
+package io.ebeaninternal.server.bind.capture;
 
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
index 67c3142fe..bce133978 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java
@@ -46,7 +46,7 @@ import io.ebeaninternal.server.persist.platform.PostgresMultiValueBind;
 import io.ebeaninternal.server.query.*;
 import io.ebeaninternal.server.readaudit.DefaultReadAuditLogger;
 import io.ebeaninternal.server.readaudit.DefaultReadAuditPrepare;
-import io.ebeaninternal.server.text.json.DJsonContext;
+import io.ebeaninternal.server.json.DJsonContext;
 import io.ebeaninternal.server.transaction.*;
 import io.ebeaninternal.server.type.DefaultTypeManager;
 import io.ebeaninternal.server.type.TypeManager;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index d86e75a7b..17a5ba950 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -45,7 +45,7 @@ import io.ebeaninternal.server.querydefn.DefaultOrmQuery;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 import io.ebeaninternal.util.SortByClause;
 import io.ebeaninternal.util.SortByClauseParser;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 1fc421739..91e1a0ffa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -22,6 +22,7 @@ import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.core.EncryptAlias;
 import io.ebeaninternal.server.core.InternString;
+import io.ebeaninternal.server.bind.DataBind;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenCreated;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedWhenModified;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
index 01aec83e7..89a3677a2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.query.STreeProperty;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
index e3b23e9fb..d2fda9bd2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
@@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
index af3df49dc..b4bbbff1a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
@@ -6,7 +6,7 @@ import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
index 0a24c78d2..97f2bae2f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
@@ -10,7 +10,7 @@ import io.ebeaninternal.server.deploy.DbReadContext;
 import io.ebeaninternal.server.deploy.DbSqlContext;
 import io.ebeaninternal.server.persist.MultiValueWrapper;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java
index 89273c230..d1b1f4040 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionRequest.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.DeployParser;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.Binder;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java
similarity index 96%
rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java
index f16238bfa..8ee649981 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonBeanReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.json;
+package io.ebeaninternal.server.json;
 
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.PersistenceIOException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java
similarity index 99%
rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java
index c48ead0ca..0dacd596e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.json;
+package io.ebeaninternal.server.json;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java
similarity index 96%
rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java
index d0ef82204..19607be79 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonScalar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.json;
+package io.ebeaninternal.server.json;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import io.ebean.core.type.ScalarType;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/PathStack.java
similarity index 91%
rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/json/PathStack.java
index 6cb3b2b67..2d4c19a37 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/PathStack.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/PathStack.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.json;
+package io.ebeaninternal.server.json;
 
 import io.ebeaninternal.server.util.ArrayStack;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java
similarity index 99%
rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java
index cdb48f76b..77f20c185 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/ReadJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.json;
+package io.ebeaninternal.server.json;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java
similarity index 99%
rename from ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java
index 17c9e9372..60b52620f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.text.json;
+package io.ebeaninternal.server.json;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index afb416012..0687c940a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -7,6 +7,7 @@ import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiLogManager;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
+import io.ebeaninternal.server.bind.DataBind;
 import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.type.*;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index ef3d9d098..f2afacce1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.persist.BatchedPstmt;
 import io.ebeaninternal.server.persist.BatchedPstmtHolder;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 import io.ebeaninternal.server.util.Str;
 
 import javax.persistence.OptimisticLockException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
index f28805a01..18d41b757 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.persist.platform;
 
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 
 import java.sql.SQLException;
 import java.util.Collection;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
index dd06f4f29..59471c793 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.persist.platform;
 
 import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 
 import java.sql.SQLException;
 import java.util.Collection;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
index 7f62a855e..4c72f053e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.query;
 import io.ebeaninternal.api.SpiDbQueryPlan;
 import io.ebeaninternal.api.SpiQueryBindCapture;
 import io.ebeaninternal.api.SpiQueryPlan;
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCapture;
 
 import java.util.concurrent.locks.ReentrantLock;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 490949ab1..ad52e4eca 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -11,8 +11,8 @@ import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
-import io.ebeaninternal.server.type.DataBind;
-import io.ebeaninternal.server.type.DataBindCapture;
+import io.ebeaninternal.server.bind.DataBind;
+import io.ebeaninternal.server.bind.DataBindCapture;
 import io.ebeaninternal.server.type.RsetDataReader;
 import io.ebeaninternal.server.util.Md5;
 import io.ebeaninternal.server.util.Str;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
index 88818d687..ac39f6beb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java
@@ -5,7 +5,7 @@ import io.ebean.meta.QueryPlanRequest;
 import io.ebean.metric.TimedMetric;
 import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.transaction.TransactionManager;
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCapture;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index 01e64642f..d6833b98e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -14,7 +14,7 @@ import io.ebeaninternal.server.persist.Binder;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;
 import io.ebeaninternal.server.querydefn.OrmUpdateProperties;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 import io.ebeaninternal.server.util.BindParamsParser;
 
 import java.sql.Connection;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
index aecdfd841..1af72113c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLogger.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.query;
 
 import io.ebeaninternal.api.SpiDbQueryPlan;
 import io.ebeaninternal.api.SpiQueryPlan;
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCapture;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
index 70c0df722..3af04a56c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.query;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiDbQueryPlan;
 import io.ebeaninternal.api.SpiQueryPlan;
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCapture;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
index 45c3094af..2230d78cb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java
@@ -4,7 +4,7 @@ package io.ebeaninternal.server.query;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiDbQueryPlan;
 import io.ebeaninternal.api.SpiQueryPlan;
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCapture;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
index 8b5253c90..d51c1c351 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.query;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiDbQueryPlan;
 import io.ebeaninternal.api.SpiQueryPlan;
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCapture;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
index 2da90d98f..a8c3527a8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.query;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiDbQueryPlan;
 import io.ebeaninternal.api.SpiQueryPlan;
-import io.ebeaninternal.server.type.bindcapture.BindCapture;
+import io.ebeaninternal.server.bind.capture.BindCapture;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
index 5a9d5b392..d4db67d81 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.querydefn;
 import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.deploy.DeployParser;
 import io.ebeaninternal.server.persist.Binder;
-import io.ebeaninternal.server.type.DataBind;
+import io.ebeaninternal.server.bind.DataBind;
 
 import java.sql.SQLException;
 import java.util.LinkedHashMap;
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java
index 5ff1b2cc3..38aac295b 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java
@@ -1,6 +1,6 @@
 package io.ebeanservice.docstore.api.mapping;
 
-import io.ebeaninternal.server.text.json.PathStack;
+import io.ebeaninternal.server.json.PathStack;
 
 /**
  * Adapter for DocPropertyVisitor that does not do anything.
diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java
index 7511a8d0b..73c0e92f4 100644
--- a/ebean-core/src/main/java/module-info.java
+++ b/ebean-core/src/main/java/module-info.java
@@ -66,7 +66,7 @@ module io.ebean.core {
   exports io.ebeaninternal.server.query to io.ebean.test;
   exports io.ebeaninternal.server.querydefn to io.ebean.autotune, io.ebean.querybean, io.ebean.test, io.ebean.elastic;
   exports io.ebeaninternal.server.rawsql to io.ebean.test;
-  exports io.ebeaninternal.server.text.json to io.ebean.test, io.ebean.elastic;
+  exports io.ebeaninternal.server.json to io.ebean.test, io.ebean.elastic;
   exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test;
   exports io.ebeaninternal.server.transaction to io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.k8scache;
   exports io.ebeaninternal.server.util to io.ebean.querybean;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java
index 3e09e8b22..aef8e4ece 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.core.type.ScalarType;
+import io.ebeaninternal.server.bind.DataBind;
 import org.postgresql.util.PGobject;
 
 import java.sql.SQLException;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java
index 8db4b633e..5e8ee63a4 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTester.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.server.text.json.WriteJson;
+import io.ebeaninternal.server.json.WriteJson;
 
 import java.io.IOException;
 import java.io.StringWriter;
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java
index 6ffd81a10..9f2ed2c8c 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.platform.h2.H2Platform;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
-import io.ebeaninternal.server.text.json.DJsonScalar;
+import io.ebeaninternal.server.json.DJsonScalar;
 import io.ebeaninternal.server.type.DefaultTypeManager;
 import org.junit.jupiter.api.Test;
 
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java
index 8b41dad56..3a4f72c57 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java
@@ -6,7 +6,7 @@ import io.ebean.DB;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.text.json.WriteJson;
+import io.ebeaninternal.server.json.WriteJson;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.ResetBasicData;
diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java
index bbc918b6c..9a7acd1a5 100644
--- a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java
+++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java
@@ -7,7 +7,7 @@ import io.ebean.xtest.BaseTestCase;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.text.json.ReadJson;
+import io.ebeaninternal.server.json.ReadJson;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

From 9984b53070df56b27a7436d744b67858b060ea50 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 15:21:30 +1200
Subject: [PATCH 054/127] Refactor move BasicTypeConverter to ebean-core-type
 module

Doing this in preparation for moving the joda-type ScalarTypes into their own module
---
 .../ebean/core/type}/BasicTypeConverter.java  | 136 ++++--------------
 .../io/ebean/core/type/ScalarTypeUtils.java   |  89 ++++++++++++
 .../type/ScalarTypeUtilsUuidBytesTest.java    |  33 +++++
 .../generatedproperty/GeneratedCounter.java   |   2 +-
 .../server/query/DefaultSqlRow.java           |   2 +-
 .../server/type/ArrayElementConverter.java    |   2 +-
 .../server/type/DefaultTypeFactory.java       |   2 +-
 .../server/type/ScalarTypeBigDecimal.java     |   2 +-
 .../server/type/ScalarTypeBoolean.java        |   2 +-
 .../server/type/ScalarTypeByte.java           |   2 +-
 .../server/type/ScalarTypeCalendar.java       |   2 +-
 .../server/type/ScalarTypeChar.java           |   2 +-
 .../server/type/ScalarTypeCharArray.java      |   2 +-
 .../server/type/ScalarTypeDate.java           |   2 +-
 .../server/type/ScalarTypeDouble.java         |   2 +-
 .../server/type/ScalarTypeDuration.java       |   2 +-
 .../type/ScalarTypeDurationWithNanos.java     |   2 +-
 .../server/type/ScalarTypeFloat.java          |   2 +-
 .../server/type/ScalarTypeInteger.java        |   2 +-
 .../type/ScalarTypeJodaDateMidnight.java      |   2 +-
 .../server/type/ScalarTypeJodaDateTime.java   |   2 +-
 .../server/type/ScalarTypeJodaLocalDate.java  |   2 +-
 .../type/ScalarTypeJodaLocalDateTime.java     |   2 +-
 .../server/type/ScalarTypeJodaLocalTime.java  |   2 +-
 .../type/ScalarTypeJodaLocalTimeUTC.java      |   2 +-
 .../server/type/ScalarTypeLocalDate.java      |   2 +-
 .../server/type/ScalarTypeLocalTime.java      |   3 +-
 .../type/ScalarTypeLocalTimeWithNanos.java    |   2 +-
 .../server/type/ScalarTypeLong.java           |   2 +-
 .../server/type/ScalarTypeMathBigInteger.java |   4 +-
 .../server/type/ScalarTypeShort.java          |   2 +-
 .../server/type/ScalarTypeStringBase.java     |   2 +-
 .../server/type/ScalarTypeTime.java           |   2 +-
 .../server/type/ScalarTypeTimestamp.java      |   2 +-
 .../server/type/ScalarTypeUUIDBase.java       |   2 +-
 .../server/type/ScalarTypeUUIDBinary.java     |  97 ++-----------
 .../server/type/ScalarTypeUtilDate.java       |   2 +-
 .../server/type/ScalarTypeYear.java           |   2 +-
 .../server/type/ScalarTypeYearMonthDate.java  |   2 +-
 .../server/core/BasicTypeConverterTest.java   |   1 +
 40 files changed, 195 insertions(+), 234 deletions(-)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/core => ebean-core-type/src/main/java/io/ebean/core/type}/BasicTypeConverter.java (77%)
 create mode 100644 ebean-core-type/src/test/java/io/ebean/core/type/ScalarTypeUtilsUuidBytesTest.java

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java b/ebean-core-type/src/main/java/io/ebean/core/type/BasicTypeConverter.java
similarity index 77%
rename from ebean-core/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/BasicTypeConverter.java
index dbdf6b110..36a58b2de 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/BasicTypeConverter.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/BasicTypeConverter.java
@@ -1,8 +1,5 @@
-package io.ebeaninternal.server.core;
+package io.ebean.core.type;
 
-import io.ebeaninternal.server.type.ScalarTypeUUIDBinary;
-
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Timestamp;
@@ -14,14 +11,9 @@ import java.util.Calendar;
 import java.util.UUID;
 
 /**
- * Default implementation of TypeConverter.
- * <p>
- * Converts objects to the required type if required.
- * </p>
+ * Helper to converts objects to the basic types if required.
  */
-public final class BasicTypeConverter implements Serializable {
-
-  private static final long serialVersionUID = 7691463236204070311L;
+public final class BasicTypeConverter {
 
   /**
    * Type code for java.util.Calendar.
@@ -43,7 +35,6 @@ public final class BasicTypeConverter implements Serializable {
    * @param toDataType the dataType as per java.sql.Types.
    */
   public static Object convert(Object value, int toDataType) {
-
     try {
       switch (toDataType) {
         case UTIL_DATE: {
@@ -58,7 +49,8 @@ public final class BasicTypeConverter implements Serializable {
         case Types.INTEGER: {
           return toInteger(value);
         }
-        case Types.BIT: {
+        case Types.BIT:
+        case Types.BOOLEAN: {
           return toBoolean(value);
         }
         case Types.TINYINT: {
@@ -67,59 +59,42 @@ public final class BasicTypeConverter implements Serializable {
         case Types.SMALLINT: {
           return toShort(value);
         }
-        case Types.NUMERIC: {
-          return toBigDecimal(value);
-        }
+        case Types.NUMERIC:
         case Types.DECIMAL: {
           return toBigDecimal(value);
         }
         case Types.REAL: {
           return toFloat(value);
         }
-        case Types.DOUBLE: {
-          return toDouble(value);
-        }
+        case Types.DOUBLE:
         case Types.FLOAT: {
           return toDouble(value);
         }
-        case Types.BOOLEAN: {
-          return toBoolean(value);
-        }
         case Types.TIMESTAMP: {
           return toTimestamp(value);
         }
         case Types.DATE: {
           return toDate(value);
         }
-        case Types.VARCHAR: {
-          return toString(value);
-        }
+        case Types.VARCHAR:
         case Types.CHAR: {
           return toString(value);
         }
-        case Types.OTHER: {
-          return value;
-        }
-        case Types.JAVA_OBJECT: {
-          return value;
-        }
+        case Types.OTHER:
         case Types.BINARY:
         case Types.LONGVARBINARY:
-        case Types.BLOB: {
-          return value;
-        }
+        case Types.BLOB:
+        case Types.JAVA_OBJECT:
         case Types.LONGVARCHAR:
         case Types.CLOB: {
           return value;
         }
         default: {
-          String msg = "Unhandled data type [" + toDataType + "] converting [" + value + "]";
-          throw new RuntimeException(msg);
+          throw new RuntimeException("Unhandled data type - " + toDataType);
         }
       }
     } catch (ClassCastException e) {
-      String m = "ClassCastException converting to data type [" + toDataType + "] value [" + value + "]";
-      throw new RuntimeException(m);
+      throw new RuntimeException("ClassCastException converting to data type: " + toDataType + " value: " + value);
     }
   }
 
@@ -127,7 +102,6 @@ public final class BasicTypeConverter implements Serializable {
    * Convert the value to a String.
    */
   public static String toString(Object value) {
-
     if (value == null) {
       return null;
     }
@@ -137,7 +111,6 @@ public final class BasicTypeConverter implements Serializable {
     if (value instanceof char[]) {
       return String.valueOf((char[]) value);
     }
-
     return value.toString();
   }
 
@@ -145,8 +118,7 @@ public final class BasicTypeConverter implements Serializable {
   /**
    * Convert the value to a Boolean with an explicit String true value.
    */
-  public static Boolean toBoolean(Object value, String dbTrueValue) {
-
+  public static Boolean toBoolean(Object value, String trueValue) {
     if (value == null) {
       return null;
     }
@@ -156,8 +128,7 @@ public final class BasicTypeConverter implements Serializable {
     if (value instanceof Number) {
       return ((Number) value).intValue() == 1;
     }
-    String s = value.toString();
-    return s.equalsIgnoreCase(dbTrueValue);
+    return value.toString().equalsIgnoreCase(trueValue);
   }
 
   /**
@@ -165,14 +136,12 @@ public final class BasicTypeConverter implements Serializable {
    * "true" or "false".
    */
   public static Boolean toBoolean(Object value) {
-
     if (value == null) {
       return null;
     }
     if (value instanceof Boolean) {
       return (Boolean) value;
     }
-
     return Boolean.valueOf(value.toString());
   }
 
@@ -180,7 +149,6 @@ public final class BasicTypeConverter implements Serializable {
    * Convert the value to a UUID.
    */
   public static UUID toUUID(Object value, boolean optimizedBinary) {
-
     if (value == null) {
       return null;
     }
@@ -191,17 +159,15 @@ public final class BasicTypeConverter implements Serializable {
       return UUID.fromString((String) value);
     }
     if (value instanceof byte[]) {
-      return ScalarTypeUUIDBinary.convertFromBytes((byte[]) value, optimizedBinary);
+      return ScalarTypeUtils.uuidFromBytes((byte[]) value, optimizedBinary);
     }
     return UUID.fromString(value.toString());
   }
 
   /**
-   * convert the passed in object to a BigDecimal. It should be another
-   * numeric type.
+   * convert the passed in object to a BigDecimal. It should be another numeric type.
    */
   public static BigDecimal toBigDecimal(Object value) {
-
     if (value == null) {
       return null;
     }
@@ -212,7 +178,6 @@ public final class BasicTypeConverter implements Serializable {
   }
 
   public static Float toFloat(Object value) {
-
     if (value == null) {
       return null;
     }
@@ -226,7 +191,6 @@ public final class BasicTypeConverter implements Serializable {
   }
 
   public static Short toShort(Object value) {
-
     if (value == null) {
       return null;
     }
@@ -240,7 +204,6 @@ public final class BasicTypeConverter implements Serializable {
   }
 
   public static Byte toByte(Object value) {
-
     if (value == null) {
       return null;
     }
@@ -251,11 +214,9 @@ public final class BasicTypeConverter implements Serializable {
   }
 
   /**
-   * convert the passed in object to a Integer. It should be another numeric
-   * type.
+   * convert the passed in object to an Integer.
    */
   public static Integer toInteger(Object value) {
-
     if (value == null) {
       return null;
     }
@@ -269,10 +230,9 @@ public final class BasicTypeConverter implements Serializable {
   }
 
   /**
-   * Convert the object to a Long. It should be another numeric type.
+   * Convert the object to a Long.
    */
   public static Long toLong(Object value) {
-
     if (value == null) {
       return null;
     }
@@ -294,8 +254,7 @@ public final class BasicTypeConverter implements Serializable {
     return Long.valueOf(value.toString());
   }
 
-  public static BigInteger toMathBigInteger(Object value) {
-
+  public static BigInteger toBigInteger(Object value) {
     if (value == null) {
       return null;
     }
@@ -306,10 +265,9 @@ public final class BasicTypeConverter implements Serializable {
   }
 
   /**
-   * Convert the object to a Double. It should be another numberic type.
+   * Convert the object to a Double.
    */
   public static Double toDouble(Object value) {
-
     if (value == null) {
       return null;
     }
@@ -323,56 +281,42 @@ public final class BasicTypeConverter implements Serializable {
   }
 
   /**
-   * convert the passed in object to a Timestamp. It is expected to be a
-   * java.sql.Date really.
+   * convert the passed in object to a Timestamp.
    */
   public static Timestamp toTimestamp(Object value) {
-
     if (value == null) {
       return null;
     }
     if (value instanceof Timestamp) {
       return (Timestamp) value;
-
     } else if (value instanceof java.util.Date) {
       // no nanos here... so hopefully ok
       return new Timestamp(((java.util.Date) value).getTime());
-
     } else if (value instanceof Calendar) {
       return new Timestamp(((Calendar) value).getTime().getTime());
-
     } else if (value instanceof String) {
       return Timestamp.valueOf((String) value);
-
     } else if (value instanceof LocalDateTime) {
       return Timestamp.valueOf((LocalDateTime) value);
-
     } else if (value instanceof Number) {
       return new Timestamp(((Number) value).longValue());
-
     } else {
-      String msg = "Unable to convert [" + value.getClass().getName() + "] into a Timestamp.";
-      throw new RuntimeException(msg);
+      throw new RuntimeException("Unable to convert " + value);
     }
   }
 
   public static java.sql.Time toTime(Object value) {
-
     if (value == null) {
       return null;
     }
     if (value instanceof java.sql.Time) {
       return (java.sql.Time) value;
-
     } else if (value instanceof String) {
       return java.sql.Time.valueOf((String) value);
-
     } else if (value instanceof LocalTime) {
       return java.sql.Time.valueOf((LocalTime) value);
-
     } else {
-      String m = "Unable to convert [" + value.getClass().getName() + "] into a java.sql.Date.";
-      throw new RuntimeException(m);
+      throw new RuntimeException("Unable to convert " + value);
     }
   }
 
@@ -380,31 +324,23 @@ public final class BasicTypeConverter implements Serializable {
    * convert the passed in object to a java sql Date.
    */
   public static java.sql.Date toDate(Object value) {
-
     if (value == null) {
       return null;
     }
     if (value instanceof java.sql.Date) {
       return (java.sql.Date) value;
-
     } else if (value instanceof java.util.Date) {
       return new java.sql.Date(((java.util.Date) value).getTime());
-
     } else if (value instanceof Calendar) {
       return new java.sql.Date(((Calendar) value).getTime().getTime());
-
     } else if (value instanceof String) {
       return java.sql.Date.valueOf((String) value);
-
     } else if (value instanceof Number) {
       return new java.sql.Date(((Number) value).longValue());
-
     } else if (value instanceof LocalDate) {
-      return java.sql.Date.valueOf((LocalDate)value);
-
+      return java.sql.Date.valueOf((LocalDate) value);
     } else {
-      String m = "Unable to convert [" + value.getClass().getName() + "] into a java.sql.Date.";
-      throw new RuntimeException(m);
+      throw new RuntimeException("Unable to convert " + value);
     }
   }
 
@@ -412,7 +348,6 @@ public final class BasicTypeConverter implements Serializable {
    * convert the passed in object to a java sql Date.
    */
   public static java.util.Date toUtilDate(Object value) {
-
     if (value == null) {
       return null;
     }
@@ -420,26 +355,19 @@ public final class BasicTypeConverter implements Serializable {
       // loss of nanos precision
       return new java.util.Date(((java.sql.Timestamp) value).getTime());
     }
-    // DEVNOTE: strictly speaking do I need to convert a java.sql.Date to
-    // java.util.Date? equals() is symmetrical so perhaps this is not
-    // really required?
     if (value instanceof java.sql.Date) {
       return new java.util.Date(((java.sql.Date) value).getTime());
     }
     if (value instanceof java.util.Date) {
       return (java.util.Date) value;
-
     } else if (value instanceof Calendar) {
       return ((Calendar) value).getTime();
-
     } else if (value instanceof String) {
       return new java.util.Date(Timestamp.valueOf((String) value).getTime());
-
     } else if (value instanceof Number) {
       return new java.util.Date(((Number) value).longValue());
-
     } else {
-      throw new RuntimeException("Unable to convert [" + value.getClass().getName() + "] into a java.util.Date");
+      throw new RuntimeException("Unable to convert " + value);
     }
   }
 
@@ -447,37 +375,29 @@ public final class BasicTypeConverter implements Serializable {
    * convert the passed in object to a java sql Date.
    */
   public static Calendar toCalendar(Object value) {
-
     if (value == null) {
       return null;
     }
     if (value instanceof Calendar) {
       return (Calendar) value;
-
     } else if (value instanceof java.util.Date) {
       java.util.Date date = ((java.util.Date) value);
       return toCalendarFromDate(date);
-
     } else if (value instanceof String) {
       java.util.Date date = toUtilDate(value);
       return toCalendarFromDate(date);
-
     } else if (value instanceof Number) {
       long timeMillis = ((Number) value).longValue();
       java.util.Date date = new java.util.Date(timeMillis);
       return toCalendarFromDate(date);
-
     } else {
-      String m = "Unable to convert [" + value.getClass().getName() + "] into a java.util.Date";
-      throw new RuntimeException(m);
+      throw new RuntimeException("Unable to convert " + value);
     }
   }
 
   private static Calendar toCalendarFromDate(java.util.Date date) {
-
     Calendar cal = Calendar.getInstance();
     cal.setTime(date);
-
     return cal;
   }
 
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeUtils.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeUtils.java
index 1e7915316..efd4b6780 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeUtils.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeUtils.java
@@ -6,6 +6,7 @@ import java.time.Duration;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
+import java.util.UUID;
 
 /**
  * Utilities to aid in the translation of decimal types to/from multiple parts.
@@ -87,4 +88,92 @@ public final class ScalarTypeUtils {
   private static int extractNanosecondDecimal(BigDecimal value, long integer) {
     return value.subtract(new BigDecimal(integer)).multiply(ONE_BILLION).intValue();
   }
+
+
+  /**
+   * Convert from byte[] to UUID.
+   */
+  public static UUID uuidFromBytes(byte[] bytes, boolean optimized) {
+    int usableBytes = Math.min(bytes.length, 16);
+
+    // Need exactly 16 bytes - pad the input if not enough bytes are provided
+    // Use provided bytes in the least significant position; if more than 16 bytes are given,
+    // then use the first 16 bytes from the array;
+    byte[] barr = new byte[16];
+    for (int i = 15, j = usableBytes - 1; j >= 0; i--, j--) {
+      barr[i] = bytes[j];
+    }
+
+    long msb;
+    if (optimized) {
+      msb = ((long)barr[4] << 56) +          // XXXXXXXX-____-____-...
+        ((long)(barr[5] & 255) << 48) +  // -> put at end 4..7 of buf
+        ((long)(barr[6] & 255) << 40) +
+        ((long)(barr[7] & 255) << 32) +
+        ((long)(barr[2] & 255) << 24) +  // ________-XXXX-____-...
+        ((barr[3] & 255) << 16) +        // put at 2..3 in buf
+        ((barr[0] & 255) <<  8) +        // ________-____-XXXX-...
+        ((barr[1] & 255) <<  0);         // put at 0..1 in buf
+    } else {
+      msb = ((long)barr[0] << 56) +         // XXXXXXXX-____-____-...
+        ((long)(barr[1] & 255) << 48) +
+        ((long)(barr[2] & 255) << 40) +
+        ((long)(barr[3] & 255) << 32) +
+        ((long)(barr[4] & 255) << 24) + // ________-XXXX-____-...
+        ((barr[5] & 255) << 16) +
+        ((barr[6] & 255) <<  8) +       // ________-____-XXXX-...
+        ((barr[7] & 255) <<  0);
+    }
+    long lsb = ((long)barr[8] << 56) +
+      ((long)(barr[9] & 255) << 48) +
+      ((long)(barr[10] & 255) << 40) +
+      ((long)(barr[11] & 255) << 32) +
+      ((long)(barr[12] & 255) << 24) +
+      ((barr[13] & 255) << 16) +
+      ((barr[14] & 255) <<  8) +
+      ((barr[15] & 255) <<  0);
+
+    return new UUID(msb, lsb);
+  }
+
+  /**
+   * Convert from UUID to byte[].
+   */
+  public static byte[] uuidToBytes(UUID uuid, boolean optimized) {
+    byte[] ret = new byte[16];
+    long l = uuid.getMostSignificantBits();
+
+    if (optimized) {
+      ret[0] = (byte) (l >>> 8); // was 6/7
+      ret[1] = (byte) (l >>> 0);
+
+      ret[2] = (byte) (l >>> 24); // was 4/5
+      ret[3] = (byte) (l >>> 16);
+
+      ret[4] = (byte) (l >>> 56); // was 0..3
+      ret[5] = (byte) (l >>> 48);
+      ret[6] = (byte) (l >>> 40);
+      ret[7] = (byte) (l >>> 32);
+    } else {
+      ret[0] = (byte) (l >>> 56);
+      ret[1] = (byte) (l >>> 48);
+      ret[2] = (byte) (l >>> 40);
+      ret[3] = (byte) (l >>> 32);
+      ret[4] = (byte) (l >>> 24);
+      ret[5] = (byte) (l >>> 16);
+      ret[6] = (byte) (l >>> 8);
+      ret[7] = (byte) (l >>> 0);
+    }
+    l = uuid.getLeastSignificantBits();
+    ret[8] = (byte) (l >>> 56);
+    ret[9] = (byte) (l >>> 48);
+    ret[10] = (byte) (l >>> 40);
+    ret[11] = (byte) (l >>> 32);
+    ret[12] = (byte) (l >>> 24);
+    ret[13] = (byte) (l >>> 16);
+    ret[14] = (byte) (l >>> 8);
+    ret[15] = (byte) (l >>> 0);
+
+    return ret;
+  }
 }
diff --git a/ebean-core-type/src/test/java/io/ebean/core/type/ScalarTypeUtilsUuidBytesTest.java b/ebean-core-type/src/test/java/io/ebean/core/type/ScalarTypeUtilsUuidBytesTest.java
new file mode 100644
index 000000000..851aa9900
--- /dev/null
+++ b/ebean-core-type/src/test/java/io/ebean/core/type/ScalarTypeUtilsUuidBytesTest.java
@@ -0,0 +1,33 @@
+package io.ebean.core.type;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ScalarTypeUtilsUuidBytesTest {
+
+  @Test
+  void testConversion() {
+    UUID id = UUID.randomUUID();
+
+    byte[] bytes = ScalarTypeUtils.uuidToBytes(id, false);
+    assertEquals(16, bytes.length);
+
+    UUID id2 = ScalarTypeUtils.uuidFromBytes(bytes, false);
+    assertEquals(id, id2);
+  }
+
+  @Test
+  void testConversionOptimized() {
+    UUID id = UUID.randomUUID();
+
+    byte[] bytes = ScalarTypeUtils.uuidToBytes(id, true);
+    assertEquals(16, bytes.length);
+
+    UUID id2 = ScalarTypeUtils.uuidFromBytes(bytes, true);
+    assertEquals(id, id2);
+  }
+
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
index 38f0085fb..d4ee1f595 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.deploy.generatedproperty;
 
 import io.ebean.bean.EntityBean;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 import io.ebeaninternal.server.deploy.BeanProperty;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java
index e38d9d7d7..ad9902a2d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.query;
 
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.math.BigDecimal;
 import java.sql.Date;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
index 5617e752c..12e5e6b17 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java
@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.math.BigDecimal;
 import java.util.UUID;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
index f0a700670..af89523ab 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeFactory.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.type;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarType;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.math.BigInteger;
 import java.sql.Types;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index 9dedf97e7..223e26d05 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
index 24c6b074a..62aa6c553 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
@@ -7,7 +7,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
index d0e9e6c96..e01bc625e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
@@ -7,7 +7,7 @@ import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
index 50ee64539..8ac56e517 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.type;
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.ScalarTypeBaseDateTime;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.sql.Date;
 import java.sql.SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
index c7d9760b7..bf181dd2e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.type;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarTypeBaseVarchar;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.sql.SQLException;
 import java.sql.Types;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
index 13a06d931..ff74e0cfe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarTypeBaseVarchar;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.IOException;
 import java.sql.SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
index eaf883cff..bc4ac8aad 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
@@ -4,7 +4,7 @@ import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarTypeBaseDate;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.sql.Date;
 import java.sql.SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
index 97cd742dd..3fe5deba0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
index 2e5a29996..c73347add 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
@@ -3,7 +3,7 @@ package io.ebeaninternal.server.type;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.*;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
index 9ba27cc6c..f298debd8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.math.BigDecimal;
 import java.sql.SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
index 61ba766f0..facea6618 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index b9d621679..aea3b8d16 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
index 03c4e5897..78a625327 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarTypeBaseDate;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 import org.joda.time.DateMidnight;
 
 import java.sql.Date;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
index 0eea396f9..c9d61bd1e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarTypeBaseDateTime;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 import org.joda.time.DateTime;
 
 import java.sql.Timestamp;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index 92a17a8f7..163775fb0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -8,7 +8,7 @@ import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
 
 import io.ebean.config.JsonConfig;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 /**
  * ScalarType for Joda LocalDate. This maps to a JDBC Date.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
index 07d289c4d..348ce28d6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarTypeBaseDateTime;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 import org.joda.time.LocalDateTime;
 
 import java.sql.Timestamp;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
index 94134db9f..072046b0f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
@@ -7,7 +7,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalTime;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
index e19af274e..81edfe24a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalTime;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
index 0461faddc..3176a1886 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
@@ -9,7 +9,7 @@ import java.time.ZonedDateTime;
 
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarTypeBaseDate;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 /**
  * ScalarType for java.time.LocalDate. This maps to a JDBC Date.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
index 6711de132..d43f0e6cb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTime.java
@@ -6,8 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebean.text.TextException;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
index 237c2f633..aa6adb996 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.sql.SQLException;
 import java.sql.Types;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
index daff9db26..b04a0a936 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index ce8a87dbe..29ee7316c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -49,7 +49,7 @@ final class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
 
   @Override
   public BigInteger toBeanType(Object value) {
-    return BasicTypeConverter.toMathBigInteger(value);
+    return BasicTypeConverter.toBigInteger(value);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
index 75619af5f..059b68a1a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
index 6fffec61e..4b260e096 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
index eb017211d..a301da7ed 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
index 0f2a45402..1efa9ad6e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
@@ -4,7 +4,7 @@ import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarTypeBaseDateTime;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.sql.SQLException;
 import java.sql.Timestamp;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
index dda89c9cc..0e41ddfc7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
index e379ddc2c..a2658dbf5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
@@ -2,7 +2,8 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
+import io.ebean.core.type.ScalarTypeUtils;
 
 import java.sql.SQLException;
 import java.sql.Types;
@@ -24,7 +25,7 @@ public final class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
 
   @Override
   public Object toJdbcType(Object value) {
-    return convertToBytes(value, optimized);
+    return convertToBytes((UUID)value, optimized);
   }
 
   @Override
@@ -51,98 +52,16 @@ public final class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
     if (bytes == null) {
       return null;
     } else {
-      return convertFromBytes(bytes, optimized);
+      return ScalarTypeUtils.uuidFromBytes(bytes, optimized);
     }
   }
 
-  /**
-   * Convert from byte[] to UUID.
-   */
-  public static UUID convertFromBytes(byte[] bytes, boolean optimized) {
-
-    int usableBytes = Math.min(bytes.length, 16);
-
-    // Need exactly 16 bytes - pad the input if not enough bytes are provided
-    // Use provided bytes in the least significant position; if more than 16 bytes are given,
-    // then use the first 16 bytes from the array;
-    byte[] barr = new byte[16];
-    for (int i = 15, j = usableBytes - 1; j >= 0; i--, j--) {
-      barr[i] = bytes[j];
-    }
-
-    long msb;
-    if (optimized) {
-      msb = ((long)barr[4] << 56) +          // XXXXXXXX-____-____-...
-            ((long)(barr[5] & 255) << 48) +  // -> put at end 4..7 of buf
-            ((long)(barr[6] & 255) << 40) +
-            ((long)(barr[7] & 255) << 32) +
-            ((long)(barr[2] & 255) << 24) +  // ________-XXXX-____-...
-            ((barr[3] & 255) << 16) +        // put at 2..3 in buf
-            ((barr[0] & 255) <<  8) +        // ________-____-XXXX-...
-            ((barr[1] & 255) <<  0);         // put at 0..1 in buf
-    } else {
-      msb = ((long)barr[0] << 56) +         // XXXXXXXX-____-____-...
-            ((long)(barr[1] & 255) << 48) +
-            ((long)(barr[2] & 255) << 40) +
-            ((long)(barr[3] & 255) << 32) +
-            ((long)(barr[4] & 255) << 24) + // ________-XXXX-____-...
-            ((barr[5] & 255) << 16) +
-            ((barr[6] & 255) <<  8) +       // ________-____-XXXX-...
-            ((barr[7] & 255) <<  0);
-    }
-    long lsb = ((long)barr[8] << 56) +
-        ((long)(barr[9] & 255) << 48) +
-        ((long)(barr[10] & 255) << 40) +
-        ((long)(barr[11] & 255) << 32) +
-        ((long)(barr[12] & 255) << 24) +
-        ((barr[13] & 255) << 16) +
-        ((barr[14] & 255) <<  8) +
-        ((barr[15] & 255) <<  0);
-
-    return new UUID(msb, lsb);
+  static UUID convertFromBytes(byte[] bytes, boolean optimized) {
+    return ScalarTypeUtils.uuidFromBytes(bytes, optimized);
   }
 
-  /**
-   * Convert from UUID to byte[].
-   */
-  public static byte[] convertToBytes(Object value, boolean optimized) {
-
-    UUID uuid = (UUID) value;
-    byte[] ret = new byte[16];
-    long l = uuid.getMostSignificantBits();
-
-    if (optimized) {
-      ret[0] = (byte) (l >>> 8); // was 6/7
-      ret[1] = (byte) (l >>> 0);
-
-      ret[2] = (byte) (l >>> 24); // was 4/5
-      ret[3] = (byte) (l >>> 16);
-
-      ret[4] = (byte) (l >>> 56); // was 0..3
-      ret[5] = (byte) (l >>> 48);
-      ret[6] = (byte) (l >>> 40);
-      ret[7] = (byte) (l >>> 32);
-    } else {
-      ret[0] = (byte) (l >>> 56);
-      ret[1] = (byte) (l >>> 48);
-      ret[2] = (byte) (l >>> 40);
-      ret[3] = (byte) (l >>> 32);
-      ret[4] = (byte) (l >>> 24);
-      ret[5] = (byte) (l >>> 16);
-      ret[6] = (byte) (l >>> 8);
-      ret[7] = (byte) (l >>> 0);
-    }
-    l = uuid.getLeastSignificantBits();
-    ret[8] = (byte) (l >>> 56);
-    ret[9] = (byte) (l >>> 48);
-    ret[10] = (byte) (l >>> 40);
-    ret[11] = (byte) (l >>> 32);
-    ret[12] = (byte) (l >>> 24);
-    ret[13] = (byte) (l >>> 16);
-    ret[14] = (byte) (l >>> 8);
-    ret[15] = (byte) (l >>> 0);
-
-    return ret;
+  static byte[] convertToBytes(UUID value, boolean optimized) {
+    return ScalarTypeUtils.uuidToBytes(value, optimized);
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index ae8d670d5..fabac9bae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -5,7 +5,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebean.core.type.ScalarTypeBaseDateTime;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.sql.SQLException;
 import java.sql.Timestamp;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
index a001ebe08..9c60047f5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
@@ -6,7 +6,7 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarTypeBase;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
index c662c8ca0..c0b81452c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarTypeBaseDate;
-import io.ebeaninternal.server.core.BasicTypeConverter;
+import io.ebean.core.type.BasicTypeConverter;
 
 import java.sql.Date;
 import java.sql.Timestamp;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java
index c2f2c91b2..56bbeb9f7 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.core;
 
+import io.ebean.core.type.BasicTypeConverter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

From b7e62df371eeea69ae142989a7ee812b51ca677e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 17:32:31 +1200
Subject: [PATCH 055/127] Refactor extract ebean-joda-time module - move joda
 ScalarTypes

Moves the joda-time ScalarTypes into a new ebean-joda-time module. Include
the ebean-joda-time module in the classpath, and the extra types will be
service loaded (by DefaultTypeManager).
---
 .../server/type/DefaultTypeManager.java       | 33 +-------------
 .../org/tests/model/basic/TJodaEntity.java    | 32 --------------
 ebean-joda-time/pom.xml                       | 44 +++++++++++++++++++
 .../ebean/joda/time/JodaExtraTypeFactory.java | 40 +++++++++++++++++
 .../time}/ScalarTypeJodaDateMidnight.java     |  2 +-
 .../joda/time}/ScalarTypeJodaDateTime.java    |  2 +-
 .../joda/time}/ScalarTypeJodaLocalDate.java   |  2 +-
 .../time}/ScalarTypeJodaLocalDateNative.java  |  2 +-
 .../time}/ScalarTypeJodaLocalDateTime.java    |  2 +-
 .../joda/time}/ScalarTypeJodaLocalTime.java   |  2 +-
 .../time}/ScalarTypeJodaLocalTimeUTC.java     |  2 +-
 .../joda/time}/ScalarTypeJodaPeriod.java      |  2 +-
 .../src/main/java/module-info.java            |  9 ++++
 .../io.ebean.core.type.ExtraTypeFactory       |  1 +
 .../time}/ScalarTypeJodaLocalDateTest.java    | 12 +----
 .../ScalarTypeJodaLocalDateTimeTest.java      |  2 +-
 .../time}/ScalarTypeJodaLocalTimeTest.java    | 18 +-------
 .../joda/time}/ScalarTypeJodaPeriodTest.java  |  2 +-
 ebean-test/pom.xml                            |  9 +++-
 .../java/org/tests/basic/TestJodaType.java    | 25 ++++++++---
 .../org/tests/model/basic/TJodaEntity.java    | 10 +++++
 pom.xml                                       |  1 +
 22 files changed, 146 insertions(+), 108 deletions(-)
 delete mode 100644 ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java
 create mode 100644 ebean-joda-time/pom.xml
 create mode 100644 ebean-joda-time/src/main/java/io/ebean/joda/time/JodaExtraTypeFactory.java
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-joda-time/src/main/java/io/ebean/joda/time}/ScalarTypeJodaDateMidnight.java (97%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-joda-time/src/main/java/io/ebean/joda/time}/ScalarTypeJodaDateTime.java (97%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-joda-time/src/main/java/io/ebean/joda/time}/ScalarTypeJodaLocalDate.java (97%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-joda-time/src/main/java/io/ebean/joda/time}/ScalarTypeJodaLocalDateNative.java (96%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-joda-time/src/main/java/io/ebean/joda/time}/ScalarTypeJodaLocalDateTime.java (97%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-joda-time/src/main/java/io/ebean/joda/time}/ScalarTypeJodaLocalTime.java (98%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-joda-time/src/main/java/io/ebean/joda/time}/ScalarTypeJodaLocalTimeUTC.java (97%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-joda-time/src/main/java/io/ebean/joda/time}/ScalarTypeJodaPeriod.java (94%)
 create mode 100644 ebean-joda-time/src/main/java/module-info.java
 create mode 100644 ebean-joda-time/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory
 rename {ebean-core/src/test/java/io/ebeaninternal/server/type => ebean-joda-time/src/test/java/io/ebean/joda/time}/ScalarTypeJodaLocalDateTest.java (81%)
 rename {ebean-core/src/test/java/io/ebeaninternal/server/type => ebean-joda-time/src/test/java/io/ebean/joda/time}/ScalarTypeJodaLocalDateTimeTest.java (96%)
 rename {ebean-core/src/test/java/io/ebeaninternal/server/type => ebean-joda-time/src/test/java/io/ebean/joda/time}/ScalarTypeJodaLocalTimeTest.java (71%)
 rename {ebean-core/src/test/java/io/ebeaninternal/server/type => ebean-joda-time/src/test/java/io/ebean/joda/time}/ScalarTypeJodaPeriodTest.java (96%)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 8bb9680e7..49c03dc57 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -147,7 +147,6 @@ public final class DefaultTypeManager implements TypeManager {
 
     initialiseStandard(config);
     initialiseJavaTimeTypes(config);
-    initialiseJodaTypes(config);
     initialiseJacksonTypes(config);
     loadTypesFromProviders(config, objectMapper);
     loadGeoTypeBinder(config);
@@ -261,7 +260,7 @@ public final class DefaultTypeManager implements TypeManager {
     if (found == null) {
       if (type.getName().equals("org.joda.time.LocalTime")) {
         throw new IllegalStateException(
-          "ScalarType of Joda LocalTime not defined. You need to set DatabaseConfig.jodaLocalTimeMode to"
+          "ScalarType of Joda LocalTime not defined. 1) Check ebean-joda-time dependency has been added  2) Check DatabaseConfig.jodaLocalTimeMode is set to"
             + " either 'normal' or 'utc'.  UTC is the old mode using UTC timezone but local time zone is now preferred as 'normal' mode.");
       }
       found = checkInheritedTypes(type);
@@ -798,36 +797,6 @@ public final class DefaultTypeManager implements TypeManager {
     logicalMap.putIfAbsent(clazz.getSimpleName(), scalarType);
   }
 
-  /**
-   * Detect if Joda classes are in the classpath and if so register the Joda data types.
-   */
-  @SuppressWarnings("deprecation")
-  private void initialiseJodaTypes(DatabaseConfig config) {
-    // detect if Joda classes are in the classpath
-    if (config.getClassLoadConfig().isJodaTimePresent()) {
-      // Joda classes are in the classpath so register the types
-      log.log(DEBUG, "Registering Joda data types");
-      addType(LocalDateTime.class, new ScalarTypeJodaLocalDateTime(jsonDateTime));
-      addType(DateTime.class, new ScalarTypeJodaDateTime(jsonDateTime));
-      if (config.getDatabasePlatform().supportsNativeJavaTime()) {
-        addType(LocalDate.class, new ScalarTypeJodaLocalDateNative(jsonDate));
-      } else {
-        addType(LocalDate.class, new ScalarTypeJodaLocalDate(jsonDate));
-      }
-      addType(org.joda.time.DateMidnight.class, new ScalarTypeJodaDateMidnight(jsonDate));
-      addType(org.joda.time.Period.class, new ScalarTypeJodaPeriod());
-
-      String jodaLocalTimeMode = config.getJodaLocalTimeMode();
-      if ("normal".equalsIgnoreCase(jodaLocalTimeMode)) {
-        // use the expected/normal local time zone
-        addType(LocalTime.class, new ScalarTypeJodaLocalTime());
-      } else if ("utc".equalsIgnoreCase(jodaLocalTimeMode)) {
-        // use the old UTC based
-        addType(LocalTime.class, new ScalarTypeJodaLocalTimeUTC());
-      }
-    }
-  }
-
   /**
    * Register all the standard types supported. This is the standard JDBC types
    * plus some other common types such as java.util.Date and java.util.Calendar.
diff --git a/ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java b/ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java
deleted file mode 100644
index 311a20424..000000000
--- a/ebean-core/src/test/java/org/tests/model/basic/TJodaEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.tests.model.basic;
-
-import org.joda.time.LocalTime;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class TJodaEntity {
-
-  @Id
-  Integer id;
-
-  LocalTime localTime;
-
-  public Integer getId() {
-    return id;
-  }
-
-  public void setId(Integer id) {
-    this.id = id;
-  }
-
-  public LocalTime getLocalTime() {
-    return localTime;
-  }
-
-  public void setLocalTime(LocalTime localTime) {
-    this.localTime = localTime;
-  }
-
-}
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
new file mode 100644
index 000000000..4c082cdae
--- /dev/null
+++ b/ebean-joda-time/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.8.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>ebean-joda-time</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core-type</artifactId>
+      <version>13.8.2-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.11.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+</project>
diff --git a/ebean-joda-time/src/main/java/io/ebean/joda/time/JodaExtraTypeFactory.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/JodaExtraTypeFactory.java
new file mode 100644
index 000000000..c4883368e
--- /dev/null
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/JodaExtraTypeFactory.java
@@ -0,0 +1,40 @@
+package io.ebean.joda.time;
+
+import io.ebean.config.DatabaseConfig;
+import io.ebean.core.type.ExtraTypeFactory;
+import io.ebean.core.type.ScalarType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Register the Joda-Time ScalarType support.
+ */
+public class JodaExtraTypeFactory implements ExtraTypeFactory {
+
+  @Override
+  public List<? extends ScalarType<?>> createTypes(DatabaseConfig config, Object objectMapper) {
+    var jsonDateTime = config.getJsonDateTime();
+    var jsonDate = config.getJsonDate();
+
+    List<ScalarType<?>> types = new ArrayList<>();
+    types.add(new ScalarTypeJodaLocalDateTime(jsonDateTime));
+    types.add(new ScalarTypeJodaDateTime(jsonDateTime));
+    if (config.getDatabasePlatform().supportsNativeJavaTime()) {
+      types.add(new ScalarTypeJodaLocalDateNative(jsonDate));
+    } else {
+      types.add(new ScalarTypeJodaLocalDate(jsonDate));
+    }
+    types.add(new ScalarTypeJodaDateMidnight(jsonDate));
+    types.add(new ScalarTypeJodaPeriod());
+    String jodaLocalTimeMode = config.getJodaLocalTimeMode();
+    if ("normal".equalsIgnoreCase(jodaLocalTimeMode)) {
+      // use the expected/normal local time zone
+      types.add(new ScalarTypeJodaLocalTime());
+    } else if ("utc".equalsIgnoreCase(jodaLocalTimeMode)) {
+      // use the old UTC based
+      types.add(new ScalarTypeJodaLocalTimeUTC());
+    }
+    return types;
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java
similarity index 97%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
rename to ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java
index 78a625327..e2520906d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateMidnight.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarTypeBaseDate;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateTime.java
similarity index 97%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
rename to ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateTime.java
index c9d61bd1e..594795f2b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaDateTime.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarTypeBaseDateTime;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDate.java
similarity index 97%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
rename to ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDate.java
index 163775fb0..fa10d20e9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDate.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import java.sql.Date;
 import java.sql.Types;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateNative.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateNative.java
similarity index 96%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateNative.java
rename to ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateNative.java
index 328cccabb..b25a9609f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateNative.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateNative.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import java.sql.SQLException;
 import java.sql.Types;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java
similarity index 97%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
rename to ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java
index 348ce28d6..3b0ec373b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTime.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.ScalarTypeBaseDateTime;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTime.java
similarity index 98%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
rename to ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTime.java
index 072046b0f..9e62b683a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTime.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTime.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeUTC.java
similarity index 97%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
rename to ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeUTC.java
index 81edfe24a..163c1f7ec 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeUTC.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaPeriod.java
similarity index 94%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
rename to ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaPeriod.java
index abe0c9da3..27914fc1c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
+++ b/ebean-joda-time/src/main/java/io/ebean/joda/time/ScalarTypeJodaPeriod.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import io.ebean.core.type.ScalarTypeBaseVarchar;
 import org.joda.time.Period;
diff --git a/ebean-joda-time/src/main/java/module-info.java b/ebean-joda-time/src/main/java/module-info.java
new file mode 100644
index 000000000..941aeb4bd
--- /dev/null
+++ b/ebean-joda-time/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+
+module io.ebean.joda.time {
+
+  requires io.ebean.core.type;
+  requires org.joda.time;
+  requires com.fasterxml.jackson.core;
+
+  provides io.ebean.core.type.ExtraTypeFactory with io.ebean.joda.time.JodaExtraTypeFactory;
+}
diff --git a/ebean-joda-time/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory b/ebean-joda-time/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory
new file mode 100644
index 000000000..3f23de83c
--- /dev/null
+++ b/ebean-joda-time/src/main/resources/META-INF/services/io.ebean.core.type.ExtraTypeFactory
@@ -0,0 +1 @@
+io.ebean.joda.time.JodaExtraTypeFactory
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTest.java
similarity index 81%
rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
rename to ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTest.java
index 0d3719f8a..94ad4f855 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java
+++ b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTest.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import io.ebean.config.JsonConfig;
 import org.joda.time.LocalDate;
@@ -78,15 +78,5 @@ public class ScalarTypeJodaLocalDateTest {
     assertThat(beanType).isEqualTo(localDate);
   }
 
-  @Test
-  public void json() throws IOException {
 
-    LocalDate val = new LocalDate(2019, 5, 9);
-
-    JsonTester<LocalDate> jsonMillis = new JsonTester<>(type);
-    assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557360000000}");
-
-    JsonTester<LocalDate> jsonIso = new JsonTester<>(new ScalarTypeJodaLocalDate(JsonConfig.Date.ISO8601) );
-    assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}");
-  }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTimeTest.java
similarity index 96%
rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java
rename to ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTimeTest.java
index 933176623..ed1232aa9 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java
+++ b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalDateTimeTest.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import io.ebean.config.JsonConfig;
 import org.joda.time.DateTimeZone;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeTest.java
similarity index 71%
rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java
rename to ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeTest.java
index 9eaf9b452..9e8b9f161 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeTest.java
+++ b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaLocalTimeTest.java
@@ -1,12 +1,9 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
-import io.ebean.DB;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDateTime;
 import org.joda.time.LocalTime;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.tests.model.basic.TJodaEntity;
 
 import java.sql.Timestamp;
 
@@ -47,18 +44,5 @@ public class ScalarTypeJodaLocalTimeTest {
 
   }
 
-  @Test
-  public void toJson() {
 
-    LocalTime now = new LocalTime();
-
-    TJodaEntity bean = new TJodaEntity();
-    bean.setId(42);
-    bean.setLocalTime(now);
-
-    String json = DB.json().toJson(bean);
-    TJodaEntity bean1 = DB.json().toBean(TJodaEntity.class, json);
-
-    Assertions.assertEquals(bean1.getLocalTime(), now);
-  }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaPeriodTest.java
similarity index 96%
rename from ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java
rename to ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaPeriodTest.java
index 32edd86b2..12f1f3496 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriodTest.java
+++ b/ebean-joda-time/src/test/java/io/ebean/joda/time/ScalarTypeJodaPeriodTest.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.joda.time;
 
 import org.joda.time.Period;
 import org.junit.jupiter.api.Test;
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 55c78b52b..e38598080 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -102,6 +102,13 @@
 
     <!-- Test dependencies -->
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-joda-time</artifactId>
+      <version>13.8.2-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
@@ -148,7 +155,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.9.7</version>
+      <version>2.11.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java
index c5ed8b008..945572787 100644
--- a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java
+++ b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java
@@ -6,18 +6,19 @@ import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
+import org.joda.time.LocalDate;
 import org.joda.time.LocalTime;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.TJodaEntity;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class TestJodaType extends BaseTestCase {
+class TestJodaType extends BaseTestCase {
 
   @Test
-  public void test() {
-
+  void test() {
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
     BeanDescriptor<TJodaEntity> beanDescriptor = server.descriptor(TJodaEntity.class);
     BeanProperty beanProperty = beanDescriptor.beanProperty("localTime");
@@ -27,8 +28,7 @@ public class TestJodaType extends BaseTestCase {
   }
 
   @Test
-  public void test_insert_find() {
-
+  void test_insert_find() {
     LocalTime now = new LocalTime().withMillisOfSecond(0);
 
     TJodaEntity bean = new TJodaEntity();
@@ -40,4 +40,19 @@ public class TestJodaType extends BaseTestCase {
     assertThat(foundBean.getLocalTime()).isEqualTo(bean.getLocalTime());
   }
 
+  @Test
+  void toJson() {
+    LocalTime now = new LocalTime();
+
+    TJodaEntity bean = new TJodaEntity();
+    bean.setId(42);
+    bean.setLocalTime(now);
+    bean.setLocalDate(LocalDate.parse("2022-04-07"));
+
+    String json = DB.json().toJson(bean);
+    TJodaEntity bean1 = DB.json().toBean(TJodaEntity.class, json);
+
+    assertEquals(bean1.getLocalTime(), now);
+    assertEquals(bean1.getLocalDate(), LocalDate.parse("2022-04-07"));
+  }
 }
diff --git a/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java
index 311a20424..c20e06772 100644
--- a/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java
+++ b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java
@@ -1,5 +1,6 @@
 package org.tests.model.basic;
 
+import org.joda.time.LocalDate;
 import org.joda.time.LocalTime;
 
 import javax.persistence.Entity;
@@ -12,6 +13,7 @@ public class TJodaEntity {
   Integer id;
 
   LocalTime localTime;
+  LocalDate localDate;
 
   public Integer getId() {
     return id;
@@ -29,4 +31,12 @@ public class TJodaEntity {
     this.localTime = localTime;
   }
 
+  public LocalDate getLocalDate() {
+    return localDate;
+  }
+
+  public TJodaEntity setLocalDate(LocalDate localDate) {
+    this.localDate = localDate;
+    return this;
+  }
 }
diff --git a/pom.xml b/pom.xml
index 1bc7781db..c764791df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
     <module>ebean-redis</module>
     <module>platforms</module>
     <module>composites</module>
+    <module>ebean-joda-time</module>
     <module>ebean-csv-reader</module>
     <!--    <module>ebean-kotlin</module>-->
 

From 3f2d0ef5202fb23008586cf365af2fca574d6d6e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 26 Aug 2022 17:49:01 +1200
Subject: [PATCH 056/127] Bump to 13.9.0-SNAPSHOT

---
 composites/ebean-clickhouse/pom.xml | 10 +++++-----
 composites/ebean-cockroach/pom.xml  | 10 +++++-----
 composites/ebean-db2/pom.xml        | 10 +++++-----
 composites/ebean-h2/pom.xml         | 10 +++++-----
 composites/ebean-hana/pom.xml       | 10 +++++-----
 composites/ebean-mariadb/pom.xml    | 10 +++++-----
 composites/ebean-mysql/pom.xml      | 10 +++++-----
 composites/ebean-nuodb/pom.xml      | 10 +++++-----
 composites/ebean-oracle/pom.xml     | 10 +++++-----
 composites/ebean-postgres/pom.xml   | 10 +++++-----
 composites/ebean-sqlite/pom.xml     | 10 +++++-----
 composites/ebean-sqlserver/pom.xml  | 10 +++++-----
 composites/ebean-yugabyte/pom.xml   | 10 +++++-----
 composites/ebean/pom.xml            | 10 +++++-----
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  6 +++---
 ebean-bom/pom.xml                   | 30 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 14 +++++++-------
 ebean-csv-reader/pom.xml            |  8 ++++----
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 10 +++++-----
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-kotlin/pom.xml                |  6 +++---
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 +++++-----
 ebean-redis/pom.xml                 | 12 ++++++------
 ebean-test/pom.xml                  | 12 ++++++------
 kotlin-querybean-generator/pom.xml  | 10 +++++-----
 platforms/all/pom.xml               | 28 +++++++++++++--------------
 platforms/clickhouse/pom.xml        |  4 ++--
 platforms/db2/pom.xml               |  4 ++--
 platforms/h2/pom.xml                |  4 ++--
 platforms/hana/pom.xml              |  4 ++--
 platforms/hsqldb/pom.xml            |  4 ++--
 platforms/mariadb/pom.xml           |  6 +++---
 platforms/mysql/pom.xml             |  4 ++--
 platforms/nuodb/pom.xml             |  4 ++--
 platforms/oracle/pom.xml            |  4 ++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  4 ++--
 platforms/sqlanywhere/pom.xml       |  4 ++--
 platforms/sqlite/pom.xml            |  4 ++--
 platforms/sqlserver/pom.xml         |  4 ++--
 pom.xml                             |  2 +-
 querybean-generator/pom.xml         |  2 +-
 tests/test-java16/pom.xml           |  6 +++---
 tests/test-kotlin/pom.xml           |  4 ++--
 50 files changed, 193 insertions(+), 193 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index d6bd4993e..04ba5def2 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index a3d90b6ce..86ea4941b 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index cfa595dad..d9f339091 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 6957ec69b..d16215f05 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index e4691ba4b..d28fa4c62 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 1fb2de6b9..db7d43f25 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 5eb3ce012..87efb3966 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 59448dd73..b320113a9 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 9c6af9c74..80a535dea 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 01fe240fc..838fdd76b 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index a7063e413..6e3028c6b 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 2e03fbfb1..255a07b22 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 5907aa7c8..2e2ef0ef0 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 7a92394e4..899f78425 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/pom.xml b/composites/pom.xml
index c137c8cd0..207a70fd6 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 8f24e0e2c..63e4472ce 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 8786b7890..009e64c55 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 0fdad6cdb..8b64db6af 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,88 +89,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.8.2-SNAPSHOT</version>
+        <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 495945250..143bbd467 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index d9c91e99b..799ad94e2 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index 769c4e592..d43f72bfe 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -16,21 +16,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 462021f3d..ca445ed4f 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 56651d1ad..991e02f93 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 6a73bfad1..32706dd19 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <scm>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index 4c082cdae..f5a151905 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index 63f6bef4a..331b89904 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 2420cd104..690e25dac 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 09c1ab9ac..43d3ed2e5 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 4db6c0a3c..3bba23f67 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index e38598080..084b105f1 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -105,14 +105,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 95111a1b9..58ac22f63 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index f24522379..57915acfc 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,67 +14,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index b3625bfdc..d7fcbc8ec 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 77cbca755..206b36f19 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 336c3a751..08025557d 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index ed91baa0c..1c34f6783 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index c96d63348..47b39fb57 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index ace67db3a..50fd3f86b 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,13 +14,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index e211ddbb8..49149656a 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index e9d6cabc1..89beb3528 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index b9a24a1cb..75da31c1d 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 2f5dc658d..3eb1bcdfb 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 814cf9963..93c7acd3d 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 1937ac175..e7598a177 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index ea1c87258..b37488de1 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 9cfb4236f..dbba89e7c 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index c764791df..4eec0ee3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.8.2-SNAPSHOT</version>
+  <version>13.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 88d5bd0c1..28307bbe4 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.8.2-SNAPSHOT</version>
+    <version>13.9.0-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index d59d2cf26..7b3a12da5 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.8.2-SNAPSHOT</version>
+              <version>13.9.0-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index a1c5a5065..0c2c7da55 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.8.2-SNAPSHOT</version>
+      <version>13.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From bce2dec1cdbbd0d9c302016a884a57e8857ed3d3 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Aug 2022 15:40:06 +1200
Subject: [PATCH 057/127] Remove unused imports in DefaultTypeManager

---
 .../java/io/ebeaninternal/server/type/DefaultTypeManager.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 49c03dc57..48184cd1b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -21,10 +21,6 @@ import io.ebeaninternal.api.GeoTypeProvider;
 import io.ebeaninternal.server.core.ServiceUtil;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalDateTime;
-import org.joda.time.LocalTime;
 
 import javax.persistence.AttributeConverter;
 import javax.persistence.EnumType;

From ee71c7912569e926871e23e125113dc2e827b13a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Aug 2022 16:08:30 +1200
Subject: [PATCH 058/127] Tidy DefaultTypeManager, reduce unnecessary fields

---
 .../server/type/DefaultTypeManager.java       | 95 ++++++++-----------
 1 file changed, 39 insertions(+), 56 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 48184cd1b..bc644954e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -57,31 +57,8 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final DefaultTypeFactory extraTypeFactory;
 
+  private final ScalarType<?> fileType = new ScalarTypeFile();
   private final ScalarType<?> hstoreType = new ScalarTypePostgresHstore();
-  private final ScalarTypeFile fileType = new ScalarTypeFile();
-  private final ScalarType<?> charType = new ScalarTypeChar();
-  private final ScalarType<?> charArrayType = new ScalarTypeCharArray();
-  private final ScalarType<?> longVarcharType = new ScalarTypeLongVarchar();
-  private final ScalarType<?> clobType = new ScalarTypeClob();
-  private final ScalarType<?> byteType = new ScalarTypeByte();
-  private final ScalarType<?> binaryType = new ScalarTypeBytesBinary();
-  private final ScalarType<?> blobType = new ScalarTypeBytesBlob();
-  private final ScalarType<?> varbinaryType = new ScalarTypeBytesVarbinary();
-  private final ScalarType<?> longVarbinaryType = new ScalarTypeBytesLongVarbinary();
-  private final ScalarType<?> shortType = new ScalarTypeShort();
-  private final ScalarType<?> integerType = new ScalarTypeInteger();
-  private final ScalarType<?> longType = new ScalarTypeLong();
-  private final ScalarType<?> doubleType = new ScalarTypeDouble();
-  private final ScalarType<?> floatType = new ScalarTypeFloat();
-  private final ScalarType<?> bigDecimalType = new ScalarTypeBigDecimal();
-  private final ScalarType<?> timeType = new ScalarTypeTime();
-  private final ScalarType<?> urlType = new ScalarTypeURL();
-  private final ScalarType<?> uriType = new ScalarTypeURI();
-  private final ScalarType<?> localeType = new ScalarTypeLocale();
-  private final ScalarType<?> currencyType = new ScalarTypeCurrency();
-  private final ScalarType<?> timeZoneType = new ScalarTypeTimeZone();
-  private final ScalarType<?> stringType = ScalarTypeString.INSTANCE;
-  private final ScalarType<?> classType = new ScalarTypeClass();
 
   private final JsonConfig.DateTime jsonDateTime;
   private final JsonConfig.Date jsonDate;
@@ -143,7 +120,7 @@ public final class DefaultTypeManager implements TypeManager {
 
     initialiseStandard(config);
     initialiseJavaTimeTypes(config);
-    initialiseJacksonTypes(config);
+    initialiseJacksonTypes();
     loadTypesFromProviders(config, objectMapper);
     loadGeoTypeBinder(config);
 
@@ -216,9 +193,7 @@ public final class DefaultTypeManager implements TypeManager {
 
   private void logAdd(ScalarType<?> scalarType) {
     if (log.isLoggable(TRACE)) {
-      String msg = "ScalarType register [" + scalarType.getClass().getName() + "]";
-      msg += " for [" + scalarType.type().getName() + "]";
-      log.log(TRACE, msg);
+      log.log(TRACE, "ScalarType register {0} for {1}", scalarType.getClass().getName(), scalarType.type().getName());
     }
   }
 
@@ -266,7 +241,7 @@ public final class DefaultTypeManager implements TypeManager {
 
   /**
    * Checks the typeMap for inherited types.
-   *
+   * <p>
    * If e.g. <code>type</code> is a <code>GregorianCalendar</code>, then this method
    * will check the class hierarchy and will probably return a
    * <code>ScalarTypeCalendar</code> To speed up a second lookup, it will write
@@ -316,7 +291,7 @@ public final class DefaultTypeManager implements TypeManager {
     } else if (type.equals(Set.class)) {
       return getArrayScalarTypeSet(valueType, nullable);
     } else {
-      throw new IllegalStateException("Type [" + type + "] not supported for @DbArray");
+      throw new IllegalStateException("@DbArray does not support type " + type);
     }
   }
 
@@ -671,7 +646,7 @@ public final class DefaultTypeManager implements TypeManager {
         }
         add(scalarType);
       } catch (Exception e) {
-        log.log(ERROR, "Error loading ScalarType [" + cls.getName() + "]", e);
+        log.log(ERROR, "Error loading ScalarType " + cls.getName(), e);
       }
     }
   }
@@ -705,7 +680,7 @@ public final class DefaultTypeManager implements TypeManager {
         log.log(DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
         add(stw);
       } catch (Exception e) {
-        log.log(ERROR, "Error registering ScalarTypeConverter [" + foundType.getName() + "]", e);
+        log.log(ERROR, "Error registering ScalarTypeConverter " + foundType.getName(), e);
       }
     }
   }
@@ -729,7 +704,7 @@ public final class DefaultTypeManager implements TypeManager {
         log.log(DEBUG, "Register ScalarTypeWrapper from {0} -> {1} using:{2}", logicalType, persistType, foundType);
         add(stw);
       } catch (Exception e) {
-        log.log(ERROR, "Error registering AttributeConverter [" + foundType.getName() + "]", e);
+        log.log(ERROR, "Error registering AttributeConverter " + foundType.getName(), e);
       }
     }
   }
@@ -737,7 +712,7 @@ public final class DefaultTypeManager implements TypeManager {
   /**
    * Add support for Jackson's JsonNode mapping to Clob, Blob, Varchar, JSON and JSONB.
    */
-  private void initialiseJacksonTypes(DatabaseConfig config) {
+  private void initialiseJacksonTypes() {
     if (objectMapper != null) {
       ObjectMapper mapper = (ObjectMapper) objectMapper;
       jsonNodeClob = new ScalarTypeJsonNode.Clob(mapper);
@@ -808,7 +783,7 @@ public final class DefaultTypeManager implements TypeManager {
     addType(Calendar.class, extraTypeFactory.createCalendar(jsonDateTime));
     addType(BigInteger.class, extraTypeFactory.createMathBigInteger());
 
-    ScalarTypeBool booleanType = extraTypeFactory.createBoolean();
+    final var booleanType = extraTypeFactory.createBoolean();
     addType(Boolean.class, booleanType);
     addType(boolean.class, booleanType);
     // register the boolean literals to the platform for DDL default values
@@ -845,90 +820,98 @@ public final class DefaultTypeManager implements TypeManager {
     }
 
     addType(File.class, fileType);
-    addType(Locale.class, localeType);
-    addType(Currency.class, currencyType);
-    addType(TimeZone.class, timeZoneType);
-    addType(URL.class, urlType);
-    addType(URI.class, uriType);
+    addType(Locale.class, new ScalarTypeLocale());
+    addType(Currency.class, new ScalarTypeCurrency());
+    addType(TimeZone.class, new ScalarTypeTimeZone());
+    addType(URL.class, new ScalarTypeURL());
+    addType(URI.class, new ScalarTypeURI());
 
     // String types
-    addType(char[].class, charArrayType);
-    addType(char.class, charType);
-    addType(String.class, stringType);
-    nativeMap.put(Types.VARCHAR, stringType);
-    nativeMap.put(Types.CHAR, stringType);
-    nativeMap.put(Types.LONGVARCHAR, longVarcharType);
+    addType(char[].class, new ScalarTypeCharArray());
+    addType(char.class, new ScalarTypeChar());
+    addType(String.class, ScalarTypeString.INSTANCE);
+    nativeMap.put(Types.VARCHAR, ScalarTypeString.INSTANCE);
+    nativeMap.put(Types.CHAR, ScalarTypeString.INSTANCE);
+    nativeMap.put(Types.LONGVARCHAR, new ScalarTypeLongVarchar());
 
-    // Class<?>
-    addType(Class.class, classType);
+    addType(Class.class, new ScalarTypeClass());
 
     if (platformClobType == Types.CLOB) {
-      nativeMap.put(Types.CLOB, clobType);
+      nativeMap.put(Types.CLOB, new ScalarTypeClob());
     } else {
       // for Postgres Clobs handled by Varchar ScalarType...
       ScalarType<?> platClobScalarType = nativeMap.get(platformClobType);
       if (platClobScalarType == null) {
-        throw new IllegalArgumentException("Type for dbPlatform clobType [" + clobType + "] not found.");
+        throw new IllegalArgumentException("Not found dbPlatform clobType " + platformClobType);
       }
       nativeMap.put(Types.CLOB, platClobScalarType);
     }
 
     // Binary type
+    final var varbinaryType = new ScalarTypeBytesVarbinary();
     addType(byte[].class, varbinaryType);
-    nativeMap.put(Types.BINARY, binaryType);
     nativeMap.put(Types.VARBINARY, varbinaryType);
-    nativeMap.put(Types.LONGVARBINARY, longVarbinaryType);
+    nativeMap.put(Types.BINARY, new ScalarTypeBytesBinary());
+    nativeMap.put(Types.LONGVARBINARY, new ScalarTypeBytesLongVarbinary());
 
     if (platformBlobType == Types.BLOB) {
-      nativeMap.put(Types.BLOB, blobType);
+      nativeMap.put(Types.BLOB, new ScalarTypeBytesBlob());
     } else {
       // for Postgres Blobs handled by LongVarbinary ScalarType...
       ScalarType<?> platBlobScalarType = nativeMap.get(platformBlobType);
       if (platBlobScalarType == null) {
-        throw new IllegalArgumentException("Type for dbPlatform blobType [" + blobType + "] not found.");
+        throw new IllegalArgumentException("Not found dbPlatform blobType " + platformBlobType);
       }
       nativeMap.put(Types.BLOB, platBlobScalarType);
     }
 
     // Number types
+    final var byteType = new ScalarTypeByte();
     addType(Byte.class, byteType);
     addType(byte.class, byteType);
     nativeMap.put(Types.TINYINT, byteType);
 
+    final var shortType = new ScalarTypeShort();
     addType(Short.class, shortType);
     addType(short.class, shortType);
     nativeMap.put(Types.SMALLINT, shortType);
 
+    final var integerType = new ScalarTypeInteger();
     addType(Integer.class, integerType);
     addType(int.class, integerType);
     nativeMap.put(Types.INTEGER, integerType);
 
+    final var longType = new ScalarTypeLong();
     addType(Long.class, longType);
     addType(long.class, longType);
     nativeMap.put(Types.BIGINT, longType);
 
+    final var doubleType = new ScalarTypeDouble();
     addType(Double.class, doubleType);
     addType(double.class, doubleType);
     nativeMap.put(Types.FLOAT, doubleType);// no this is not a bug
     nativeMap.put(Types.DOUBLE, doubleType);
 
+    final var floatType = new ScalarTypeFloat();
     addType(Float.class, floatType);
     addType(float.class, floatType);
     nativeMap.put(Types.REAL, floatType);// no this is not a bug
 
+    final var bigDecimalType = new ScalarTypeBigDecimal();
     addType(BigDecimal.class, bigDecimalType);
     nativeMap.put(Types.DECIMAL, bigDecimalType);
     nativeMap.put(Types.NUMERIC, bigDecimalType);
 
     // Temporal types
+    final var timeType = new ScalarTypeTime();
     addType(Time.class, timeType);
     nativeMap.put(Types.TIME, timeType);
 
-    ScalarTypeDate dateType = new ScalarTypeDate(jsonDate);
+    final var dateType = new ScalarTypeDate(jsonDate);
     addType(Date.class, dateType);
     nativeMap.put(Types.DATE, dateType);
 
-    ScalarType<?> timestampType = new ScalarTypeTimestamp(jsonDateTime);
+    final var timestampType = new ScalarTypeTimestamp(jsonDateTime);
     addType(Timestamp.class, timestampType);
     nativeMap.put(Types.TIMESTAMP, timestampType);
   }

From e51ac7de3653330ccd17455eb9bb074f07c4d81c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Aug 2022 16:50:54 +1200
Subject: [PATCH 059/127] Refactor tidy error and log messages

---
 .../java/io/ebeaninternal/api/ScopeTrans.java |  2 +-
 .../ebeaninternal/api/ScopedTransaction.java  |  2 +-
 .../server/cache/RemoteCacheEvent.java        |  2 +-
 .../cluster/BinaryTransactionEventReader.java |  2 +-
 .../server/core/DefaultBeanLoader.java        |  2 +-
 .../server/core/DefaultServer.java            |  2 +-
 .../server/core/PersistRequestBean.java       | 10 +++---
 .../core/PersistRequestCallableSql.java       |  3 +-
 .../server/core/PersistRequestOrmUpdate.java  |  3 +-
 .../server/deploy/BeanCollectionUtil.java     |  4 +--
 .../server/deploy/BeanDescriptor.java         |  2 +-
 .../server/deploy/BeanDescriptorManager.java  | 16 +++++-----
 .../server/deploy/BeanPropertyAssoc.java      |  2 +-
 .../server/deploy/BeanPropertyAssocMany.java  |  4 +--
 .../server/deploy/DetermineAggPath.java       |  4 +--
 .../DynamicPropertyAggregationFormula.java    |  2 +-
 .../server/deploy/FormulaPropertyPath.java    |  2 +-
 .../server/deploy/InheritInfo.java            |  2 +-
 .../deploy/parse/DeployInheritInfo.java       |  2 +-
 .../server/deploy/parse/DeployUtil.java       |  8 ++---
 .../server/grammer/EqlWhereListener.java      |  2 +-
 .../ebeaninternal/server/persist/Binder.java  |  4 +--
 .../server/persist/dml/DmlBeanPersister.java  |  2 +-
 .../server/persist/dml/DmlHandler.java        |  2 +-
 .../server/query/CQueryBuilder.java           |  4 +--
 .../server/query/CQueryEngine.java            |  6 ++--
 .../server/query/CQueryPredicates.java        |  8 ++---
 .../server/query/SqlTreeAlias.java            |  3 +-
 .../server/querydefn/DefaultDtoQuery.java     |  2 +-
 .../server/querydefn/DefaultOrmQuery.java     |  2 +-
 .../querydefn/DefaultRelationalQuery.java     |  2 +-
 .../server/rawsql/SpiRawSql.java              | 10 +++---
 .../server/transaction/DeleteByIdMap.java     |  2 +-
 .../server/transaction/RemoteTableMod.java    |  2 +-
 .../server/type/EnumToDbIntegerMap.java       |  6 ++--
 .../server/type/ScalarTypeEnumStandard.java   |  6 ++--
 .../server/type/ScalarTypeJsonSet.java        |  4 +--
 .../server/type/TypeReflectHelper.java        |  2 +-
 .../server/type/UtilDateParser.java           |  2 +-
 .../server/util/BindParamsParser.java         |  2 +-
 .../util/SortByClauseParser.java              |  8 ++---
 .../server/rawsql/TestRawSqlParsing.java      | 31 +++++++------------
 42 files changed, 82 insertions(+), 106 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
index f3ca6555f..da38b3856 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
@@ -87,7 +87,7 @@ public final class ScopeTrans {
 
   @Override
   public String toString() {
-    return "ScopeTrans[" + transaction + "]";
+    return "ScopeTrans " + transaction;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 383746f13..323a9b7da 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -30,7 +30,7 @@ public final class ScopedTransaction extends SpiTransactionProxy {
 
   @Override
   public String toString() {
-    return "ScopedTransaction[" + current + "]";
+    return "ScopedTransaction " + current;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
index 21f04704d..25a478bc2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java
@@ -52,7 +52,7 @@ public final class RemoteCacheEvent implements BinaryWritable {
 
   @Override
   public String toString() {
-    return "CacheEvent[ clearAll:" + clearAll + " caches:" + clearCaches + "]";
+    return "CacheEvent clearAll:" + clearAll + " caches:" + clearCaches;
   }
 
   public static RemoteCacheEvent readBinaryMessage(BinaryReadContext dataInput) throws IOException {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java
index aebf45ea4..4c3138a45 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/cluster/BinaryTransactionEventReader.java
@@ -32,7 +32,7 @@ public class BinaryTransactionEventReader {
     String serverName = dataInput.readUTF();
     SpiEbeanServer server = (SpiEbeanServer) serverLookup.getServer(serverName);
     if (server == null) {
-      throw new IllegalStateException("EbeanServer not found for name [" + serverName + "]");
+      throw new IllegalStateException("Database not found for name " + serverName);
     }
     RemoteTransactionEvent event =  new RemoteTransactionEvent(server);
     event.readBinary(dataInput);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 8e1f2fb84..4731ebd01 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -229,7 +229,7 @@ final class DefaultBeanLoader {
 
     Object dbBean = query.findOne();
     if (dbBean == null) {
-      throw new EntityNotFoundException("Bean not found during lazy load or refresh." + " id[" + id + "] type[" + desc.type() + "]");
+      throw new EntityNotFoundException("Bean not found during lazy load or refresh. Id:" + id + " type:" + desc.type());
     }
     desc.resetManyProperties(dbBean);
   }
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 133fadef6..2c604ed98 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
@@ -1079,7 +1079,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (list.isEmpty()) {
       return null;
     } else if (list.size() > 1) {
-      throw new NonUniqueResultException("Unique expecting 0 or 1 results but got [" + list.size() + "]");
+      throw new NonUniqueResultException("Unique expecting 0 or 1 results but got " + list.size());
     } else {
       return list.get(0);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
index 2af16b25b..4016596f0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java
@@ -928,20 +928,20 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   }
 
   private void logSummaryMessage() {
-    String draft = (beanDescriptor.isDraftable() && !publish) ? " draft[true]" : "";
+    String draft = (beanDescriptor.isDraftable() && !publish) ? "] draft[true]" : "]";
     String name = beanDescriptor.name();
     switch (type) {
       case INSERT:
-        transaction.logSummary("Inserted [" + name + "] [" + (idValue == null ? "" : idValue) + "]" + draft);
+        transaction.logSummary("Inserted [" + name + "] [" + (idValue == null ? "" : idValue) + draft);
         break;
       case UPDATE:
-        transaction.logSummary("Updated [" + name + "] [" + idValue + "]" + draft);
+        transaction.logSummary("Updated [" + name + "] [" + idValue + draft);
         break;
       case DELETE:
-        transaction.logSummary("Deleted [" + name + "] [" + idValue + "]" + draft);
+        transaction.logSummary("Deleted [" + name + "] [" + idValue + draft);
         break;
       case DELETE_SOFT:
-        transaction.logSummary("SoftDelete [" + name + "] [" + idValue + "]" + draft);
+        transaction.logSummary("SoftDelete [" + name + "] [" + idValue + draft);
         break;
       default:
         break;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java
index 1edabf5bd..70eebd927 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java
@@ -86,8 +86,7 @@ public final class PersistRequestCallableSql extends PersistRequest {
       persistExecute.collectSqlCall(label, startNanos);
     }
     if (transaction.isLogSummary()) {
-      String m = "CallableSql label[" + callableSql.getLabel() + "]" + " rows[" + rowCount + "]" + " bind[" + bindLog + "]";
-      transaction.logSummary(m);
+      transaction.logSummary("CallableSql label[" + callableSql.getLabel() + "]" + " rows[" + rowCount + "]" + " bind[" + bindLog + "]");
     }
 
     // register table modifications with the transaction event
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java
index 08de8e27d..eb865a0bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java
@@ -83,8 +83,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest {
     OrmUpdateType ormUpdateType = ormUpdate.getOrmUpdateType();
     String tableName = ormUpdate.getBaseTable();
     if (transaction.isLogSummary()) {
-      String m = ormUpdateType + " table[" + tableName + "] rows[" + rowCount + "] bind[" + bindLog + "]";
-      transaction.logSummary(m);
+      transaction.logSummary(ormUpdateType + " table[" + tableName + "] rows[" + rowCount + "] bind[" + bindLog + "]");
     }
     if (ormUpdate.isNotifyCache()) {
       // add the modification info to the TransactionEvent
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
index e1a0d352c..aa8c72b5a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java
@@ -46,7 +46,7 @@ public final class BeanCollectionUtil {
     } else if (o instanceof Collection<?>) {
       return ((Collection<?>) o);
     }
-    throw new PersistenceException("expecting a Map or Collection but got [" + o.getClass().getName() + "]");
+    throw new PersistenceException("expecting a Map or Collection but got " + o.getClass().getName());
   }
 
   /**
@@ -73,6 +73,6 @@ public final class BeanCollectionUtil {
     } else if (o instanceof Collection<?>) {
       return ((Collection<?>) o);
     }
-    throw new PersistenceException("expecting a Map or Collection but got [" + o.getClass().getName() + "]");
+    throw new PersistenceException("expecting a Map or Collection but got " + o.getClass().getName());
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 17a5ba950..1f01cbcfb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -1891,7 +1891,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
       }
       BeanPropertyAssoc<?> assocProp = (BeanPropertyAssoc<?>) other._findBeanProperty(split[0]);
       if (assocProp == null) {
-        throw new IllegalStateException("Unknown property path [" + split[0] + "] from[" + path + "]");
+        throw new IllegalStateException("Unknown property path " + split[0] + " from " + path);
       }
       BeanDescriptor<?> targetDesc = assocProp.targetDescriptor();
       path = split[1];
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index f54784a34..1c8311a4d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -988,14 +988,14 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   private DeployBeanPropertyAssocOne<?> mappedOneToOne(DeployBeanPropertyAssocOne<?> prop, String mappedBy, DeployBeanDescriptor<?> targetDesc) {
     DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
     if (mappedProp == null) {
-      throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property [" + targetDesc + "." + mappedBy + "]");
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property " + targetDesc + "." + mappedBy);
     }
     if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
-      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?");
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a OneToOne?");
     }
     DeployBeanPropertyAssocOne<?> mappedAssocOne = (DeployBeanPropertyAssocOne<?>) mappedProp;
     if (!mappedAssocOne.isOneToOne()) {
-      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?");
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a OneToOne?");
     }
     return mappedAssocOne;
   }
@@ -1078,10 +1078,10 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   private DeployBeanPropertyAssocOne<?> mappedManyToOne(DeployBeanPropertyAssocMany<?> prop, DeployBeanDescriptor<?> targetDesc, String mappedBy) {
     DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
     if (mappedProp == null) {
-      throw new PersistenceException("Error on " + prop.getFullBeanName() + "  Can not find mappedBy property [" + mappedBy + "] " + "in [" + targetDesc + "]");
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + "  Can not find mappedBy property " + mappedBy + " in " + targetDesc);
     }
     if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
-      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + mappedBy + "]is not a ManyToOne?" + "in [" + targetDesc + "]");
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + mappedBy + " is not a ManyToOne? in " + targetDesc);
     }
     return (DeployBeanPropertyAssocOne<?>) mappedProp;
   }
@@ -1129,15 +1129,15 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   private DeployBeanPropertyAssocMany<?> mappedManyToMany(DeployBeanPropertyAssocMany<?> prop, String mappedBy, DeployBeanDescriptor<?> targetDesc) {
     DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
     if (mappedProp == null) {
-      throw new PersistenceException("Error on " + prop.getFullBeanName() + "  Can not find mappedBy property [" + mappedBy + "] " + "in [" + targetDesc + "]");
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + "  Can not find mappedBy property " + mappedBy + " in " + targetDesc);
     }
     if (!(mappedProp instanceof DeployBeanPropertyAssocMany<?>)) {
-      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?");
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a ManyToMany?");
     }
 
     DeployBeanPropertyAssocMany<?> mappedAssocMany = (DeployBeanPropertyAssocMany<?>) mappedProp;
     if (!mappedAssocMany.isManyToMany()) {
-      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?");
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property " + targetDesc + "." + mappedBy + " is not a ManyToMany?");
     }
     return mappedAssocMany;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index d98f6d849..78d1c2179 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -434,7 +434,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
     if (!idProp.isEmbedded()) {
       // simple single scalar id
       if (cols.length != 1) {
-        CoreLog.log.log(ERROR, "No Imported Id column for [" + idProp + "] in table [" + join.getTable() + "]");
+        CoreLog.log.log(ERROR, "No Imported Id column for {0} in table {1}", idProp, join.getTable());
         return null;
       } else {
         BeanProperty[] idProps = {idProp};
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index a96ea496e..78263cf82 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -718,7 +718,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
         }
       }
     }
-    throw new RuntimeException("Can not find Master [" + beanType + "] in Child[" + targetDesc + "]");
+    throw new RuntimeException("Can not find Master " + beanType + " in Child " + targetDesc);
   }
 
   /**
@@ -734,7 +734,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     }
     String from = descriptor.fullName();
     String to = targetDesc.fullName();
-    throw new PersistenceException(from + ": Could not find mapKey property [" + mapKey + "] on [" + to + "]");
+    throw new PersistenceException(from + ": Could not find mapKey property " + mapKey + " on " + to);
   }
 
   public IntersectionRow buildManyDeleteChildren(EntityBean parentBean, List<Object> excludeDetailIds) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
index 0349ac196..b82c72bae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DetermineAggPath.java
@@ -41,7 +41,7 @@ final class DetermineAggPath {
       }
     }
 
-    throw new IllegalArgumentException("Could not find path in aggregation formula [" + aggregation + "]");
+    throw new IllegalArgumentException("Could not find path in aggregation formula " + aggregation);
   }
 
   private static boolean isNamePart(char ch) {
@@ -94,7 +94,7 @@ final class DetermineAggPath {
           pos = pos + 1;
           continue;
         }
-        throw new IllegalArgumentException("Can not find path to many in aggregation formula [" + aggregation + "]");
+        throw new IllegalArgumentException("Can not find path to many in aggregation formula " + aggregation);
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
index faab87419..3634123e2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java
@@ -26,7 +26,7 @@ class DynamicPropertyAggregationFormula extends DynamicPropertyBase {
 
   @Override
   public String toString() {
-    return "DynamicPropertyFormula[" + parsedFormula + "]";
+    return "DynamicPropertyFormula " + parsedFormula;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
index ac9aaabb5..82493154b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/FormulaPropertyPath.java
@@ -32,7 +32,7 @@ final class FormulaPropertyPath {
     int openBracket = formula.indexOf('(');
     int closeBracket = formula.lastIndexOf(')');
     if (openBracket == -1 || closeBracket == -1) {
-      throw new IllegalStateException("Unable to parse formula [" + formula + "]");
+      throw new IllegalStateException("Unable to parse formula " + formula);
     }
     outerFunction = formula.substring(0, openBracket).trim();
     internalExpression = trimDistinct(formula.substring(openBracket + 1, closeBracket));
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
index ae588e466..e72d7463d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java
@@ -354,7 +354,7 @@ public final class InheritInfo {
 
   @Override
   public String toString() {
-    return "InheritInfo[" + type.getName() + "] disc[" + discriminatorStringValue + "]";
+    return "InheritInfo " + type.getName() + " disc:" + discriminatorStringValue;
   }
 
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
index 3df70b406..67e41e3ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java
@@ -255,7 +255,7 @@ public final class DeployInheritInfo implements Comparable<DeployInheritInfo> {
   public String toString() {
     String root = parent == null ? null : parent.getName();
     String name = type == null ? null : type.getName();
-    return "InheritInfo[" + name + "]" + " root[" + root + "]" + " disValue[" + discriminatorStringValue + "]";
+    return "InheritInfo " + name + " root:" + root + " disc:" + discriminatorStringValue;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index 459da0229..c20c0ad86 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -141,7 +141,7 @@ public final class DeployUtil {
       if (scalarType != null || property.isTransient()) {
         return scalarType;
       }
-      throw new PersistenceException(property.getFullBeanName() + " has no ScalarType - type[" + propType.getName() + "]");
+      throw new PersistenceException(property.getFullBeanName() + " has no ScalarType - type " + propType.getName());
     } catch (IllegalArgumentException e) {
       if (property.isTransient()) {
         // expected for transient properties with unknown/non-mapped types
@@ -174,7 +174,7 @@ public final class DeployUtil {
     Class<?> type = prop.getPropertyType();
     ScalarType<?> scalarType = typeManager.getArrayScalarType(type, prop.getGenericType(), prop.isNullable());
     if (scalarType == null) {
-      throw new RuntimeException("No ScalarType for @DbArray type for [" + prop.getFullBeanName() + "]");
+      throw new RuntimeException("No ScalarType for @DbArray type for " + prop.getFullBeanName());
     }
     int dbType = scalarType.jdbcType();
     prop.setDbType(dbType);
@@ -206,7 +206,7 @@ public final class DeployUtil {
     prop.setMutationDetection(mutationDetection);
     ScalarType<?> scalarType = typeManager.getJsonScalarType(prop, dbType, dbLength);
     if (scalarType == null) {
-      throw new RuntimeException("No ScalarType for JSON property [" + prop + "] [" + dbType + "]");
+      throw new RuntimeException("No ScalarType for JSON property " + prop + " dbType:" + dbType);
     }
     prop.setScalarType(scalarType);
     if (dbType == Types.VARCHAR || dbLength > 0) {
@@ -251,7 +251,7 @@ public final class DeployUtil {
       scalarType = typeManager.getScalarType(type, lobType);
       if (scalarType == null) {
         // this should never occur actually
-        throw new RuntimeException("No ScalarType for LOB type [" + type + "] [" + lobType + "]");
+        throw new RuntimeException("No ScalarType for LOB type " + type + " dbType:" + lobType);
       }
       prop.setDbType(lobType);
       prop.setScalarType(scalarType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
index 683bf1421..9a239b7ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
@@ -351,7 +351,7 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
         if (Character.isDigit(firstChar)) {
           return EqlValueType.NUMBER;
         }
-        throw new IllegalArgumentException("Unexpected first character in value [" + valueAsText + "]");
+        throw new IllegalArgumentException("Unexpected first character in value " + valueAsText);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 0687c940a..82db7fdd6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -340,9 +340,7 @@ public final class Binder {
       if (data != null) {
         dataClass = data.getClass().getName();
       }
-      String m = "Error with property[" + b.currentPos() + "] dt[" + dataType + "]";
-      m += "data[" + data + "][" + dataClass + "]";
-      throw new PersistenceException(m, e);
+      throw new PersistenceException("Error with property:" + b.currentPos() + " dt:" + dataType + " data:" + data + " " + dataClass, e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
index 043f210aa..4a4abe17d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java
@@ -70,7 +70,7 @@ final class DmlBeanPersister implements BeanPersister {
       }
     } catch (SQLException e) {
       // log the error to the transaction log
-      String msg = "Error[" + StringHelper.removeNewLines(e.getMessage()) + "]";
+      String msg = "Error: " + StringHelper.removeNewLines(e.getMessage());
       if (request.transaction().isLogSummary()) {
         request.transaction().logSummary(msg);
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index f2afacce1..c7845c6f8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -101,7 +101,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
       persistRequest.postExecute();
     } catch (OptimisticLockException e) {
       // add the SQL and bind values to error message
-      String m = e.getMessage() + " sql[" + sql + "] bind[" + bindLog + "]";
+      final String m = e.getMessage() + " sql[" + sql + "] bind[" + bindLog + "]";
       persistRequest.transaction().logSummary("OptimisticLockException:" + m);
       throw new OptimisticLockException(m, null, e.getEntity());
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 3594c19a0..b01f254c6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -482,8 +482,8 @@ final class CQueryBuilder {
     } else if (beanProperty.isDiscriminator()) {
       propertyName = SplitName.parent(propertyName);
     } else if (beanProperty instanceof BeanPropertyAssocOne<?>) {
-      String msg = "Column [" + column.getDbColumn() + "] mapped to complex Property[" + propertyName + "]";
-      msg += ". It should be mapped to a simple property (probably the Id property). ";
+      String msg = "Column " + column.getDbColumn() + " mapped to complex property " + propertyName +
+        ". It should be mapped to a simple property (probably the Id property).";
       throw new PersistenceException(msg);
     }
     if (propertyName != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index c4fec72dd..4a2686f16 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -129,14 +129,12 @@ public final class CQueryEngine {
     SpiTransaction t = request.transaction();
     if (t.isLogSummary()) {
       // log the error to the transaction log
-      String msg = "ERROR executing query, bindLog[" + bindLog + "] error[" + StringHelper.removeNewLines(e.getMessage()) + "]";
-      t.logSummary(msg);
+      t.logSummary("ERROR executing query, bindLog[" + bindLog + "] error:" + StringHelper.removeNewLines(e.getMessage()));
     }
     // ensure 'rollback' is logged if queryOnly transaction
     t.connection();
     // build a decent error message for the exception
-    String m = "Query threw SQLException:" + e.getMessage() + " Bind values:[" + bindLog + "] Query was:" + sql;
-    return dbPlatform.translate(m, e);
+    return dbPlatform.translate("Query threw SQLException:" + e.getMessage() + " Bind values:[" + bindLog + "] Query was:" + sql, e);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index d6833b98e..f93ab8d17 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -337,10 +337,10 @@ public final class CQueryPredicates {
     if (idPos <= -1 || idPos >= manyPos) {
       if (idPos > manyPos) {
         // there was an error with the order by...
-        String msg = "A Query on [" + desc + "] includes a join to a 'many' association [" + manyProp.name();
-        msg += "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById + "]";
-        msg += " must come before the many property [" + manyProp.name() + "] in the orderBy.";
-        msg += " Ebean has automatically modified the orderBy clause to do this.";
+        String msg = "A Query on [" + desc + "] includes a join to a 'many' association [" + manyProp.name()
+        + "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById
+        + "] must come before the many property [" + manyProp.name() + "] in the orderBy."
+        + " Ebean has automatically modified the orderBy clause to do this.";
         CoreLog.log.log(WARNING, msg);
       }
       // the id needs to come before the manyPropName
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
index 367b67685..0311bf64d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
@@ -133,8 +133,7 @@ final class SqlTreeAlias {
       s = aliasMap.get(prefix);
     }
     if (s == null) {
-      String msg = "Could not determine table alias for [" + prefix + "] manyMap[" + manyWhereAliasMap + "] aliasMap[" + aliasMap + "]";
-      throw new RuntimeException(msg);
+      throw new RuntimeException("Could not determine table alias for " + prefix + " manyMap:" + manyWhereAliasMap + " aliasMap:" + aliasMap);
     }
     return s;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
index 8120aa093..fc82d72ca 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java
@@ -181,7 +181,7 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
 
   @Override
   public String toString() {
-    return "DtoQuery [" + sql + "]";
+    return "DtoQuery " + sql;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 86bb27c5a..8f4baefdf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1714,7 +1714,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   @Override
   public final String toString() {
-    return "Query [" + whereExpressions + "]";
+    return "Query " + whereExpressions;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index f059e4b7c..4b7c59625 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -121,7 +121,7 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
 
   @Override
   public String toString() {
-    return "SqlQuery [" + query + "]";
+    return "SqlQuery " + query;
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java
index 73bc6ff19..7956b9453 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java
@@ -98,9 +98,9 @@ public interface SpiRawSql extends RawSql {
     @Override
     public String toString() {
       if (!parsed) {
-        return "unparsed[" + unparsedSql + "]";
+        return "unparsed " + unparsedSql;
       }
-      return "select[" + preFrom + "] preWhere[" + preWhere + "] preHaving[" + preHaving + "] orderBy[" + orderBy + "]";
+      return "select:" + preFrom + " preWhere:" + preWhere + " preHaving:" + preHaving + " orderBy:" + orderBy;
     }
 
     public boolean isDistinct() {
@@ -301,8 +301,7 @@ public interface SpiRawSql extends RawSql {
       } else {
         Column column = dbColumnMap.get(dbColumn);
         if (column == null) {
-          String msg = "DB Column [" + dbColumn + "] not found in mapping. Expecting one of [" + dbColumnMap.keySet() + "]";
-          throw new IllegalArgumentException(msg);
+          throw new IllegalArgumentException("DB Column " + dbColumn + " not found in mapping. Expecting one of " + dbColumnMap.keySet());
         }
         column.setPropertyName(propertyName);
       }
@@ -420,8 +419,7 @@ public interface SpiRawSql extends RawSql {
 
       private void checkMapping() {
         if (propertyName == null) {
-          String msg = "No propertyName defined (Column mapping) for dbColumn [" + dbColumn + "]";
-          throw new IllegalStateException(msg);
+          throw new IllegalStateException("No propertyName defined (Column mapping) for dbColumn " + dbColumn);
         }
       }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
index 675169318..06b78861e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java
@@ -21,7 +21,7 @@ public final class DeleteByIdMap {
 
   @Override
   public String toString() {
-    return "DeleteById[" + beanMap.values() + "]";
+    return "DeleteById " + beanMap.values();
   }
 
   public void notifyCache(CacheChangeSet changeSet) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
index a3b97ec2a..cf5db3580 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/RemoteTableMod.java
@@ -27,7 +27,7 @@ public final class RemoteTableMod implements BinaryWritable {
 
   @Override
   public String toString() {
-    return "TableMod[" + timestamp + "; " + tables + "]";
+    return "TableMod " + timestamp + "; " + tables;
   }
 
   public long getTimestamp() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java
index 5f34e31fe..93860f047 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java
@@ -51,10 +51,8 @@ final class EnumToDbIntegerMap extends EnumToDbValueMap<Integer> {
       return this;
 
     } catch (Exception e) {
-      String msg = "Error converted enum type[" + beanValue.getClass().getName();
-      msg += "] enum value[" + beanValue + "] string value [" + stringDbValue + "]";
-      msg += " to an Integer.";
-      throw new PersistenceException(msg, e);
+      throw new PersistenceException("Error converted enum [" + beanValue.getClass().getName()
+      + "] value[" + beanValue + "] string value [" + stringDbValue + "] to an Integer.", e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
index 2bf5e8292..2596b68f0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
@@ -163,8 +163,7 @@ final class ScalarTypeEnumStandard {
         return null;
       } else {
         if (ordinal < 0 || ordinal >= enumArray.length) {
-          String m = "Unexpected ordinal [" + ordinal + "] out of range [" + enumArray.length + "]";
-          throw new IllegalStateException(m);
+          throw new IllegalStateException("Unexpected ordinal " + ordinal + " out of range " + enumArray.length);
         }
         return enumArray[ordinal];
       }
@@ -196,8 +195,7 @@ final class ScalarTypeEnumStandard {
         ordinal = Integer.parseInt(dbValue.toString());
       }
       if (ordinal < 0 || ordinal >= enumArray.length) {
-        String m = "Unexpected ordinal [" + ordinal + "] out of range [" + enumArray.length + "]";
-        throw new IllegalStateException(m);
+        throw new IllegalStateException("Unexpected ordinal " + ordinal + " out of range " + enumArray.length);
       }
       return enumArray[ordinal];
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index 32f8e67c5..334e86417 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -74,7 +74,7 @@ final class ScalarTypeJsonSet {
       try {
         return convertElements(EJson.parseSet(value, false));
       } catch (IOException e) {
-        throw new PersistenceException("Failed to parse JSON content as Set: [" + value + "]", e);
+        throw new PersistenceException("Failed to parse JSON content as Set: " + value, e);
       }
     }
   }
@@ -177,7 +177,7 @@ final class ScalarTypeJsonSet {
       try {
         return convertList(EJson.parseList(value));
       } catch (IOException e) {
-        throw new PersistenceException("Failed to parse JSON content as Set: [" + value + "]", e);
+        throw new PersistenceException("Failed to parse JSON content as Set: " + value, e);
       }
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
index 25177d7df..761ea90fd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
@@ -56,7 +56,7 @@ public final class TypeReflectHelper {
         if (upperBounds != null && upperBounds.length == 1) {
           return getClass(upperBounds[0]);
         }
-        throw new IllegalArgumentException("Don't know how to determine Class from Type [" + type + "]");
+        throw new IllegalArgumentException("Don't know how to determine Class from type " + type);
       }
       return (Class<?>) type;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
index 4ad7722c8..b41362d84 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
@@ -16,7 +16,7 @@ final class UtilDateParser {
     try {
       return formatter().parse(jsonDateTime);
     } catch (ParseException e) {
-      throw new RuntimeException("Error parsing Date[" + jsonDateTime + "]", e);
+      throw new RuntimeException("Error parsing Date " + jsonDateTime, e);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java
index 3a05759d2..845d8d285 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java
@@ -142,7 +142,7 @@ public final class BindParamsParser {
       param = params.getParameter(paramName);
     }
     if (param == null) {
-      throw new PersistenceException("Bind value is not set or null for [" + paramName + "] in [" + sql + "]");
+      throw new PersistenceException("Bind value is not set or null for " + paramName + " in " + sql);
     }
     return param;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/util/SortByClauseParser.java b/ebean-core/src/main/java/io/ebeaninternal/util/SortByClauseParser.java
index 98bb40bd8..fbbc10134 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/util/SortByClauseParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/util/SortByClauseParser.java
@@ -38,7 +38,7 @@ public final class SortByClauseParser {
     }
     String[] words = section.split(" ");
     if (words.length < 1 || words.length > 3) {
-      throw new RuntimeException("Expecting 1 to 3 words in [" + section + "] but got [" + words.length + "]");
+      throw new RuntimeException("Expecting 1 to 3 words in [" + section + "] but got " + words.length);
     }
 
     Boolean nullsHigh = null;
@@ -71,8 +71,7 @@ public final class SortByClauseParser {
     if (SortByClause.NULLSLOW.equalsIgnoreCase(word)) {
       return Boolean.FALSE;
     }
-    String m = "Expecting nullsHigh or nullsLow but got [" + word + "] in [" + rawSortBy + "]";
-    throw new RuntimeException(m);
+    throw new RuntimeException("Expecting nullsHigh or nullsLow but got [" + word + "] in " + rawSortBy);
   }
 
 
@@ -83,8 +82,7 @@ public final class SortByClauseParser {
     if (SortByClause.DESC.equalsIgnoreCase(word)) {
       return false;
     }
-    String m = "Expect ASC or DESC but got [" + word + "] in [" + rawSortBy + "]";
-    throw new RuntimeException(m);
+    throw new RuntimeException("Expect ASC or DESC but got " + word + " in " + rawSortBy);
   }
 
 }
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java
index e11a0f991..ea00b55ea 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java
@@ -15,13 +15,11 @@ import org.tests.rawsql.ACustomer;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class TestRawSqlParsing extends BaseTestCase {
+class TestRawSqlParsing extends BaseTestCase {
 
   @Test
-  public void test() {
-
+  void test() {
     String sql
       = " select order_id, sum(order_qty*unit_price) as totalAmount"
       + " from o_order_detail "
@@ -35,13 +33,12 @@ public class TestRawSqlParsing extends BaseTestCase {
     Sql rs = ((SpiRawSql)rawSql).getSql();
 
     String s = rs.toString();
-    assertTrue(s.contains("[order_id, sum"));
+    assertThat(s).contains("select:order_id, sum");
   }
 
   @Test
   @ForPlatform(Platform.POSTGRES)
-  public void testDoubleColon() {
-
+  void testDoubleColon() {
     ResetBasicData.reset();
 
     String sql = "select id, name from o_customer where name=:name and MD5(id::text) BETWEEN '00000000000000000000000000000000' AND 'ffffffffffffffffffffffffffffffff'";
@@ -59,8 +56,7 @@ public class TestRawSqlParsing extends BaseTestCase {
   }
 
   @Test
-  public void testWhere() {
-
+  void testWhere() {
     ResetBasicData.reset();
 
     RawSql sql = RawSqlBuilder.parse("SELECT id, name FROM o_customer ${where}").create();
@@ -75,8 +71,7 @@ public class TestRawSqlParsing extends BaseTestCase {
 
   @ForPlatform({Platform.H2, Platform.POSTGRES})
   @Test
-  public void testUnion() {
-
+  void testUnion() {
     ResetBasicData.reset();
 
     String sql =
@@ -100,10 +95,9 @@ public class TestRawSqlParsing extends BaseTestCase {
     assertThat(sqlOf(query)).contains(") all_split limit 5 offset 1");
   }
 
-
   @ForPlatform({Platform.H2, Platform.POSTGRES})
   @Test
-  public void testUnion_explicitWhere() {
+  void testUnion_explicitWhere() {
     ResetBasicData.reset();
 
     String sql =
@@ -135,7 +129,7 @@ public class TestRawSqlParsing extends BaseTestCase {
 
   @ForPlatform({Platform.H2, Platform.POSTGRES})
   @Test
-  public void testUnion_explicitAndhere() {
+  void testUnion_explicitAndhere() {
     ResetBasicData.reset();
 
     String sql =
@@ -167,8 +161,7 @@ public class TestRawSqlParsing extends BaseTestCase {
 
   @ForPlatform({Platform.H2, Platform.POSTGRES})
   @Test
-  public void testColumnName2() {
-
+  void testColumnName2() {
     ResetBasicData.reset();
 
     String sql = "select 42 custId, 'bar' customerName from o_customer";
@@ -189,8 +182,7 @@ public class TestRawSqlParsing extends BaseTestCase {
 
   @ForPlatform({Platform.H2, Platform.POSTGRES})
   @Test
-  public void testColumnAlias() {
-
+  void testColumnAlias() {
     ResetBasicData.reset();
 
     String sql = "select 43 custId, name as custName from o_customer";
@@ -211,8 +203,7 @@ public class TestRawSqlParsing extends BaseTestCase {
 
   @ForPlatform({Platform.H2, Platform.POSTGRES})
   @Test
-  public void testColumnNameMapping() {
-
+  void testColumnNameMapping() {
     ResetBasicData.reset();
 
     String sql = "select v.custId, v.customerName from (select id custId, name customerName from o_customer) v";

From e3e30cafdd75f2232d7ca0fbd05c5430ec8d51c3 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Aug 2022 17:15:08 +1200
Subject: [PATCH 060/127] Refactor tidy error and log messages - part 2

---
 ebean-api/src/main/java/io/ebean/DbContext.java      | 12 +++---------
 .../main/java/io/ebean/event/ShutdownManager.java    |  4 +---
 .../java/io/ebeaninternal/api/LoadManyRequest.java   |  2 +-
 .../ebeaninternal/server/core/DefaultBeanLoader.java |  2 +-
 .../server/core/bootup/BootupClasses.java            |  2 +-
 .../server/deploy/BeanDescriptorManager.java         |  5 -----
 .../io/ebeaninternal/server/deploy/BeanTable.java    |  4 ----
 .../server/executor/DefaultBackgroundExecutor.java   |  1 -
 8 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java
index 3dca530a6..8f3883e8e 100644
--- a/ebean-api/src/main/java/io/ebean/DbContext.java
+++ b/ebean-api/src/main/java/io/ebean/DbContext.java
@@ -16,7 +16,6 @@ import static java.lang.System.Logger.Level.ERROR;
 final class DbContext {
 
   private static final System.Logger log = EbeanVersion.log;
-
   static {
     EbeanVersion.getVersion();
   }
@@ -24,14 +23,9 @@ final class DbContext {
   private static final DbContext INSTANCE = new DbContext();
 
   private final ConcurrentHashMap<String, Database> concMap = new ConcurrentHashMap<>();
-
   private final HashMap<String, Database> syncMap = new HashMap<>();
-
   private final ReentrantLock lock = new ReentrantLock();
 
-  /**
-   * The 'default' Database.
-   */
   private Database defaultDatabase;
 
   private DbContext() {
@@ -70,9 +64,9 @@ final class DbContext {
    */
   Database getDefault() {
     if (defaultDatabase == null) {
-      String msg = "The default Database has not been defined?";
-      msg += " This is normally set via the ebean.datasource.default property.";
-      msg += " Otherwise it should be registered programmatically via registerServer()";
+      String msg = "The default Database has not been defined?"
+        + " This is normally set via the ebean.datasource.default property."
+        + " Otherwise it should be registered programmatically via registerServer()";
       throw new PersistenceException(msg);
     }
     return defaultDatabase;
diff --git a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
index 3de1bb10b..91c351f30 100644
--- a/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
+++ b/ebean-api/src/main/java/io/ebean/event/ShutdownManager.java
@@ -122,9 +122,7 @@ public final class ShutdownManager {
         // Already run shutdown...
         return;
       }
-      if (log.isLoggable(DEBUG)) {
-        log.log(DEBUG, "Ebean shutting down");
-      }
+      log.log(DEBUG, "Ebean shutting down");
       stopping = true;
       deregisterShutdownHook();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
index b2956f1d2..41cd37de9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
@@ -117,7 +117,7 @@ public final class LoadManyRequest extends LoadRequest {
         if (log.isLoggable(DEBUG)) {
           EntityBean ownerBean = bc.getOwnerBean();
           Object parentId = desc.getId(ownerBean);
-          log.log(DEBUG, "BeanCollection after lazy load was empty. type:" + ownerBean.getClass().getName() + " id:" + parentId + " owner:" + ownerBean);
+          log.log(DEBUG, "BeanCollection after lazy load was empty. type:{0} id:{1} owner:{2}", ownerBean.getClass().getName(), parentId, ownerBean);
         }
       } else if (loadCache && many.isUseCache()) {
         desc.cacheManyPropPut(many, bc, desc.getId(bc.getOwnerBean()));
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 4731ebd01..38a0ebe4d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -110,7 +110,7 @@ final class DefaultBeanLoader {
     if (beanCollection != null) {
       if (beanCollection.checkEmptyLazyLoad()) {
         if (log.isLoggable(DEBUG)) {
-          log.log(DEBUG, "BeanCollection after load was empty. Owner:" + beanCollection.getOwnerBean());
+          log.log(DEBUG, "BeanCollection after load was empty. Owner:{0}", beanCollection.getOwnerBean());
         }
       } else if (useManyIdCache) {
         parentDesc.cacheManyPropPut(many, beanCollection, parentId);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
index 40c4ad442..464731024 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
@@ -207,7 +207,7 @@ public class BootupClasses implements Predicate<Class<?>> {
     try {
       return cls.getConstructor().newInstance();
     } catch (NoSuchMethodException e) {
-      log.log(DEBUG, "Ignore/expected - no default constructor: " + e.getMessage());
+      log.log(DEBUG, "Ignore/expected - no default constructor: {0}", e.getMessage());
       return null;
 
     } catch (Exception e) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 1c8311a4d..9293d9d2c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -868,11 +868,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
           if (possibleLower.contains(searchName)) {
             // we have a match
             prop.setMappedBy(possibleMappedBy);
-            if (log.isLoggable(DEBUG)) {
-              String m = "Implicitly found mappedBy for " + targetDesc + "." + prop;
-              m += " by searching for [" + searchName + "] against " + matchSet;
-              log.log(DEBUG, m);
-            }
             return true;
           }
         }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
index 0cc2f6ccf..5f76d4779 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java
@@ -1,13 +1,10 @@
 package io.ebeaninternal.server.deploy;
 
-import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.server.core.InternString;
 import io.ebeaninternal.server.deploy.meta.DeployBeanTable;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 
-import static java.lang.System.Logger.Level.DEBUG;
-
 
 /**
  * Used for associated beans in place of a BeanDescriptor. This is done to avoid
@@ -107,7 +104,6 @@ public final class BeanTable {
     if (complexKey) {
       // just to copy the column name rather than prefix with the foreignKeyPrefix.
       // I think that with complex keys this is the more common approach.
-      CoreLog.internal.log(DEBUG, "On table[{0}] foreign key column [{1}]", baseTable, lc);
       fk = lc;
     }
     if (sqlFormulaSelect != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
index f134f9da7..d7975e04b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
@@ -28,7 +28,6 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
     this.schedulePool = new DaemonScheduleThreadPool(schedulePoolSize, shutdownWaitSeconds, namePrefix + "-periodic-");
     this.pool = new DaemonExecutorService(shutdownWaitSeconds, namePrefix);
     this.wrapper = wrapper;
-    log.log(DEBUG, "Created backgroundExecutor {0} (schedulePoolSize={1}, shutdownWaitSeconds={2})", namePrefix, schedulePoolSize, shutdownWaitSeconds);
   }
 
   /**

From 7ce85fe5f2fb0ff2b9f4789489588347238f7c69 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Aug 2022 20:09:27 +1200
Subject: [PATCH 061/127] Refactor method names SpiJsonReader and DocStore
 types

---
 .../ebeaninternal/api/json/SpiJsonReader.java |  8 +--
 .../ebeaninternal/api/json/SpiJsonWriter.java |  2 +-
 .../server/deploy/BeanDescriptor.java         |  6 +-
 .../BeanDescriptorElementEmbeddedMap.java     |  2 +-
 .../deploy/BeanDescriptorElementScalar.java   |  2 +-
 .../BeanDescriptorElementScalarMap.java       |  2 +-
 .../server/deploy/BeanDescriptorJsonHelp.java |  6 +-
 .../server/deploy/BeanProperty.java           |  6 +-
 .../server/deploy/BeanPropertyAssoc.java      |  2 +-
 .../server/deploy/BeanPropertyAssocMany.java  |  2 +-
 .../deploy/BeanPropertyAssocManyJsonHelp.java |  4 +-
 .../BeanPropertyAssocManyJsonTransient.java   |  6 +-
 .../server/deploy/BeanPropertyAssocOne.java   |  4 +-
 .../deploy/DeployDocPropertyOptions.java      | 10 +--
 .../server/json/DJsonBeanReader.java          |  2 +-
 .../ebeaninternal/server/json/ReadJson.java   | 10 +--
 .../ebeaninternal/server/json/WriteJson.java  |  2 +-
 .../docstore/api/DocStoreBeanAdapter.java     |  6 +-
 .../docstore/api/DocStoreUpdates.java         | 10 +--
 .../api/mapping/DocMappingBuilder.java        | 25 +++----
 .../api/mapping/DocPropertyAdapter.java       |  4 +-
 .../api/mapping/DocPropertyMapping.java       | 20 +++---
 .../api/mapping/DocPropertyOptions.java       | 70 ++++++++-----------
 .../docstore/api/mapping/DocumentMapping.java | 26 +++----
 .../api/support/DocStoreBeanBaseAdapter.java  | 28 ++++----
 .../api/support/DocStoreDeleteEvent.java      |  3 +-
 .../support/DocStoreEmbeddedInvalidation.java |  1 -
 .../api/support/DocStoreIndexEvent.java       |  4 +-
 .../docstore/api/support/DocStructure.java    |  7 +-
 .../none/NoneDocStoreBeanAdapter.java         |  2 +-
 .../BeanDescriptor_documentMappingTest.java   | 10 +--
 .../docstore/DocStoreBeanBaseAdapterTest.java |  2 +-
 .../docstore/DocStoreDeleteEventTest.java     |  2 +-
 .../docstore/DocStoreIndexEventTest.java      |  2 +-
 34 files changed, 130 insertions(+), 168 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java b/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java
index 8082e049a..1aaaf12fe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java
@@ -12,7 +12,7 @@ import java.util.Map;
 
 public interface SpiJsonReader {
 
-  PersistenceContext getPersistenceContext();
+  PersistenceContext persistenceContext();
 
   SpiJsonReader forJson(JsonParser moreJson);
 
@@ -20,9 +20,9 @@ public interface SpiJsonReader {
 
   Object persistenceContextPutIfAbsent(Object id, EntityBean bean, BeanDescriptor<?> beanDesc);
 
-  ObjectMapper getObjectMapper();
+  ObjectMapper mapper();
 
-  JsonParser getParser();
+  JsonParser parser();
 
   JsonToken nextToken() throws IOException;
 
@@ -34,5 +34,5 @@ public interface SpiJsonReader {
 
   Object readValueUsingObjectMapper(Class<?> propertyType) throws IOException;
 
-  boolean isIntercept();
+  boolean intercept();
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonWriter.java b/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonWriter.java
index 4d80bc4f7..f6069b82c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonWriter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonWriter.java
@@ -20,7 +20,7 @@ public interface SpiJsonWriter extends JsonWriter {
   /**
    * Return true if the value is a parent bean.
    */
-  boolean isParentBean(Object value);
+  boolean parentBean(Object value);
 
   /**
    * Start an assoc one path.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 1f01cbcfb..5a3b1236b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -323,7 +323,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
     this.jsonHelp = initJsonHelp();
     this.draftHelp = new BeanDescriptorDraftHelp<>(this);
     this.docStoreAdapter = owner.createDocStoreBeanAdapter(this, deploy);
-    this.docStoreQueueId = docStoreAdapter.getQueueId();
+    this.docStoreQueueId = docStoreAdapter.queueId();
     // Check if there are no cascade save associated beans ( subject to change
     // in initialiseOther()). Note that if we are in an inheritance hierarchy
     // then we also need to check every BeanDescriptors in the InheritInfo as
@@ -966,7 +966,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    */
   @Override
   public boolean isDocStoreMapped() {
-    return docStoreAdapter.isMapped();
+    return docStoreAdapter.mapped();
   }
 
   /**
@@ -1072,7 +1072,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    * given the transactions requested mode.
    */
   public DocStoreMode docStoreMode(PersistRequest.Type persistType, DocStoreMode txnMode) {
-    return docStoreAdapter.getMode(persistType, txnMode);
+    return docStoreAdapter.mode(persistType, txnMode);
   }
 
   public void docStoreInsert(Object idValue, PersistRequestBean<T> persistRequest, DocStoreUpdateContext bulkUpdate) throws IOException {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
index e6518ad50..ecb283e5c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java
@@ -49,7 +49,7 @@ class BeanDescriptorElementEmbeddedMap<T> extends BeanDescriptorElementEmbedded<
 
   @Override
   public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
-    JsonParser parser = readJson.getParser();
+    JsonParser parser = readJson.parser();
     ElementCollector add = elementHelp.createCollector();
     do {
       String fieldName = parser.nextFieldName();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
index 13833eb77..0242c993f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java
@@ -40,7 +40,7 @@ class BeanDescriptorElementScalar<T> extends BeanDescriptorElement<T> {
 
   @Override
   public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
-    JsonParser parser = readJson.getParser();
+    JsonParser parser = readJson.parser();
     ElementCollector add = elementHelp.createCollector();
     do {
       JsonToken token = parser.nextToken();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
index a3da1779e..d5b8d91a9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalarMap.java
@@ -49,7 +49,7 @@ class BeanDescriptorElementScalarMap<T> extends BeanDescriptorElement<T> {
 
   @Override
   public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException {
-    JsonParser parser = readJson.getParser();
+    JsonParser parser = readJson.parser();
     ElementCollector add = elementHelp.createCollector();
     do {
       String fieldName = parser.nextFieldName();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
index f20db7315..0e323114b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java
@@ -66,7 +66,7 @@ final class BeanDescriptorJsonHelp<T> {
 
   @SuppressWarnings("unchecked")
   T jsonRead(SpiJsonReader jsonRead, String path, boolean withInheritance, T target) throws IOException {
-    JsonParser parser = jsonRead.getParser();
+    JsonParser parser = jsonRead.parser();
     //noinspection StatementWithEmptyBody
     if (parser.getCurrentToken() == JsonToken.START_OBJECT) {
       // start object token read by Jackson already
@@ -85,7 +85,7 @@ final class BeanDescriptorJsonHelp<T> {
       return jsonReadObject(jsonRead, path, target);
     }
 
-    ObjectNode node = jsonRead.getObjectMapper().readTree(parser);
+    ObjectNode node = jsonRead.mapper().readTree(parser);
     if (node.isNull()) {
       return null;
     }
@@ -127,7 +127,7 @@ final class BeanDescriptorJsonHelp<T> {
     // unmapped properties, send to JsonReadBeanVisitor later
     Map<String, Object> unmappedProperties = null;
     do {
-      JsonParser parser = readJson.getParser();
+      JsonParser parser = readJson.parser();
       JsonToken event = parser.nextToken();
       if (JsonToken.FIELD_NAME == event) {
         String key = parser.getCurrentName();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 91e1a0ffa..99765ff5e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -1407,7 +1407,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     JsonToken event = ctx.nextToken();
     if (JsonToken.VALUE_NULL == event) {
       if (jsonDeserialize) {
-        if (ctx.isIntercept()) {
+        if (ctx.intercept()) {
           setValueIntercept(bean, null);
         } else {
           setValue(bean, null);
@@ -1417,7 +1417,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
       // expect to read non-null json value
       Object objValue;
       if (scalarType != null) {
-        objValue = scalarType.jsonRead(ctx.getParser());
+        objValue = scalarType.jsonRead(ctx.parser());
       } else {
         try {
           objValue = ctx.readValueUsingObjectMapper(propertyType);
@@ -1430,7 +1430,7 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
         }
       }
       if (jsonDeserialize) {
-        if (ctx.isIntercept()) {
+        if (ctx.intercept()) {
           setValueIntercept(bean, objValue);
         } else {
           setValue(bean, objValue);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 78d1c2179..4d306564c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -355,7 +355,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
       mapping.push(nested);
       targetDescriptor.docStoreMapping(mapping, fullName);
       mapping.pop();
-      if (!nested.getChildren().isEmpty()) {
+      if (!nested.children().isEmpty()) {
         mapping.add(nested);
       }
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 78263cf82..feec8f8ce 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -998,7 +998,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
    */
   private Object jsonReadCollection(String json) throws IOException {
     SpiJsonReader ctx = descriptor.createJsonReader(json);
-    JsonParser parser = ctx.getParser();
+    JsonParser parser = ctx.parser();
     JsonToken event = parser.nextToken();
     if (JsonToken.VALUE_NULL == event) {
       return null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
index ba06352b7..f09bc4dc6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java
@@ -38,7 +38,7 @@ class BeanPropertyAssocManyJsonHelp {
     if (!this.many.jsonDeserialize) {
       return;
     }
-    JsonParser parser = readJson.getParser();
+    JsonParser parser = readJson.parser();
     JsonToken event = parser.nextToken();
     if (JsonToken.VALUE_NULL == event) {
       return;
@@ -50,7 +50,7 @@ class BeanPropertyAssocManyJsonHelp {
     if (JsonToken.START_ARRAY != event && JsonToken.START_OBJECT != event) {
       throw new JsonParseException(parser, "Unexpected token " + event + " - expecting start array or object");
     }
-    if (readJson.isIntercept()) {
+    if (readJson.intercept()) {
       many.setValueIntercept(parentBean, many.jsonReadCollection(readJson, parentBean));
     } else {
       many.setValue(parentBean, many.jsonReadCollection(readJson, parentBean));
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
index 32a84d584..ae82bd7c6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java
@@ -20,7 +20,7 @@ class BeanPropertyAssocManyJsonTransient {
    * Use Jackson ObjectMapper to read the transient 'many' property.
    */
   void jsonReadUsingObjectMapper(BeanPropertyAssocMany<?> many, SpiJsonReader readJson, EntityBean parentBean) throws IOException {
-    ObjectMapper mapper = readJson.getObjectMapper();
+    ObjectMapper mapper = readJson.mapper();
     ManyType manyType = many.manyType();
 
     Object value;
@@ -29,11 +29,11 @@ class BeanPropertyAssocManyJsonTransient {
       TypeFactory typeFactory = mapper.getTypeFactory();
       JavaType target = typeFactory.constructType(many.targetType());
       MapType jacksonType = typeFactory.constructMapType(LinkedHashMap.class, TypeFactory.unknownType(), target);
-      value = mapper.readValue(readJson.getParser(), jacksonType);
+      value = mapper.readValue(readJson.parser(), jacksonType);
     } else {
       // read list or set using Jackson object mapper
       CollectionType jacksonType = mapper.getTypeFactory().constructCollectionType(manyType.getCollectionType(), many.targetType());
-      value = mapper.readValue(readJson.getParser(), jacksonType);
+      value = mapper.readValue(readJson.parser(), jacksonType);
     }
     many.setValue(parentBean, value);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 37937f194..54eeae122 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -768,7 +768,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     if (value == null) {
       writeJson.writeNullField(name);
     } else {
-      if (!writeJson.isParentBean(value)) {
+      if (!writeJson.parentBean(value)) {
         // Hmmm, not writing complex non-entity bean
         if (value instanceof EntityBean) {
           writeJson.beginAssocOne(name, bean);
@@ -785,7 +785,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     if (jsonDeserialize && targetDescriptor != null) {
       T target = (T) value(bean);
       T assocBean = targetDescriptor.jsonRead(readJson, name, target);
-      if (readJson.isIntercept()) {
+      if (readJson.intercept()) {
         setValueIntercept(bean, assocBean);
       } else {
         setValue(bean, assocBean);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
index e6e00b2e9..0ce3a87a5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DeployDocPropertyOptions.java
@@ -33,7 +33,7 @@ public final class DeployDocPropertyOptions {
    */
   public void setDocSortable(DocSortable doc) {
     createOptions();
-    mapping.setSortable(true);
+    mapping.sortable(true);
     setStore(doc.store());
     setBoost(doc.boost());
     setNullValue(doc.nullValue());
@@ -44,7 +44,7 @@ public final class DeployDocPropertyOptions {
    */
   public void setDocCode(DocCode doc) {
     createOptions();
-    mapping.setCode(true);
+    mapping.code(true);
     setStore(doc.store());
     setBoost(doc.boost());
     setNullValue(doc.nullValue());
@@ -52,19 +52,19 @@ public final class DeployDocPropertyOptions {
 
   private void setNullValue(String value) {
     if (!value.isEmpty()) {
-      mapping.setNullValue(value);
+      mapping.nullValue(value);
     }
   }
 
   private void setBoost(float boost) {
     if (Float.compare(boost, 1.0F) != 0) {
-      mapping.setBoost(boost);
+      mapping.boost(boost);
     }
   }
 
   private void setStore(boolean store) {
     if (store) {
-      mapping.setStore(true);
+      mapping.store(true);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java
index 8ee649981..f1b92a78b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java
@@ -32,7 +32,7 @@ public final class DJsonBeanReader<T> implements JsonBeanReader<T> {
 
   @Override
   public PersistenceContext getPersistenceContext() {
-    return readJson.getPersistenceContext();
+    return readJson.persistenceContext();
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java
index 77f20c185..65db79c08 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java
@@ -86,7 +86,7 @@ public final class ReadJson implements SpiJsonReader {
    * Return the persistence context being used if any.
    */
   @Override
-  public PersistenceContext getPersistenceContext() {
+  public PersistenceContext persistenceContext() {
     return persistenceContext;
   }
 
@@ -142,7 +142,7 @@ public final class ReadJson implements SpiJsonReader {
    * Return the objectMapper used for this request.
    */
   @Override
-  public ObjectMapper getObjectMapper() {
+  public ObjectMapper mapper() {
     if (objectMapper == null) {
       throw new IllegalStateException(
         "Jackson ObjectMapper required but has not set. The ObjectMapper can be set on"
@@ -155,7 +155,7 @@ public final class ReadJson implements SpiJsonReader {
    * Return the JsonParser.
    */
   @Override
-  public JsonParser getParser() {
+  public JsonParser parser() {
     return parser;
   }
 
@@ -209,14 +209,14 @@ public final class ReadJson implements SpiJsonReader {
    */
   @Override
   public Object readValueUsingObjectMapper(Class<?> propertyType) throws IOException {
-    return getObjectMapper().readValue(parser, propertyType);
+    return mapper().readValue(parser, propertyType);
   }
 
   /**
    * Do we have to set values via intercept or not.
    */
   @Override
-  public boolean isIntercept() {
+  public boolean intercept() {
     return intercept;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java
index 60b52620f..39e03eb95 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java
@@ -342,7 +342,7 @@ public final class WriteJson implements SpiJsonWriter {
   }
 
   @Override
-  public boolean isParentBean(Object bean) {
+  public boolean parentBean(Object bean) {
     return !parentBeans.isEmpty() && parentBeans.contains(bean);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java
index c3a8cd6e7..a649dbf8f 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java
@@ -36,20 +36,20 @@ public interface DocStoreBeanAdapter<T> extends BeanDocType<T> {
   /**
    * Return true if this type is mapped for doc storage.
    */
-  boolean isMapped();
+  boolean mapped();
 
   /**
    * Return the unique queueId for this bean type. This is expected to be a relatively short unique
    * string (rather than a fully qualified class name).
    */
-  String getQueueId();
+  String queueId();
 
   /**
    * Determine and return how this persist type will be processed given the transaction mode.
    * <p>
    * Some transactions (like bulk updates) might specifically turn off indexing for example.
    */
-  DocStoreMode getMode(PersistRequest.Type persistType, DocStoreMode txnMode);
+  DocStoreMode mode(PersistRequest.Type persistType, DocStoreMode txnMode);
 
   /**
    * Return the index type for this bean type.
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdates.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdates.java
index 9f2fff8d5..5f8219077 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdates.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreUpdates.java
@@ -10,7 +10,7 @@ import java.util.List;
  * Collection of document store updates that are either sent to the document store
  * or queued for future processing
  */
-public class DocStoreUpdates {
+public final class DocStoreUpdates {
 
   /**
    * Persist inserts and updates.
@@ -87,28 +87,28 @@ public class DocStoreUpdates {
   /**
    * Return the persist insert and update requests to be sent to the document store.
    */
-  public List<DocStoreUpdate> getPersistEvents() {
+  public List<DocStoreUpdate> persistEvents() {
     return persistEvents;
   }
 
   /**
    * Return delete events.
    */
-  public List<DocStoreUpdate> getDeleteEvents() {
+  public List<DocStoreUpdate> deleteEvents() {
     return deleteEvents;
   }
 
   /**
    * Return the list of nested update events.
    */
-  public List<DocStoreQueueEntry> getNestedEvents() {
+  public List<DocStoreQueueEntry> nestedEvents() {
     return nestedEvents;
   }
 
   /**
    * Return the entries for sending to the queue.
    */
-  public List<DocStoreQueueEntry> getQueueEntries() {
+  public List<DocStoreQueueEntry> queueEntries() {
     return queueEntries;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java
index dc433105d..c00de4be1 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocMappingBuilder.java
@@ -12,14 +12,11 @@ import java.util.Stack;
 /**
  * Builds the DocumentMapping for a given bean type.
  */
-public class DocMappingBuilder {
+public final class DocMappingBuilder {
 
   private final PathProperties paths;
-
   private final DocStore docStore;
-
   private final Stack<DocPropertyMapping> properties = new Stack<>();
-
   private final Map<String, DocPropertyMapping> map = new LinkedHashMap<>();
 
   /**
@@ -49,12 +46,11 @@ public class DocMappingBuilder {
    * Add the property mapping.
    */
   public void add(DocPropertyMapping docMapping) {
-
     DocPropertyMapping currentParent = properties.peek();
     currentParent.addChild(docMapping);
 
-    String parentName = currentParent.getName();
-    String fullName = SplitName.add(parentName, docMapping.getName());
+    String parentName = currentParent.name();
+    String fullName = SplitName.add(parentName, docMapping.name());
     map.put(fullName, docMapping);
   }
 
@@ -82,7 +78,6 @@ public class DocMappingBuilder {
   }
 
   private void applyFieldMapping(DocMapping docMapping) {
-
     DocPropertyMapping mapping = map.get(docMapping.name());
     if (mapping == null) {
       throw new IllegalStateException("DocMapping for [" + docMapping.name() + "] but property not included in document?");
@@ -94,19 +89,16 @@ public class DocMappingBuilder {
    * Collect the mapping of properties to 'raw' properties for those marked as sortable.
    */
   public Map<String, String> collectSortable() {
-
     DocPropertyMapping peek = properties.peek();
     SortableVisitor visitor = new SortableVisitor();
     peek.visit(visitor);
-
-    return visitor.getSortableMap();
+    return visitor.sortableMap();
   }
 
   /**
    * Create the document mapping.
    */
   public DocumentMapping create(String queueId, String indexName, String indexType) {
-
     int shards = docStore.shards();
     int replicas = docStore.replicas();
     DocPropertyMapping root = properties.peek();
@@ -119,19 +111,18 @@ public class DocMappingBuilder {
    */
   private static class SortableVisitor extends DocPropertyAdapter {
 
-    private Map<String, String> sortableMap = new LinkedHashMap<>();
+    private final Map<String, String> sortableMap = new LinkedHashMap<>();
 
     @Override
     public void visitProperty(DocPropertyMapping property) {
-
-      DocPropertyOptions options = property.getOptions();
+      DocPropertyOptions options = property.options();
       if (options != null && options.isSortable()) {
-        String fullPath = pathStack.peekFullPath(property.getName());
+        String fullPath = pathStack.peekFullPath(property.name());
         sortableMap.put(fullPath, fullPath + ".raw");
       }
     }
 
-    private Map<String, String> getSortableMap() {
+    private Map<String, String> sortableMap() {
       return sortableMap;
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java
index 38aac295b..4385be512 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java
@@ -27,7 +27,7 @@ public abstract class DocPropertyAdapter implements DocPropertyVisitor {
 
   @Override
   public void visitBeginObject(DocPropertyMapping property) {
-    pathStack.push(property.getName());
+    pathStack.push(property.name());
   }
 
   @Override
@@ -37,7 +37,7 @@ public abstract class DocPropertyAdapter implements DocPropertyVisitor {
 
   @Override
   public void visitBeginList(DocPropertyMapping property) {
-    pathStack.push(property.getName());
+    pathStack.push(property.name());
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java
index 843f60f58..125616071 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java
@@ -9,15 +9,12 @@ import java.util.List;
 /**
  * Property mapping in a doc store document structure.
  */
-public class DocPropertyMapping {
+public final class DocPropertyMapping {
 
   private String name;
-
   private DocPropertyType type;
-
   private DocPropertyOptions options;
-
-  private List<DocPropertyMapping> children = new ArrayList<>();
+  private final List<DocPropertyMapping> children = new ArrayList<>();
 
   /**
    * Construct ROOT.
@@ -70,7 +67,6 @@ public class DocPropertyMapping {
   }
 
   private void visitChildren(DocPropertyVisitor visitor) {
-
     for (DocPropertyMapping property : children) {
       property.visit(visitor);
     }
@@ -78,41 +74,41 @@ public class DocPropertyMapping {
 
   @Override
   public String toString() {
-    return "name:" + name + " type:" + type + " options(" + options + ")";
+    return "name:" + name + " type:" + type + " options:" + options;
   }
 
   /**
    * Return the type of the property.
    */
-  public DocPropertyType getType() {
+  public DocPropertyType type() {
     return type;
   }
 
   /**
    * Set the type of the property.
    */
-  public void setType(DocPropertyType type) {
+  public void type(DocPropertyType type) {
     this.type = type;
   }
 
   /**
    * Return the property name.
    */
-  public String getName() {
+  public String name() {
     return name;
   }
 
   /**
    * Return the property options.
    */
-  public DocPropertyOptions getOptions() {
+  public DocPropertyOptions options() {
     return options;
   }
 
   /**
    * Return the child nested properties.
    */
-  public List<DocPropertyMapping> getChildren() {
+  public List<DocPropertyMapping> children() {
     return children;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java
index e7ee70d63..3fe031260 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java
@@ -6,45 +6,32 @@ import io.ebean.annotation.DocProperty;
 /**
  * Options for mapping a property for document storage.
  */
-public class DocPropertyOptions {
+public final class DocPropertyOptions {
 
   private Boolean code;
-
   private Boolean sortable;
-
   private Boolean store;
-
   private Float boost;
-
   private String nullValue;
-
   private Boolean includeInAll;
-
   private Boolean enabled;
-
   private Boolean norms;
-
   private Boolean docValues;
-
   private String analyzer;
-
   private String searchAnalyzer;
-
   private String copyTo;
-
   private DocProperty.Option options;
 
   /**
    * Construct with no values set.
    */
   public DocPropertyOptions() {
-
   }
 
   /**
    * Construct as a copy of the source options.
    */
-  protected DocPropertyOptions(DocPropertyOptions source) {
+  DocPropertyOptions(DocPropertyOptions source) {
     this.code = source.code;
     this.sortable = source.sortable;
     this.store = source.store;
@@ -85,11 +72,11 @@ public class DocPropertyOptions {
     return Boolean.TRUE.equals(code);
   }
 
-  public Boolean getCode() {
+  public Boolean code() {
     return code;
   }
 
-  public void setCode(Boolean code) {
+  public void code(Boolean code) {
     this.code = code;
   }
 
@@ -97,91 +84,91 @@ public class DocPropertyOptions {
     return Boolean.TRUE.equals(sortable);
   }
 
-  public Boolean getSortable() {
+  public Boolean sortable() {
     return sortable;
   }
 
-  public void setSortable(Boolean sortable) {
+  public void sortable(Boolean sortable) {
     this.sortable = sortable;
   }
 
-  public Float getBoost() {
+  public Float boost() {
     return boost;
   }
 
-  public void setBoost(Float boost) {
+  public void boost(Float boost) {
     this.boost = boost;
   }
 
-  public String getNullValue() {
+  public String nullValue() {
     return nullValue;
   }
 
-  public void setNullValue(String nullValue) {
+  public void nullValue(String nullValue) {
     this.nullValue = nullValue;
   }
 
-  public Boolean getStore() {
+  public Boolean store() {
     return store;
   }
 
-  public void setStore(Boolean store) {
+  public void store(Boolean store) {
     this.store = store;
   }
 
-  public Boolean getIncludeInAll() {
+  public Boolean includeInAll() {
     return includeInAll;
   }
 
-  public void setIncludeInAll(Boolean includeInAll) {
+  public void includeInAll(Boolean includeInAll) {
     this.includeInAll = includeInAll;
   }
 
-  public Boolean getDocValues() {
+  public Boolean docValues() {
     return docValues;
   }
 
-  public void setDocValues(Boolean docValues) {
+  public void docValues(Boolean docValues) {
     this.docValues = docValues;
   }
 
-  public String getAnalyzer() {
+  public String analyzer() {
     return analyzer;
   }
 
-  public void setAnalyzer(String analyzer) {
+  public void analyzer(String analyzer) {
     this.analyzer = analyzer;
   }
 
-  public String getSearchAnalyzer() {
+  public String searchAnalyzer() {
     return searchAnalyzer;
   }
 
-  public void setSearchAnalyzer(String searchAnalyzer) {
+  public void searchAnalyzer(String searchAnalyzer) {
     this.searchAnalyzer = searchAnalyzer;
   }
 
-  public String getCopyTo() {
+  public String copyTo() {
     return copyTo;
   }
 
-  public void setCopyTo(String copyTo) {
+  public void copyTo(String copyTo) {
     this.copyTo = copyTo;
   }
 
-  public Boolean getEnabled() {
+  public Boolean enabled() {
     return enabled;
   }
 
-  public void setEnabled(Boolean enabled) {
+  public void enabled(Boolean enabled) {
     this.enabled = enabled;
   }
 
-  public Boolean getNorms() {
+  public Boolean norms() {
     return norms;
   }
 
-  public void setNorms(Boolean norms) {
+  public void norms(Boolean norms) {
     this.norms = norms;
   }
 
@@ -192,11 +179,11 @@ public class DocPropertyOptions {
     return options != null && options != DocProperty.Option.DEFAULT;
   }
 
-  public DocProperty.Option getOptions() {
+  public DocProperty.Option options() {
     return options;
   }
 
-  public void setOptions(DocProperty.Option options) {
+  public void options(DocProperty.Option options) {
     this.options = options;
   }
 
@@ -218,7 +205,6 @@ public class DocPropertyOptions {
    * Apply the property level mapping options.
    */
   public void apply(DocProperty docMapping) {
-
     options = docMapping.options();
     if (docMapping.code()) {
       code = true;
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java
index 0b68545c7..57f8006ef 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java
@@ -6,20 +6,14 @@ import io.ebean.docstore.DocMapping;
 /**
  * Mapping for a document stored in a doc store (like ElasticSearch).
  */
-public class DocumentMapping implements DocMapping {
+public final class DocumentMapping implements DocMapping {
 
   protected final String queueId;
-
   protected final String name;
-
   protected final String type;
-
   protected final FetchPath paths;
-
   protected final DocPropertyMapping properties;
-
   protected int shards;
-
   protected int replicas;
 
   public DocumentMapping(String queueId, String name, String type, FetchPath paths, DocPropertyMapping properties, int shards, int replicas) {
@@ -42,63 +36,63 @@ public class DocumentMapping implements DocMapping {
   /**
    * Return the queueId.
    */
-  public String getQueueId() {
+  public String queueId() {
     return queueId;
   }
 
   /**
    * Return the name.
    */
-  public String getName() {
+  public String name() {
     return name;
   }
 
   /**
    * Return the type.
    */
-  public String getType() {
+  public String type() {
     return type;
   }
 
   /**
    * Return the document structure as PathProperties.
    */
-  public FetchPath getPaths() {
+  public FetchPath paths() {
     return paths;
   }
 
   /**
    * Return the document structure with mapping details.
    */
-  public DocPropertyMapping getProperties() {
+  public DocPropertyMapping properties() {
     return properties;
   }
 
   /**
    * Return the number of shards.
    */
-  public int getShards() {
+  public int shards() {
     return shards;
   }
 
   /**
    * Set the number of shards.
    */
-  public void setShards(int shards) {
+  public void shards(int shards) {
     this.shards = shards;
   }
 
   /**
    * Return the number of replicas.
    */
-  public int getReplicas() {
+  public int replicas() {
     return replicas;
   }
 
   /**
    * Set the number of replicas.
    */
-  public void setReplicas(int replicas) {
+  public void replicas(int replicas) {
     this.replicas = replicas;
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
index 626daf1b4..3fddd23cb 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java
@@ -196,24 +196,24 @@ public abstract class DocStoreBeanBaseAdapter<T> implements DocStoreBeanAdapter<
         update = DocStoreMode.UPDATE;
       }
     }
-    embeddedInvalidation.add(getEmbeddedInvalidation(queueId, path, properties));
+    embeddedInvalidation.add(embeddedInvalidation(queueId, path, properties));
   }
 
   /**
    * Return the DsInvalidationListener based on the properties, path.
    */
-  protected DocStoreEmbeddedInvalidation getEmbeddedInvalidation(String queueId, String path, Set<String> properties) {
+  protected DocStoreEmbeddedInvalidation embeddedInvalidation(String queueId, String path, Set<String> properties) {
     if (properties.contains("*")) {
       return new DocStoreEmbeddedInvalidation(queueId, path);
     } else {
-      return new DocStoreEmbeddedInvalidationProperties(queueId, path, getPropertyPositions(properties));
+      return new DocStoreEmbeddedInvalidationProperties(queueId, path, propertyPositions(properties));
     }
   }
 
   /**
    * Return the property names as property index positions.
    */
-  protected int[] getPropertyPositions(Set<String> properties) {
+  protected int[] propertyPositions(Set<String> properties) {
     List<Integer> posList = new ArrayList<>();
     for (String property : properties) {
       BeanProperty prop = desc.beanProperty(property);
@@ -244,10 +244,10 @@ public abstract class DocStoreBeanBaseAdapter<T> implements DocStoreBeanAdapter<
     if (pathProps == null) {
       pathProps = new PathProperties();
     }
-    return getDocStructure(pathProps, includeByDefault);
+    return docStructure(pathProps, includeByDefault);
   }
 
-  protected DocStructure getDocStructure(PathProperties pathProps, final boolean includeByDefault) {
+  protected DocStructure docStructure(PathProperties pathProps, final boolean includeByDefault) {
     final DocStructure docStructure = new DocStructure(pathProps);
     BeanProperty[] properties = desc.propertiesNonTransient();
     for (BeanProperty property : properties) {
@@ -267,35 +267,35 @@ public abstract class DocStoreBeanBaseAdapter<T> implements DocStoreBeanAdapter<
 
   @Override
   public FetchPath embedded(String path) {
-    return docStructure.getEmbedded(path);
+    return docStructure.embedded(path);
   }
 
   @Override
   public FetchPath embeddedManyRoot(String path) {
-    return docStructure.getEmbeddedManyRoot(path);
+    return docStructure.embeddedManyRoot(path);
   }
 
   @Override
-  public boolean isMapped() {
+  public boolean mapped() {
     return mapped;
   }
 
   @Override
-  public String getQueueId() {
+  public String queueId() {
     return queueId;
   }
 
   @Override
-  public DocStoreMode getMode(PersistRequest.Type persistType, DocStoreMode txnMode) {
+  public DocStoreMode mode(PersistRequest.Type persistType, DocStoreMode txnMode) {
     if (txnMode == null) {
-      return getMode(persistType);
+      return mode(persistType);
     } else if (txnMode == DocStoreMode.IGNORE) {
       return DocStoreMode.IGNORE;
     }
-    return mapped ? txnMode : getMode(persistType);
+    return mapped ? txnMode : mode(persistType);
   }
 
-  private DocStoreMode getMode(PersistRequest.Type persistType) {
+  private DocStoreMode mode(PersistRequest.Type persistType) {
     switch (persistType) {
       case INSERT:
         return insert;
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java
index 35c120bd4..f5be5e6c9 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEvent.java
@@ -10,10 +10,9 @@ import java.io.IOException;
 /**
  * A 'Delete by Id' request that is send to the document store.
  */
-public class DocStoreDeleteEvent implements DocStoreUpdate {
+public final class DocStoreDeleteEvent implements DocStoreUpdate {
 
   private final BeanType<?> beanType;
-
   private final Object idValue;
 
   public DocStoreDeleteEvent(BeanType<?> beanType, Object idValue) {
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java
index bbf5ca009..b96f1f839 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreEmbeddedInvalidation.java
@@ -9,7 +9,6 @@ import io.ebeanservice.docstore.api.DocStoreUpdates;
 public class DocStoreEmbeddedInvalidation {
 
   protected final String queueId;
-
   protected final String path;
 
   public DocStoreEmbeddedInvalidation(String queueId, String path) {
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java
index ad1e5a706..e5df3e2ac 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreIndexEvent.java
@@ -10,12 +10,10 @@ import java.io.IOException;
 /**
  * A 'Delete by Id' request that is send to the document store.
  */
-public class DocStoreIndexEvent<T> implements DocStoreUpdate {
+public final class DocStoreIndexEvent<T> implements DocStoreUpdate {
 
   private final BeanType<T> beanType;
-
   private final Object idValue;
-
   private final T bean;
 
   public DocStoreIndexEvent(BeanType<T> beanType, Object idValue, T bean) {
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java
index d2d3a3ac4..ffc0942d9 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStructure.java
@@ -12,7 +12,7 @@ import java.util.Set;
 /**
  * Document structure for mapping to document store.
  */
-public class DocStructure {
+public final class DocStructure {
 
   /**
    * The full document structure.
@@ -58,11 +58,11 @@ public class DocStructure {
   /**
    * Return the document structure for an embedded path.
    */
-  public FetchPath getEmbedded(String path) {
+  public FetchPath embedded(String path) {
     return embedded.get(path);
   }
 
-  public FetchPath getEmbeddedManyRoot(String path) {
+  public FetchPath embeddedManyRoot(String path) {
     return manyRoot.get(path);
   }
 
@@ -83,7 +83,6 @@ public class DocStructure {
    * Add a PathProperties for an embedded 'many' property (at the root level).
    */
   private void prepare(String prop, BeanPropertyAssoc<?> embProp) {
-
     BeanDescriptor<?> targetDesc = embProp.targetDescriptor();
 
     PathProperties manyRootPath = new PathProperties();
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java
index 2be5d1c13..4449a91a8 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/none/NoneDocStoreBeanAdapter.java
@@ -19,7 +19,7 @@ public final class NoneDocStoreBeanAdapter<T> extends DocStoreBeanBaseAdapter<T>
   }
 
   @Override
-  public boolean isMapped() {
+  public boolean mapped() {
     return false;
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java
index 6968e3fc7..b4a77dc8b 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java
@@ -18,7 +18,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTest {
 
     DocumentMapping documentMapping = desc.docMapping();
 
-    DocPropertyMapping properties = documentMapping.getProperties();
+    DocPropertyMapping properties = documentMapping.properties();
 
     assertThat(properties).isNotNull();
   }
@@ -30,7 +30,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTest {
 
     DocumentMapping documentMapping = desc.docMapping();
 
-    DocPropertyMapping properties = documentMapping.getProperties();
+    DocPropertyMapping properties = documentMapping.properties();
 
     assertThat(properties).isNotNull();
 
@@ -46,7 +46,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTest {
 
     @Override
     public void visitProperty(DocPropertyMapping property) {
-      sb.append(property.getName() + ",");
+      sb.append(property.name() + ",");
     }
 
     @Override
@@ -62,7 +62,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTest {
 
     @Override
     public void visitBeginObject(DocPropertyMapping property) {
-      sb.append(" object{" + property.getName() + ":");
+      sb.append(" object{" + property.name() + ":");
     }
 
     @Override
@@ -72,7 +72,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTest {
 
     @Override
     public void visitBeginList(DocPropertyMapping property) {
-      sb.append(" nested{" + property.getName() + ": [");
+      sb.append(" nested{" + property.name() + ": [");
     }
 
     @Override
diff --git a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java
index 2625d992c..76d35ac6c 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java
@@ -34,7 +34,7 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase {
 
     Assertions.assertThat(adapter.indexName()).isEqualTo("order");
     Assertions.assertThat(adapter.indexType()).isEqualTo("order");
-    Assertions.assertThat(adapter.getQueueId()).isEqualTo("order");
+    Assertions.assertThat(adapter.queueId()).isEqualTo("order");
   }
 
   static class TDAdapter<T> extends DocStoreBeanBaseAdapter<T> {
diff --git a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java
index 1a626481c..1cb3af85f 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java
@@ -51,7 +51,7 @@ public class DocStoreDeleteEventTest {
     DocStoreUpdates updates = new DocStoreUpdates();
     event.addToQueue(updates);
 
-    List<DocStoreQueueEntry> queueEntries = updates.getQueueEntries();
+    List<DocStoreQueueEntry> queueEntries = updates.queueEntries();
     assertThat(queueEntries).hasSize(1);
 
     DocStoreQueueEntry entry = queueEntries.get(0);
diff --git a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java
index 241642e90..5b0860392 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java
@@ -55,7 +55,7 @@ public class DocStoreIndexEventTest {
     DocStoreUpdates updates = new DocStoreUpdates();
     event.addToQueue(updates);
 
-    List<DocStoreQueueEntry> queueEntries = updates.getQueueEntries();
+    List<DocStoreQueueEntry> queueEntries = updates.queueEntries();
     assertThat(queueEntries).hasSize(1);
 
     DocStoreQueueEntry entry = queueEntries.get(0);

From 81ef967d9f2c7b967467ffbd8a924a42ae980fe9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Aug 2022 22:02:32 +1200
Subject: [PATCH 062/127] IntelliJ Inspect various improvements

---
 .../java/io/ebeaninternal/api/BindParams.java |  3 +--
 .../java/io/ebeaninternal/api/ScopeTrans.java |  6 +++---
 .../ebeaninternal/api/ScopedTransaction.java  |  2 +-
 .../io/ebeaninternal/api/SpiExpression.java   |  4 ++--
 .../ebeaninternal/api/TransactionEvent.java   |  2 +-
 .../api/TxnProfileEventCodes.java             |  2 +-
 .../server/core/DumpMetrics.java              |  6 +-----
 .../server/core/PersistRequestUpdateSql.java  |  4 ++--
 .../server/core/SpiOrmQueryRequest.java       |  2 +-
 .../server/core/SpiResultSet.java             |  2 +-
 .../server/core/bootup/ManifestReader.java    |  3 +--
 .../server/deploy/BeanDescriptor.java         |  5 ++---
 .../deploy/BeanDescriptorCacheHelp.java       |  4 +---
 .../server/deploy/BeanPropertyAssoc.java      |  4 ++--
 .../deploy/BeanPropertyOrderColumn.java       |  2 +-
 .../server/deploy/DbMigrationInfo.java        |  2 +-
 .../server/deploy/id/IdBinderSimple.java      |  4 +---
 .../deploy/meta/DeployIdentityMode.java       |  4 ++--
 .../server/deploy/meta/DeployTableJoin.java   |  1 -
 .../io/ebeaninternal/server/dto/DtoMeta.java  |  4 ++--
 .../io/ebeaninternal/server/el/CharMatch.java |  4 ++--
 .../io/ebeaninternal/server/el/ElFilter.java  |  2 +-
 .../server/grammer/EqlWhereListener.java      |  1 -
 .../server/idgen/UuidV1IdGenerator.java       |  2 +-
 .../server/idgen/UuidV1RndIdGenerator.java    | 12 +++++------
 .../server/idgen/UuidV4IdGenerator.java       |  2 +-
 .../ebeaninternal/server/persist/Binder.java  |  5 +----
 .../persist/platform/MultiValueBind.java      |  4 +---
 .../server/query/CQueryBuilder.java           |  8 +++----
 .../server/query/CQueryPredicates.java        |  2 +-
 .../server/query/SqlTreeNode.java             |  2 +-
 .../server/querydefn/DefaultOrmQuery.java     |  6 +++---
 .../server/querydefn/OrmQueryDetail.java      |  2 +-
 .../server/querydefn/SimpleTextParser.java    |  7 ++-----
 .../server/rawsql/SpiRawSql.java              | 21 ++++++++-----------
 .../readaudit/DefaultReadAuditLogger.java     |  4 ++--
 .../server/transaction/JdbcTransaction.java   |  2 +-
 .../server/type/ScalarTypeBigDecimal.java     |  2 +-
 .../server/type/ScalarTypeDuration.java       |  1 -
 .../server/type/ScalarTypeFile.java           |  8 +------
 .../server/type/TypeResolver.java             |  2 +-
 .../server/util/BindParamsParser.java         |  3 +--
 .../api/mapping/DocPropertyAdapter.java       |  2 +-
 .../docstore/api/mapping/DocumentMapping.java | 14 ++++++-------
 44 files changed, 75 insertions(+), 109 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
index 1c6d43719..7fffd8c3b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java
@@ -228,10 +228,9 @@ public final class BindParams implements Serializable {
   /**
    * Set a named In parameter that is multi-valued.
    */
-  public Param setArrayParameter(String name, Collection<?> value) {
+  public void setArrayParameter(String name, Collection<?> value) {
     Param p = getParam(name);
     p.setInValue(new MultiValueWrapper(value));
-    return p;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
index da38b3856..d0bc7bcef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
@@ -93,7 +93,7 @@ public final class ScopeTrans {
   /**
    * Return the current/active transaction.
    */
-  protected SpiTransaction getTransaction() {
+  SpiTransaction getTransaction() {
     return transaction;
   }
 
@@ -124,7 +124,7 @@ public final class ScopeTrans {
     }
   }
 
-  protected void commitTransaction() {
+  void commitTransaction() {
     if (created) {
       transaction.commit();
     } else {
@@ -175,7 +175,7 @@ public final class ScopeTrans {
     return e;
   }
 
-  protected void rollback(Throwable e) {
+  void rollback(Throwable e) {
     if (transaction != null && transaction.isActive()) {
       // transaction is null for NOT_SUPPORTED and sometimes SUPPORTS
       // and Inactive (already rolled back) if nested REQUIRED
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 323a9b7da..10fa49a13 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -7,7 +7,7 @@ import javax.persistence.PersistenceException;
 
 /**
  * Manage scoped (typically thread local) transactions.
- *
+ * <p>
  * These can be nested and internally they are pushed and popped from a stack.
  */
 public final class ScopedTransaction extends SpiTransactionProxy {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
index 8fe986259..e4392bf17 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
@@ -13,8 +13,8 @@ import java.io.IOException;
  */
 public interface SpiExpression extends Expression {
 
-  static final String SQL_TRUE = "1=1";
-  static final String SQL_FALSE = "1=0";
+  String SQL_TRUE = "1=1";
+  String SQL_FALSE = "1=0";
 
   /**
    * Simplify nested expressions if possible.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java
index c2c6194cd..2c06dbb81 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/TransactionEvent.java
@@ -139,7 +139,7 @@ public final class TransactionEvent implements Serializable {
 
   /**
    * Return the CacheChangeSet that we add cache notification messages to.
-   *
+   * <p>
    * We want to add to this change set as we process requests allowing the
    * PersistRequestBean to be garbage collected for large transactions.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java b/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java
index 8c492d77b..f2339cbc9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/TxnProfileEventCodes.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.api;
 
 /**
  * Event codes used in transaction profiling.
- *
+ * <p>
  * These appear in verbose transaction profile logs.
  */
 public interface TxnProfileEventCodes {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
index 73ad97f2c..c13a7d6db 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetrics.java
@@ -100,11 +100,7 @@ final class DumpMetrics {
   }
 
   private void logCount(MetaCountMetric metric) {
-
-    StringBuilder sb = new StringBuilder();
-    sb.append(padNameTimed(metric.name())).append(" ");
-    sb.append(" count:").append(pad(metric.count()));
-    out(sb.toString());
+    out(padNameTimed(metric.name()) + " count:" + pad(metric.count()));
   }
 
   private void out(String sb) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
index 63f31434a..e2f898e3c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java
@@ -49,9 +49,9 @@ public final class PersistRequestUpdateSql extends PersistRequest {
   /**
    * Add this statement to JDBC batch for later execution.
    */
-  public int addBatch() {
+  public void addBatch() {
     this.addBatch = true;
-    return executeStatement(true);
+    executeStatement(true);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
index c3f98854b..039158200 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java
@@ -138,7 +138,7 @@ public interface SpiOrmQueryRequest<T> extends BeanQueryRequest<T>, DocQueryRequ
   /**
    * Maybe hit the bean cache returning true if everything was obtained from the
    * cache (that there were no misses).
-   *
+   * <p>
    * Do this for findList() on many natural keys or many Ids.
    */
   boolean getFromBeanCache();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
index e95c0d461..ed114375b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiResultSet.java
@@ -5,7 +5,7 @@ import java.sql.ResultSet;
 
 /**
  * Hold the JDBC PreparedStatement and ResultSet.
- *
+ * <p>
  * These both must be closed properly when done.
  */
 public final class SpiResultSet {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
index 456b90987..e794740e5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java
@@ -55,7 +55,7 @@ class ManifestReader {
   /**
    * Read all the specific manifest files and return the set of packages containing type query beans.
    */
-  private Set<String> read(ClassLoader classLoader, String resourcePath) {
+  private void read(ClassLoader classLoader, String resourcePath) {
     try {
       Enumeration<URL> resources = classLoader.getResources(resourcePath);
       while (resources.hasMoreElements()) {
@@ -66,7 +66,6 @@ class ManifestReader {
     } catch (IOException e) {
       log.log(WARNING, "Error reading " + resourcePath + " manifest resources", e);
     }
-    return packageSet;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 5a3b1236b..eddf39e5d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -3157,18 +3157,17 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   /**
    * Return true if any mutable properties are dirty.
    */
-  public boolean checkAnyMutableProperties(EntityBeanIntercept ebi) {
+  public void checkAnyMutableProperties(EntityBeanIntercept ebi) {
     for (BeanProperty beanProperty : propertiesMutable) {
       int propertyIndex = beanProperty.propertyIndex();
       if (ebi.isLoadedProperty(propertyIndex)) {
         Object value = beanProperty.getValue(ebi.getOwner());
         if (beanProperty.checkMutable(value, ebi.isDirtyProperty(propertyIndex), ebi)) {
           ebi.markPropertyAsChanged(propertyIndex);
-          return true;
+          return;
         }
       }
     }
-    return false;
   }
 
   public ConcurrencyMode concurrencyMode(EntityBeanIntercept ebi) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
index 015fcbe70..eba2da8ee 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
@@ -706,9 +706,7 @@ final class BeanDescriptorCacheHelp<T> {
     }
 
     Set<EntityBeanIntercept> loaded = new HashSet<>();
-    Iterator<Map.Entry<Object, Object>> iterator = hits.entrySet().iterator();
-    while (iterator.hasNext()) {
-      Map.Entry<Object, Object> hit = iterator.next();
+    for (Map.Entry<Object, Object> hit : hits.entrySet()) {
       Object key = hit.getKey();
       EntityBeanIntercept ebi = ebis.remove(key);
       CachedBeanData cacheData = (CachedBeanData) hit.getValue();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 4d306564c..1cc67ee15 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -366,7 +366,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    */
   public boolean isUpdateable() {
     TableJoinColumn[] columns = tableJoin.columns();
-    if (columns.length <= 0) {
+    if (columns.length == 0) {
       return true;
     }
     for (TableJoinColumn column : columns) {
@@ -383,7 +383,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
    */
   public boolean isInsertable() {
     TableJoinColumn[] columns = tableJoin.columns();
-    if (columns.length <= 0) {
+    if (columns.length == 0) {
       return true;
     }
     for (TableJoinColumn column : columns) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java
index a6ac913b9..7820e722d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyOrderColumn.java
@@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 /**
  * Bean property for synthetic sort order value / order column.
- *
+ * <p>
  * The value of which is held on the entity bean intercept.
  */
 public final class BeanPropertyOrderColumn extends BeanProperty {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
index d41f781f5..a356beb41 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
@@ -30,7 +30,7 @@ public final class DbMigrationInfo {
     if (scripts.length == 0) {
       return Collections.emptyList();
     } else {
-      return Collections.unmodifiableList(Arrays.asList(scripts));
+      return List.of(scripts);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
index 97f2bae2f..729ad0adb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
@@ -145,9 +145,7 @@ public final class IdBinderSimple implements IdBinder {
   @Override
   public void addIdInBindValues(SpiExpressionRequest request, Collection<?> values) {
     List<Object> copy = new ArrayList<>(values);
-    for (int i = 0; i < copy.size(); i++) {
-      copy.set(i, convertSetId(copy.get(i), null));
-    }
+    copy.replaceAll(idValue -> convertSetId(idValue, null));
     request.addBindValue(new MultiValueWrapper(copy));
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java
index 6a20d9145..6f70bff19 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployIdentityMode.java
@@ -12,10 +12,10 @@ public final class DeployIdentityMode {
   }
 
   private IdType type;
-  private IdentityGenerated generated;
+  private final IdentityGenerated generated;
   private int start;
   private int increment;
-  private int cache;
+  private final int cache;
   private String sequenceName;
   private boolean platformDefault;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
index 8a56e8a82..0f3ed54c1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java
@@ -137,7 +137,6 @@ public final class DeployTableJoin {
 
   /**
    * Returns the clause of an extra &#64;Where annotation.
-   * @return
    */
   public String getExtraWhere() {
     return extraWhere;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
index cb7ec4797..fed2ff4c1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMeta.java
@@ -6,8 +6,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Holds property and constructor meta data for a given DTO bean type.
- *
+ * Holds property and constructor meta-data for a given DTO bean type.
+ * <p>
  * Uses this to map a mapping request (columns) to a 'query plan' (constructor and setters).
  */
 final class DtoMeta {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/CharMatch.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/CharMatch.java
index 13af0c02a..53622a8ab 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/CharMatch.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/CharMatch.java
@@ -23,7 +23,7 @@ public final class CharMatch {
       return false;
     }
 
-    char ta[] = other.toCharArray();
+    char[] ta = other.toCharArray();
 
     int pos = -1;
     while (++pos < maxLength) {
@@ -42,7 +42,7 @@ public final class CharMatch {
       return false;
     }
 
-    char ta[] = other.toCharArray();
+    char[] ta = other.toCharArray();
 
     int offset = ta.length - maxLength;
     int pos = maxLength;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java
index bd28af35c..105dff381 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/el/ElFilter.java
@@ -46,7 +46,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
-  protected boolean isMatch(T bean) {
+  boolean isMatch(T bean) {
     for (ElMatcher<T> matcher : matches) {
       if (!matcher.isMatch(bean)) {
         return false;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
index 9a239b7ea..c919a2e97 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java
@@ -342,7 +342,6 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
       case ':':
         return EqlValueType.NAMED_PARAM;
       case 't':
-        return EqlValueType.BOOL;
       case 'f':
         return EqlValueType.BOOL;
       case '\'':
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
index d17a8385d..386f177c5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1IdGenerator.java
@@ -225,7 +225,7 @@ public class UuidV1IdGenerator extends UuidV1RndIdGenerator {
           stateFile, propNodeId, getNodeIdentifier());
         return false;
       }
-      Integer seq = Integer.valueOf(prop.getProperty("clockSeq")) & 0x3FFF;
+      Integer seq = Integer.parseInt(prop.getProperty("clockSeq")) & 0x3FFF;
       Long ts = Long.valueOf(prop.getProperty("timeStamp"));
       clockSeq.set(seq);
       timeStamp.set(ts);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
index 484d92698..21e34a8b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV1RndIdGenerator.java
@@ -14,15 +14,15 @@ import static java.lang.System.Logger.Level.INFO;
 
 /**
  * IdGenerator for (pseudo) type 1 UUIDs.
- *
+ * <p>
  * This implementation generates a type 1 UUID according to
  * https://tools.ietf.org/html/rfc4122.html#section-4.2
  * but has no persistence storage. It generates a new random 47 bit node ID with every
  * UUID.
- *
+ * <p>
  * Use this, if you want randomness in your UUIDs but want to take advantage of index
  * optimizations of the database. It may be good with AUTO_BINARY_OPTIMIZED and MySql.
- *
+ * <p>
  * See: https://www.percona.com/blog/2014/12/19/store-uuid-optimized-way/
  */
 public class UuidV1RndIdGenerator implements PlatformIdGenerator {
@@ -41,16 +41,16 @@ public class UuidV1RndIdGenerator implements PlatformIdGenerator {
 
   private final SecureRandom numberGenerator = new SecureRandom();
 
-  protected AtomicLong timeStamp = new AtomicLong(currentUuidTime());
+  protected final AtomicLong timeStamp = new AtomicLong(currentUuidTime());
 
-  private AtomicLong nanoToMilliOffset = new AtomicLong(currentUuidTime());
+  private final AtomicLong nanoToMilliOffset = new AtomicLong(currentUuidTime());
 
   private final ReentrantLock lock = new ReentrantLock();
 
 
   /**
    * Returns the uuid epoch.
-   *
+   * <p>
    * This is the number of 100ns intervals since 1582-10-15 00:00:00
    */
   private static long currentUuidTime() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java
index c7d1d8093..1ed619761 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/idgen/UuidV4IdGenerator.java
@@ -7,7 +7,7 @@ import java.util.UUID;
 
 /**
  * IdGenerator for java util UUID.
- *
+ * <p>
  * This generator generates a 60bit random UUID according to
  * https://tools.ietf.org/html/rfc4122.html#section-4.4
  * Use this generator if you want truly random UUIDs
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 82db7fdd6..5dd0af06a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -163,11 +163,10 @@ public final class Binder {
   /**
    * Bind an Object with unknown data type.
    */
-  public Object bindObject(DataBind dataBind, Object value) throws SQLException {
+  public void bindObject(DataBind dataBind, Object value) throws SQLException {
     if (value == null) {
       // null of unknown type
       bindObject(dataBind, null, Types.OTHER);
-      return null;
 
     } else if (value instanceof MultiValueWrapper) {
       MultiValueWrapper wrapper = (MultiValueWrapper) value;
@@ -177,7 +176,6 @@ public final class Binder {
       int dbType = type.jdbcType();
       // let the multiValueBind decide what to do with the value
       multiValueBind.bindMultiValues(dataBind, values, type, one -> bindObject(dataBind, one, dbType));
-      return values;
 
     } else {
       ScalarType<?> type = getScalarType(value.getClass());
@@ -186,7 +184,6 @@ public final class Binder {
         value = type.toJdbcType(value);
       }
       bindObject(dataBind, value, type.jdbcType());
-      return value;
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
index 59471c793..db47defcf 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java
@@ -60,9 +60,7 @@ public class MultiValueBind {
       sb.append(" not");
     }
     sb.append(" in (?");
-    for (int i = 1; i < size; i++) {
-      sb.append(",?");
-    }
+    sb.append(",?".repeat(Math.max(0, size - 1)));
     sb.append(")");
     return sb.toString();
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index b01f254c6..acb3e1708 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -36,6 +36,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import static java.util.Objects.requireNonNullElse;
+
 /**
  * Generates the SQL SELECT statements taking into account the physical
  * deployment properties.
@@ -411,11 +413,7 @@ final class CQueryBuilder {
         String tableName = lower(metaData.getTableName(i));
         String columnName = lower(metaData.getColumnName(i));
         String path = desc.findBeanPath(schemaName, tableName, columnName);
-        if (path != null) {
-          propertyNames.add(path);
-        } else {
-          propertyNames.add(SpiRawSql.IGNORE_COLUMN);
-        }
+        propertyNames.add(requireNonNullElse(path, SpiRawSql.IGNORE_COLUMN));
       }
       RawSql rawSql = RawSqlBuilder.resultSet(resultSet, propertyNames.toArray(new String[0]));
       query.setRawSql(rawSql);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
index f93ab8d17..1577768c1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java
@@ -334,7 +334,7 @@ public final class CQueryPredicates {
       // orderById is already in the order by clause
       return orderBy;
     }
-    if (idPos <= -1 || idPos >= manyPos) {
+    if (idPos == -1 || idPos >= manyPos) {
       if (idPos > manyPos) {
         // there was an error with the order by...
         String msg = "A Query on [" + desc + "] includes a join to a 'many' association [" + manyProp.name()
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
index 3d50a9377..5aff65c43 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
@@ -83,5 +83,5 @@ interface SqlTreeNode {
    * Unselect lobs (for distinct queries on DB2 and Oracle).
    */
   default void unselectLobs() {
-  };
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 8f4baefdf..a140a7fec 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -411,7 +411,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     return expressionFactory;
   }
 
-  private final void createExtraJoinsToSupportManyWhereClause() {
+  private void createExtraJoinsToSupportManyWhereClause() {
     manyWhereJoins = new ManyWhereJoins();
     if (whereExpressions != null) {
       whereExpressions.containsMany(beanDescriptor, manyWhereJoins);
@@ -1499,12 +1499,12 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   @Override
   @SuppressWarnings("unchecked")
   public final <A> List<A> findSingleAttributeList() {
-    return (List<A>) server.findSingleAttributeList(this, transaction);
+    return server.findSingleAttributeList(this, transaction);
   }
 
   @Override
   public final <A> Set<A> findSingleAttributeSet() {
-    return (Set<A>) server.findSingleAttributeSet(this, transaction);
+    return server.findSingleAttributeSet(this, transaction);
   }
 
   @Override
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index fab176ecb..8fe761119 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -232,7 +232,7 @@ public final class OrmQueryDetail implements Serializable {
   /**
    * Add or replace the fetch detail.
    */
-  protected void fetch(OrmQueryProperties chunk) {
+  void fetch(OrmQueryProperties chunk) {
     String path = chunk.getPath();
     if (path == null) {
       baseProps = chunk;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java
index 0072c8eec..e2b4c56ea 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/SimpleTextParser.java
@@ -144,12 +144,9 @@ public final class SimpleTextParser {
   private boolean isOperator(char c) {
     switch (c) {
       case '<':
-        return true;
-      case '>':
-        return true;
-      case '=':
-        return true;
       case '!':
+      case '=':
+      case '>':
         return true;
 
       default:
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java
index 7956b9453..d38f600ee 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/SpiRawSql.java
@@ -64,7 +64,7 @@ public interface SpiRawSql extends RawSql {
     /**
      * Construct for unparsed SQL.
      */
-    protected Sql(String unparsedSql) {
+    Sql(String unparsedSql) {
       this.parsed = false;
       this.unparsedSql = unparsedSql;
       this.preFrom = null;
@@ -80,7 +80,7 @@ public interface SpiRawSql extends RawSql {
     /**
      * Construct for parsed SQL.
      */
-    protected Sql(String unparsedSql, String preFrom, String preWhere, boolean andWhereExpr,
+    Sql(String unparsedSql, String preFrom, String preWhere, boolean andWhereExpr,
                   String preHaving, boolean andHavingExpr, String orderByPrefix, String orderBy, boolean distinct) {
 
       this.unparsedSql = unparsedSql;
@@ -199,7 +199,7 @@ public interface SpiRawSql extends RawSql {
     /**
      * Construct from parsed sql where the columns have been identified.
      */
-    protected ColumnMapping(List<Column> columns) {
+    ColumnMapping(List<Column> columns) {
       this.immutable = false;
       this.parsed = true;
       this.propertyMap = null;
@@ -213,7 +213,7 @@ public interface SpiRawSql extends RawSql {
     /**
      * Construct for unparsed sql.
      */
-    protected ColumnMapping() {
+    ColumnMapping() {
       this.immutable = false;
       this.parsed = false;
       this.propertyMap = null;
@@ -224,7 +224,7 @@ public interface SpiRawSql extends RawSql {
     /**
      * Construct for ResultSet use.
      */
-    protected ColumnMapping(String... propertyNames) {
+    ColumnMapping(String... propertyNames) {
       this.immutable = false;
       this.parsed = false;
       this.propertyMap = null;
@@ -240,7 +240,7 @@ public interface SpiRawSql extends RawSql {
     /**
      * Construct an immutable ColumnMapping based on collected information.
      */
-    protected ColumnMapping(boolean parsed, LinkedHashMap<String, Column> dbColumnMap) {
+    ColumnMapping(boolean parsed, LinkedHashMap<String, Column> dbColumnMap) {
       this.immutable = true;
       this.parsed = parsed;
       this.dbColumnMap = dbColumnMap;
@@ -281,17 +281,14 @@ public interface SpiRawSql extends RawSql {
      *
      * @throws IllegalStateException when a propertyName has not been defined for a column.
      */
-    protected ColumnMapping createImmutableCopy() {
-
+    ColumnMapping createImmutableCopy() {
       for (Column c : dbColumnMap.values()) {
         c.checkMapping();
       }
-
       return new ColumnMapping(parsed, dbColumnMap);
     }
 
-    protected void columnMapping(String dbColumn, String propertyName) {
-
+    void columnMapping(String dbColumn, String propertyName) {
       if (immutable) {
         throw new IllegalStateException("Should never happen");
       }
@@ -330,7 +327,7 @@ public interface SpiRawSql extends RawSql {
     /**
      * Return the column mapping.
      */
-    protected Map<String, Column> mapping() {
+    Map<String, Column> mapping() {
       return dbColumnMap;
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
index 1e14578de..785dd57b5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java
@@ -25,8 +25,8 @@ public class DefaultReadAuditLogger implements ReadAuditLogger {
   private static final System.Logger auditLogger = AppLog.getLogger("io.ebean.ReadAudit");
 
   protected final JsonFactory jsonFactory = new JsonFactory();
-  protected int defaultQueryBuffer = 500;
-  protected int defaultReadBuffer = 150;
+  protected final int defaultQueryBuffer = 500;
+  protected final int defaultReadBuffer = 150;
 
   /**
    * Write the query plan details in JSON format to the logger.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 4ae9efef8..0ad958e25 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -408,7 +408,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   @Override
   public final void depthDecrement() {
     if (depth != 0) {
-      depth += -1;
+      depth -= 1;
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
index 223e26d05..c771ff59b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java
@@ -63,7 +63,7 @@ class ScalarTypeBigDecimal extends ScalarTypeBase<BigDecimal> {
     if (!dataInput.readBoolean()) {
       return null;
     } else {
-      return new BigDecimal(dataInput.readDouble());
+      return BigDecimal.valueOf(dataInput.readDouble());
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
index c73347add..1589a22af 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java
@@ -3,7 +3,6 @@ package io.ebeaninternal.server.type;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.core.type.*;
-import io.ebean.core.type.BasicTypeConverter;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
index 823942445..5e4ad5df8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
@@ -146,12 +146,10 @@ final class ScalarTypeFile extends ScalarTypeBase<File> {
   /**
    * Helper method to pump bytes from input to output.
    */
-  public long pump(InputStream is, OutputStream out) throws IOException {
-
+  public void pump(InputStream is, OutputStream out) throws IOException {
     long totalBytes = 0;
     InputStream input = null;
     OutputStream output = null;
-
     try {
       input = new BufferedInputStream(is, bufferSize);
       output = new BufferedOutputStream(out, bufferSize);
@@ -162,11 +160,7 @@ final class ScalarTypeFile extends ScalarTypeBase<File> {
         output.write(buffer, 0, length);
         totalBytes += length;
       }
-
       output.flush();
-
-      return totalBytes;
-
     } finally {
       if (output != null) {
         try {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
index 873984ba0..e469291d1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
@@ -12,7 +12,7 @@ import java.util.Map;
 /**
  * This class is a modified version of TypeResolver from https://github.com/jhalterman/typetools
  * which is Apache 2 license.
- *
+ * <p>
  * It is a cut down version removing the lambda support and related sun.misc.Unsafe use etc.
  */
 final class TypeResolver {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java
index 845d8d285..d08d2a136 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java
@@ -172,8 +172,7 @@ public final class BindParamsParser {
 
   private void addCollectionParams(OrderedList orderedList, Param param, Collection<?> inValue) {
     // Chop up Collection parameter into a number of individual parameters
-    Collection<?> collection = inValue;
-    for (int c = 0; c < collection.size(); c++) {
+    for (int c = 0; c < inValue.size(); c++) {
       if (c > 0) {
         orderedList.appendSql(",");
       }
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java
index 4385be512..64b112c91 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyAdapter.java
@@ -8,7 +8,7 @@ import io.ebeaninternal.server.json.PathStack;
  */
 public abstract class DocPropertyAdapter implements DocPropertyVisitor {
 
-  protected PathStack pathStack = new PathStack();
+  protected final PathStack pathStack = new PathStack();
 
   @Override
   public void visitProperty(DocPropertyMapping property) {
diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java
index 57f8006ef..533769ce5 100644
--- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java
+++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/mapping/DocumentMapping.java
@@ -8,13 +8,13 @@ import io.ebean.docstore.DocMapping;
  */
 public final class DocumentMapping implements DocMapping {
 
-  protected final String queueId;
-  protected final String name;
-  protected final String type;
-  protected final FetchPath paths;
-  protected final DocPropertyMapping properties;
-  protected int shards;
-  protected int replicas;
+  private final String queueId;
+  private final String name;
+  private final String type;
+  private final FetchPath paths;
+  private final DocPropertyMapping properties;
+  private int shards;
+  private int replicas;
 
   public DocumentMapping(String queueId, String name, String type, FetchPath paths, DocPropertyMapping properties, int shards, int replicas) {
     this.queueId = queueId;

From 0c2ab729bc84391244106dc3b2f040d4940891d0 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Aug 2022 22:37:48 +1200
Subject: [PATCH 063/127] IntelliJ Inspect various improvements

---
 .../server/deploy/BeanPropertyAssocOne.java         |  1 +
 .../server/deploy/parse/ReadAnnotationConfig.java   |  5 +----
 .../io/ebeaninternal/server/json/DJsonContext.java  | 13 +------------
 .../server/querydefn/OrmQueryDetail.java            |  4 +---
 .../server/type/ScalarTypeArrayList.java            |  2 +-
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
index 54eeae122..b97c0a75a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java
@@ -780,6 +780,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public void jsonRead(SpiJsonReader readJson, EntityBean bean) throws IOException {
     if (jsonDeserialize && targetDescriptor != null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
index 81b5576e9..7e5a09782 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java
@@ -106,10 +106,7 @@ final class ReadAnnotationConfig {
     if (javaxValidation != null && javaxValidation.isValidationNotNull(property)) {
       return true;
     }
-    if (jakartaValidation != null && jakartaValidation.isValidationNotNull(property)) {
-      return true;
-    }
-    return false;
+    return jakartaValidation != null && jakartaValidation.isValidationNotNull(property);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java
index 0dacd596e..340f978e1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java
@@ -122,7 +122,6 @@ public final class DJsonContext implements SpiJsonContext {
 
   @Override
   public <T> T toBean(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException {
-
     BeanDescriptor<T> desc = getDescriptor(cls);
     try {
       return desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options), false), null, null);
@@ -156,9 +155,9 @@ public final class DJsonContext implements SpiJsonContext {
     toBean(target, parser, null);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public <T> void toBean(T target, JsonParser parser, JsonReadOptions options) throws JsonIOException {
-
     BeanDescriptor<T> desc = (BeanDescriptor<T>) getDescriptor(target.getClass());
     try {
       desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options), target != null), null, target);
@@ -169,14 +168,12 @@ public final class DJsonContext implements SpiJsonContext {
 
   @Override
   public <T> DJsonBeanReader<T> createBeanReader(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException {
-
     BeanDescriptor<T> desc = getDescriptor(cls);
     return new DJsonBeanReader<>(desc, new ReadJson(desc, parser, options, determineObjectMapper(options), false));
   }
 
   @Override
   public <T> DJsonBeanReader<T> createBeanReader(BeanType<T> beanType, JsonParser parser, JsonReadOptions options) throws JsonIOException {
-
     BeanDescriptor<T> desc = (BeanDescriptor<T>) beanType;
     SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options), false);
     return new DJsonBeanReader<>(desc, readJson);
@@ -209,7 +206,6 @@ public final class DJsonContext implements SpiJsonContext {
 
   @Override
   public <T> List<T> toList(Class<T> cls, JsonParser src, JsonReadOptions options) throws JsonIOException {
-
     BeanDescriptor<T> desc = getDescriptor(cls);
     SpiJsonReader readJson = new ReadJson(desc, src, options, determineObjectMapper(options), false);
     try {
@@ -241,19 +237,16 @@ public final class DJsonContext implements SpiJsonContext {
 
   @Override
   public Object toObject(Type genericType, String json) throws JsonIOException {
-
     return toObject(genericType, createParser(new StringReader(json)));
   }
 
   @Override
   public Object toObject(Type genericType, Reader json) throws JsonIOException {
-
     return toObject(genericType, createParser(json));
   }
 
   @Override
   public Object toObject(Type genericType, JsonParser jsonParser) throws JsonIOException {
-
     TypeInfo info = ParamTypeHelper.getTypeInfo(genericType);
     ManyType manyType = info.getManyType();
     switch (manyType) {
@@ -362,7 +355,6 @@ public final class DJsonContext implements SpiJsonContext {
 
   @SuppressWarnings("unchecked")
   private void toJsonInternal(Object value, JsonGenerator gen, JsonWriteOptions options) throws IOException {
-
     if (value == null) {
       gen.writeNull();
     } else if (value instanceof Number) {
@@ -392,7 +384,6 @@ public final class DJsonContext implements SpiJsonContext {
 
   @Override
   public SpiJsonReader createJsonRead(BeanType<?> beanType, String json) {
-
     BeanDescriptor<?> desc = (BeanDescriptor<?>) beanType;
     JsonParser parser = createParser(new StringReader(json));
     return new ReadJson(desc, parser, null, defaultObjectMapper, false);
@@ -415,7 +406,6 @@ public final class DJsonContext implements SpiJsonContext {
   }
 
   private <T> void toJsonFromCollection(Collection<T> collection, String key, JsonGenerator gen, JsonWriteOptions options) throws IOException {
-
     if (key != null) {
       gen.writeFieldName(key);
     }
@@ -429,7 +419,6 @@ public final class DJsonContext implements SpiJsonContext {
   }
 
   private void toJsonFromMap(Map<Object, Object> map, JsonGenerator gen, JsonWriteOptions options) throws IOException {
-
     Set<Entry<Object, Object>> entrySet = map.entrySet();
     Iterator<Entry<Object, Object>> it = entrySet.iterator();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 8fe761119..e2ce3f307 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -480,10 +480,8 @@ public final class OrmQueryDetail implements Serializable {
     if (create && props == null) {
       props = new OrmQueryProperties(path);
       fetch(props);
-      return props;
-    } else {
-      return props;
     }
+    return props;
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index 35bd40a97..cce8f185a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -161,7 +161,7 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements ScalarTyp
   /**
    * Convert from the json types to the proper scalar types (uuid, enum, double etc)
    */
-  @SuppressWarnings("rawtypes")
+  @SuppressWarnings({"rawtypes", "unchecked"})
   private List convert(List<Object> rawList) {
     List list = new ArrayList(rawList.size());
     for (Object rawVal : rawList) {

From e46bbcf8cfa390b90086e92046c48d290f3a4eb6 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 27 Aug 2022 23:10:13 +1200
Subject: [PATCH 064/127] NaturalKeyQueryData use the matchSingleProperty +
 IntelliJ Inspect various improvements

The non-use of the matchSingleProperty meant it fell back to the multi-property match
---
 .../main/java/io/ebeaninternal/api/NaturalKeyQueryData.java   | 4 +++-
 ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java   | 2 +-
 .../java/io/ebeaninternal/server/deploy/DbMigrationInfo.java  | 1 -
 .../io/ebeaninternal/server/querydefn/DefaultOrmQuery.java    | 4 +---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
index a8b4d348d..e83bed445 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/NaturalKeyQueryData.java
@@ -142,7 +142,9 @@ public final class NaturalKeyQueryData<T> {
    */
   private boolean matchProperties() {
     if (naturalKey.isSingleProperty()) {
-      naturalKey.matchSingleProperty((inProperty != null) ? inProperty : eqList.get(0).property);
+      if (naturalKey.matchSingleProperty((inProperty != null) ? inProperty : eqList.get(0).property)) {
+        return true;
+      }
     }
 
     // multiple properties case
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
index c8a008351..76e7cad99 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java
@@ -314,7 +314,7 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    * Return true if select all properties was used to ensure the property
    * invoking a lazy load was included in the query.
    */
-  boolean selectAllForLazyLoadProperty();
+  void selectAllForLazyLoadProperty();
 
   /**
    * Set the select properties.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
index a356beb41..c9e90efb3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index a140a7fec..ceafabbb9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -442,14 +442,12 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    * included in the query.
    */
   @Override
-  public final boolean selectAllForLazyLoadProperty() {
+  public final void selectAllForLazyLoadProperty() {
     if (lazyLoadProperty != null) {
       if (!detail.containsProperty(lazyLoadProperty)) {
         detail.select("*");
-        return true;
       }
     }
-    return false;
   }
 
   private List<OrmQueryProperties> removeQueryJoins() {

From f07c7411fac28c7fa005e28249a113d60b0236bd Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 30 Aug 2022 12:37:27 +1200
Subject: [PATCH 065/127] No effective change - tidy SqlTreeAlias only

---
 .../server/query/SqlTreeAlias.java            | 19 ++++++++-----------
 .../java/org/tests/query/TestSubQuery.java    |  9 +++++----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
index 0311bf64d..3a5e7bdc7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java
@@ -113,11 +113,8 @@ final class SqlTreeAlias {
     if (prefix == null) {
       return rootTableAlias;
     } else {
-      String s = aliasMap.get(prefix);
-      if (s == null) {
-        return calcAlias(prefix);
-      }
-      return s;
+      String alias = aliasMap.get(prefix);
+      return alias != null ? alias : calcAlias(prefix);
     }
   }
 
@@ -128,14 +125,14 @@ final class SqlTreeAlias {
     if (prefix == null) {
       return rootTableAlias;
     }
-    String s = manyWhereAliasMap.get(prefix);
-    if (s == null) {
-      s = aliasMap.get(prefix);
+    String alias = manyWhereAliasMap.get(prefix);
+    if (alias == null) {
+      alias = aliasMap.get(prefix);
     }
-    if (s == null) {
-      throw new RuntimeException("Could not determine table alias for " + prefix + " manyMap:" + manyWhereAliasMap + " aliasMap:" + aliasMap);
+    if (alias == null) {
+      throw new RuntimeException("Could not determine table alias for " + prefix);
     }
-    return s;
+    return alias;
   }
 
   /**
diff --git a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java
index a63c91115..04e9ccab6 100644
--- a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java
@@ -1,8 +1,8 @@
 package org.tests.query;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
+import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.*;
 
@@ -14,8 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TestSubQuery extends BaseTestCase {
 
   @Test
-  public void testId() {
-
+  void testId() {
     ResetBasicData.reset();
 
     List<Integer> productIds = new ArrayList<>();
@@ -26,7 +25,9 @@ public class TestSubQuery extends BaseTestCase {
     Query<Order> sq = DB.find(Order.class).select("id").where()
       .in("details.product.id", productIds).query();
 
-    DB.find(Order.class).where().in("id", sq).findList();
+    Query<Order> query = DB.find(Order.class).where().in("id", sq).query();
+    query.findList();
+    assertThat(query.getGeneratedSql()).isEqualTo("select t0.id, t0.status, t0.order_date, t0.ship_date, t1.name, t0.cretime, t0.updtime, t0.kcustomer_id from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where  (t0.id) in (select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id and u1.id > 0 where u1.product_id in (?,?,?))");
   }
 
   @Test

From 0dda3e0e932e6635b758369fbf26acddb4c9c17e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 31 Aug 2022 11:39:02 +1200
Subject: [PATCH 066/127] #2814 - Change setNestedUseSavepoint() to use
 'ScopeTrans' rather than the underlying Transaction

The reason for this is that ScopedTransaction holds a stack of ScopeTrans and Transaction, but
the actual transaction in this stack is often the same instance / shared when nesting. The issue
is that currently setNestedUseSavepoint() sets this flag on the *_underlying transaction_* and
this instance is the same / shared when 'nesting'.

This change moves the nestedUseSavepoint flag for ScopedTransaction to be on ScopeTrans
(from the underlying transaction).
---
 .../java/io/ebeaninternal/api/ScopeTrans.java | 18 +++++------
 .../ebeaninternal/api/ScopedTransaction.java  | 15 ++++++++-
 .../transaction/TransactionManager.java       |  2 +-
 .../transaction/TestNestedSubTransaction.java | 31 +++++++++++++++++++
 4 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
index d0bc7bcef..b35ad5ed2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopeTrans.java
@@ -45,15 +45,14 @@ public final class ScopeTrans {
    * Flag set when nested commit has occurred.
    */
   private boolean nestedCommit;
+  private boolean nestedUseSavepoint;
 
   public ScopeTrans(boolean rollbackOnChecked, boolean created, SpiTransaction transaction, TxScope txScope) {
-
     this.rollbackOnChecked = rollbackOnChecked;
     this.created = created;
     this.transaction = transaction;
     this.noRollbackFor = txScope.getNoRollbackFor();
     this.rollbackFor = txScope.getRollbackFor();
-
     if (transaction != null) {
       if (!created && txScope.isBatchSet() || txScope.isBatchOnCascadeSet() || txScope.isBatchSizeSet()) {
         restoreBatch = transaction.isBatchMode();
@@ -90,6 +89,14 @@ public final class ScopeTrans {
     return "ScopeTrans " + transaction;
   }
 
+  void setNestedUseSavepoint() {
+    nestedUseSavepoint = true;
+  }
+
+  boolean isNestedUseSavepoint() {
+    return nestedUseSavepoint;
+  }
+
   /**
    * Return the current/active transaction.
    */
@@ -101,7 +108,6 @@ public final class ScopeTrans {
    * Complete the transaction from enhanced transactional. Try to commit.
    */
   void complete(Object returnOrThrowable, int opCode) {
-
     if (opCode == OPCODE_ATHROW) {
       // exited with a Throwable
       caughtThrowable((Throwable) returnOrThrowable);
@@ -168,7 +174,6 @@ public final class ScopeTrans {
    * Returns the exception and this should be thrown by the calling code.
    */
   public <T extends Throwable> T caughtThrowable(T e) {
-
     if (isRollbackThrowable(e)) {
       rollback(e);
     }
@@ -188,21 +193,17 @@ public final class ScopeTrans {
    * Return true if this throwable should cause a rollback to occur.
    */
   private boolean isRollbackThrowable(Throwable e) {
-
     if (e instanceof Error) {
       return true;
     }
-
     if (noRollbackFor != null) {
       for (Class<? extends Throwable> aNoRollbackFor : noRollbackFor) {
         if (aNoRollbackFor.equals(e.getClass())) {
-
           // explicit no rollback for this one
           return false;
         }
       }
     }
-
     if (rollbackFor != null) {
       for (Class<? extends Throwable> aRollbackFor : rollbackFor) {
         if (aRollbackFor.equals(e.getClass())) {
@@ -211,7 +212,6 @@ public final class ScopeTrans {
         }
       }
     }
-
     // checked exceptions...
     // EJB defaults this to false which is not intuitive IMO
     // Ebean makes this configurable (default to true)
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 10fa49a13..c20ca7d69 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -33,13 +33,26 @@ public final class ScopedTransaction extends SpiTransactionProxy {
     return "ScopedTransaction " + current;
   }
 
+  @Override
+  public void setNestedUseSavepoint() {
+    current.setNestedUseSavepoint();
+  }
+
+  @Override
+  public boolean isNestedUseSavepoint() {
+    return current.isNestedUseSavepoint();
+  }
+
   /**
    * Push the scope transaction.
    */
   public void push(ScopeTrans scopeTrans) {
-
     if (current != null) {
       stack.push(current);
+      if (current.isNestedUseSavepoint()) {
+        // child scope 'inherits' nestedUseSavepoint
+        scopeTrans.setNestedUseSavepoint();
+      }
     }
     current = scopeTrans;
     transaction = scopeTrans.getTransaction();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 2e43c3988..0a306640d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -573,7 +573,7 @@ public class TransactionManager implements SpiTransactionManager {
     } else {
       setToScope = false;
       transaction = txnContainer.current();
-      nestedSavepoint = transaction.isNestedUseSavepoint();
+      nestedSavepoint = txnContainer.isNestedUseSavepoint();
     }
 
     TxType type = txScope.getType();
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
index e8f32eced..4d4cf23dc 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
@@ -1,12 +1,15 @@
 package org.tests.transaction;
 
 import io.ebean.*;
+import io.ebean.test.LoggedSql;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasic;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -60,6 +63,34 @@ public class TestNestedSubTransaction extends BaseTestCase {
     }
   }
 
+  @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA, Platform.ORACLE})
+  @Test
+  void nestedNested() {
+    LoggedSql.start();
+    try (Transaction txn0 = DB.beginTransaction()) {
+      runNestedMethod();
+      try (Transaction txnAfter = DB.beginTransaction()) {
+        DB.save(new EBasic("startAfter"));
+      }
+    }
+    List<String> sql = LoggedSql.stop();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("insert into e_basic").contains("sp[");
+    assertThat(sql.get(1)).contains("insert into e_basic").doesNotContain("sp[");
+    assertThat(sql.get(2)).contains("insert into e_basic").doesNotContain("sp[");
+  }
+
+  void runNestedMethod() {
+    try (Transaction txn0 = DB.beginTransaction()) {
+      txn0.setNestedUseSavepoint();
+      try (Transaction nested = DB.beginTransaction()) {
+        DB.save(new EBasic("nested in sp"));
+        nested.commit();
+      }
+      DB.save(new EBasic("nested"));
+      txn0.commit();
+    }
+  }
 
   @IgnorePlatform({Platform.SQLSERVER, Platform.MYSQL, Platform.HANA, Platform.ORACLE})
   @Test

From 29e2b81092cb989df827fc00c101a50dbbebce78 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 31 Aug 2022 17:24:55 +1200
Subject: [PATCH 067/127] #2813 - Sometimes subquery use wrong alias in SQL

The reason for this is that as part of DefaultOrmQuery.copy() it uses
DefaultExpressionList.copy() and that assumed that expressions were
safe to share which is NOT the case for IN and EXISTS sub-query expressions
so InQueryExpression and ExistsQueryExpression

The effective fix for this is that DefaultExpressionList.copy() changes
to call SpiExpression.copy() and for InQueryExpression and ExistsQueryExpression
to implement that copy() by creating a copy of the sub-query.

A "side-fix" is that in DefaultOrmQuery.createExtraJoinsToSupportManyWhereClause()
it was creating an instance of ManyWhereJoins, then mutating it ... and if we
change that to only doing the assignment at the end (object assignment is atomic)
then racy access reading ManyWhereJoins would always get a fully completed non-mutating
instance of ManyWhereJoins. Noting this because it kind of points to where I think
the race condition is (in createExtraJoinsToSupportManyWhereClause()) but noting that
with the change to DefaultExpressionList.copy() this "side-fix" isn't required per say.
---
 .../io/ebeaninternal/api/ManyWhereJoins.java  |  2 -
 .../io/ebeaninternal/api/SpiExpression.java   |  7 ++++
 .../expression/DefaultExpressionList.java     | 15 +++----
 .../expression/ExistsQueryExpression.java     |  5 +++
 .../expression/FilterExpressionList.java      |  2 +-
 .../server/expression/InQueryExpression.java  |  8 ++--
 .../server/querydefn/DefaultOrmQuery.java     |  9 +++--
 .../expression/DefaultExpressionListTest.java | 40 +++++++++++++++++--
 .../expression/ExistsQueryExpressionTest.java | 20 ++++++++++
 .../expression/InQueryExpressionTest.java     | 21 +++++++++-
 .../expression/JunctionExpressionTest.java    |  6 +--
 .../tests/query/TestQueryFindPagedList.java   |  3 +-
 12 files changed, 110 insertions(+), 28 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java
index 2278d5d11..463f1705e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ManyWhereJoins.java
@@ -50,7 +50,6 @@ public final class ManyWhereJoins implements Serializable {
    * Add a many where join.
    */
   public void add(ElPropertyDeploy elProp) {
-
     String join = elProp.elPrefix();
     BeanProperty p = elProp.beanProperty();
     if (p instanceof BeanPropertyAssocMany<?>) {
@@ -111,7 +110,6 @@ public final class ManyWhereJoins implements Serializable {
    * Return the set of property names for the many where joins.
    */
   public TreeSet<String> getPropertyNames() {
-
     TreeSet<String> propertyNames = new TreeSet<>();
     for (PropertyJoin join : joins.values()) {
       propertyNames.add(join.getProperty());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
index e4392bf17..030042d96 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiExpression.java
@@ -110,4 +110,11 @@ public interface SpiExpression extends Expression {
    * Apply property prefix when filterMany expressions included into main query.
    */
   void prefixProperty(String path);
+
+  /**
+   * Return a copy of the expression (as part of creating a query copy).
+   */
+  default SpiExpression copy() {
+    return this;
+  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 26f225f3a..234fd28c2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -76,11 +76,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
   }
 
   public DefaultExpressionList(Query<T> query, ExpressionList<T> parentExprList) {
-    this(query, query.getExpressionFactory(), parentExprList);
-  }
-
-  DefaultExpressionList(Query<T> query, ExpressionFactory expr, ExpressionList<T> parentExprList) {
-    this(query, expr, parentExprList, new ArrayList<>());
+    this(query, query.getExpressionFactory(), parentExprList, new ArrayList<>());
   }
 
   DefaultExpressionList(Query<T> query, ExpressionFactory expr, ExpressionList<T> parentExprList, List<SpiExpression> list) {
@@ -243,13 +239,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
 
   /**
    * Return a copy of the expression list.
-   * <p>
-   * Each of the expressions are expected to be immutable and safe to reference.
-   * </p>
    */
   public DefaultExpressionList<T> copy(Query<T> query) {
-    DefaultExpressionList<T> copy = new DefaultExpressionList<>(query, expr, null);
-    copy.list.addAll(list);
+    DefaultExpressionList<T> copy = new DefaultExpressionList<>(query, expr, null, new ArrayList<>(list.size()));
+    for (SpiExpression expr : list) {
+      copy.list.add(expr.copy());
+    }
     return copy;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index 1e8121e52..4a8717e4c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -27,6 +27,11 @@ final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreE
     this.subQuery = null;
   }
 
+  @Override
+  public SpiExpression copy() {
+    return subQuery == null ? this : new ExistsQueryExpression(subQuery.copy(), not);
+  }
+
   @Override
   public void prefixProperty(String path) {
     // do nothing
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
index 45d308eec..3b8c5005b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java
@@ -27,7 +27,7 @@ public final class FilterExpressionList<T> extends DefaultExpressionList<T> {
   }
 
   public FilterExpressionList(FilterExprPath pathPrefix, ExpressionFactory expr, Query<T> rootQuery) {
-    super(null, expr, null);
+    super(null, expr, null, new ArrayList<>());
     this.pathPrefix = pathPrefix;
     this.rootQuery = rootQuery;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index 20d6a3d16..f922edbfe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -31,6 +31,11 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
     this.bindParams = bindParams;
   }
 
+  @Override
+  public SpiExpression copy() {
+    return subQuery == null ? this : new InQueryExpression(propName, subQuery.copy(), not);
+  }
+
   @Override
   public void simplify() {
     // do nothing
@@ -43,7 +48,6 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
 
   @Override
   public void prepareExpression(BeanQueryRequest<?> request) {
-
     CQuery<?> subQuery = compileSubQuery(request);
     this.bindParams = subQuery.predicates().whereExprBindValues();
     this.sql = subQuery.generatedSql().replace('\n', ' ');
@@ -71,7 +75,6 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
 
   @Override
   public void addSql(SpiExpressionRequest request) {
-
     request.append(" (").append(propName).append(")");
     if (not) {
       request.append(" not");
@@ -83,7 +86,6 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
 
   @Override
   public void addBindValues(SpiExpressionRequest request) {
-
     for (Object bindParam : bindParams) {
       request.addBindValue(bindParam);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index ceafabbb9..5c5ff7f14 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -412,21 +412,22 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   }
 
   private void createExtraJoinsToSupportManyWhereClause() {
-    manyWhereJoins = new ManyWhereJoins();
+    final var manyWhere = new ManyWhereJoins();
     if (whereExpressions != null) {
-      whereExpressions.containsMany(beanDescriptor, manyWhereJoins);
+      whereExpressions.containsMany(beanDescriptor, manyWhere);
     }
     if (havingExpressions != null) {
-      havingExpressions.containsMany(beanDescriptor, manyWhereJoins);
+      havingExpressions.containsMany(beanDescriptor, manyWhere);
     }
     if (orderBy != null) {
       for (Property orderProperty : orderBy.getProperties()) {
         ElPropertyDeploy elProp = beanDescriptor.elPropertyDeploy(orderProperty.getProperty());
         if (elProp != null && elProp.containsFormulaWithJoin()) {
-          manyWhereJoins.addFormulaWithJoin(elProp.elPrefix(), elProp.name());
+          manyWhere.addFormulaWithJoin(elProp.elPrefix(), elProp.name());
         }
       }
     }
+    manyWhereJoins = manyWhere;
   }
 
   /**
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java
index 1fa245832..b89590936 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java
@@ -1,16 +1,20 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.ExpressionList;
+import io.ebean.Query;
+import io.ebeaninternal.api.SpiQuery;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 public class DefaultExpressionListTest extends BaseExpressionTest {
 
-
   DefaultExpressionList<?> exp() {
-
-    return new DefaultExpressionList<>(null, new DefaultExpressionFactory(true, true), null);
+    return new DefaultExpressionList<>(null, new DefaultExpressionFactory(true, true), null, new ArrayList<>());
   }
 
   private <T> DefaultExpressionList<T> spi(ExpressionList<T> list) {
@@ -95,4 +99,34 @@ public class DefaultExpressionListTest extends BaseExpressionTest {
       .isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isFalse();
   }
 
+  @SuppressWarnings("unchecked")
+  @Test
+  void copy() {
+    DefaultExpressionList<?> orig = exp();
+    orig.eq("a", 10).in("b", 11);
+    DefaultExpressionList<?> copy = (DefaultExpressionList<?>)orig.copy(mock(Query.class));
+
+    assertThat(copy).isNotSameAs(orig);
+    assertThat(copy.list).hasSize(2);
+    assertThat(copy.list.get(0)).isSameAs(orig.list.get(0));
+    assertThat(copy.list.get(1)).isSameAs(orig.list.get(1));
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  void copy_withSubQuery() {
+    DefaultExpressionList<?> orig = exp();
+    SpiQuery<?> inSubQuery = mock(SpiQuery.class);
+    SpiQuery<?> existsSubQuery = mock(SpiQuery.class);
+    orig.eq("a", 10).in("name", inSubQuery).exists(existsSubQuery);
+
+    DefaultExpressionList<?> copy = (DefaultExpressionList<?>)orig.copy(mock(Query.class));
+
+    assertThat(copy.list).hasSize(3);
+    assertThat(copy.list.get(0)).isSameAs(orig.list.get(0));
+    assertThat(copy.list.get(1)).isNotSameAs(orig.list.get(1));
+    assertThat(copy.list.get(2)).isNotSameAs(orig.list.get(2));
+    verify(inSubQuery).copy();
+    verify(existsSubQuery).copy();
+  }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java
index b869096a1..37433fbdf 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/ExistsQueryExpressionTest.java
@@ -1,10 +1,14 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiQuery;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 public class ExistsQueryExpressionTest extends BaseExpressionTest {
 
@@ -13,6 +17,22 @@ public class ExistsQueryExpressionTest extends BaseExpressionTest {
     return new ExistsQueryExpression(not, sql, Arrays.asList(bindValues));
   }
 
+  @Test
+  void copy_subQuery_expectNewInstance() {
+    SpiQuery<?> subQuery = mock(SpiQuery.class);
+    var orig = new ExistsQueryExpression(subQuery, false);
+    SpiExpression copy = orig.copy();
+    assertThat(copy).isNotSameAs(orig);
+    verify(subQuery).copy();
+  }
+
+  @Test
+  void copy_sqlLiteral_expectSameInstance() {
+    var orig = exp(true, "sql", 10);
+    SpiExpression copy = orig.copy();
+    assertThat(copy).isSameAs(orig);
+  }
+
   @Test
   public void isSameByPlan_when_same() {
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java
index 1ab4853b5..b8d9fc451 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/InQueryExpressionTest.java
@@ -1,18 +1,37 @@
 package io.ebeaninternal.server.expression;
 
+import io.ebeaninternal.api.SpiExpression;
+import io.ebeaninternal.api.SpiQuery;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 public class InQueryExpressionTest extends BaseExpressionTest {
 
-
   private InQueryExpression exp(String propertyName, boolean not, String sql, Object... bindValues) {
     return new InQueryExpression(propertyName, not, sql, Arrays.asList(bindValues));
   }
 
+  @Test
+  void copy_subQuery_expectNewInstance() {
+    SpiQuery<?> subQuery = mock(SpiQuery.class);
+    var orig = new InQueryExpression("name", subQuery, false);
+    SpiExpression copy = orig.copy();
+    assertThat(copy).isNotSameAs(orig);
+    verify(subQuery).copy();
+  }
+
+  @Test
+  void copy_sqlLiteral_expectSameInstance() {
+    var orig = exp("name", true, "sql", 10);
+    SpiExpression copy = orig.copy();
+    assertThat(copy).isSameAs(orig);
+  }
+
   @Test
   public void isSameByPlan_when_same() {
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java
index b28d44c05..b1d4db672 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java
@@ -5,16 +5,16 @@ import io.ebean.Expression;
 import io.ebean.Junction;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+
 public class JunctionExpressionTest extends BaseExpressionTest {
 
   Expression eq(String propName, int value) {
     return Expr.eq(propName, value);
   }
 
-
   DefaultExpressionList<?> exp(Expression... expressions) {
-
-    DefaultExpressionList<Object> list = new DefaultExpressionList<>(null, new DefaultExpressionFactory(true, false), null);
+    DefaultExpressionList<Object> list = new DefaultExpressionList<>(null, new DefaultExpressionFactory(true, false), null, new ArrayList<>());
     for (Expression ex : expressions) {
       list.add(ex);
     }
diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java
index 69092641e..629776577 100644
--- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java
+++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java
@@ -70,11 +70,12 @@ public class TestQueryFindPagedList extends BaseTestCase {
       .setMaxRows(3)
       .findPagedList();
 
-    Future<Integer> rowCount = pagedList.getFutureCount();
+    pagedList.loadCount();
     List<Order> orders = pagedList.getList();
 
     // these are each getting the total row count
     int totalRowCount = pagedList.getTotalCount();
+    Future<Integer> rowCount = pagedList.getFutureCount();
     Integer totalRowCountWithTimeout = rowCount.get(30, TimeUnit.SECONDS);
     Integer totalRowCountViaFuture = rowCount.get();
 

From f7e00aab78d374da718d120294403793ee8d3b0c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Sep 2022 11:37:28 +1200
Subject: [PATCH 068/127] #2457 #2810 - Add ebean-joda-time as a dependency to
 ebean composite

- Add ebean-joda-time as a dependency to ebean composite
- Add ebean-joda-time to BOM
---
 composites/ebean/pom.xml | 6 ++++++
 ebean-bom/pom.xml        | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 899f78425..aee406bc1 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -25,6 +25,12 @@
       <version>13.9.0-SNAPSHOT</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-joda-time</artifactId>
+      <version>13.9.0-SNAPSHOT</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 8b64db6af..dedfceff5 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -110,6 +110,12 @@
         <version>13.9.0-SNAPSHOT</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-joda-time</artifactId>
+        <version>13.9.0-SNAPSHOT</version>
+      </dependency>
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>

From 8233058d2e9bfdde4bcf83798922f9303b477347 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Sep 2022 12:23:00 +1200
Subject: [PATCH 069/127] Bump ebean-agent to 13.9.0 (no effective change)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4eec0ee3a..74485babd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.8.1</ebean-agent.version>
-    <ebean-maven-plugin.version>13.8.1</ebean-maven-plugin.version>
+    <ebean-agent.version>13.9.0</ebean-agent.version>
+    <ebean-maven-plugin.version>13.9.0</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

From c8ffad2831e43ad3b8c270e1816641e810e6ef61 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Sep 2022 12:25:50 +1200
Subject: [PATCH 070/127] Fix TestSubQuery for postgres compatible syntax with
 ANY(?)

---
 ebean-test/src/test/java/org/tests/query/TestSubQuery.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java
index 04e9ccab6..b8a6c70ae 100644
--- a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java
+++ b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java
@@ -27,7 +27,11 @@ public class TestSubQuery extends BaseTestCase {
 
     Query<Order> query = DB.find(Order.class).where().in("id", sq).query();
     query.findList();
-    assertThat(query.getGeneratedSql()).isEqualTo("select t0.id, t0.status, t0.order_date, t0.ship_date, t1.name, t0.cretime, t0.updtime, t0.kcustomer_id from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where  (t0.id) in (select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id and u1.id > 0 where u1.product_id in (?,?,?))");
+    if (isPostgresCompatible()) {
+      assertThat(query.getGeneratedSql()).isEqualTo("select t0.id, t0.status, t0.order_date, t0.ship_date, t1.name, t0.cretime, t0.updtime, t0.kcustomer_id from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where  (t0.id) in (select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id and u1.id > 0 where u1.product_id = any(?))");
+    } else {
+      assertThat(query.getGeneratedSql()).isEqualTo("select t0.id, t0.status, t0.order_date, t0.ship_date, t1.name, t0.cretime, t0.updtime, t0.kcustomer_id from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where  (t0.id) in (select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id and u1.id > 0 where u1.product_id in (?,?,?))");
+    }
   }
 
   @Test

From 25d067553202c4d21e35768e4d45e2088b465f42 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Sep 2022 12:33:01 +1200
Subject: [PATCH 071/127] [maven-release-plugin] prepare release
 ebean-parent-13.9.0

---
 composites/ebean-clickhouse/pom.xml | 14 ++++++++-----
 composites/ebean-cockroach/pom.xml  | 14 ++++++++-----
 composites/ebean-db2/pom.xml        | 14 ++++++++-----
 composites/ebean-h2/pom.xml         | 14 ++++++++-----
 composites/ebean-hana/pom.xml       | 14 ++++++++-----
 composites/ebean-mariadb/pom.xml    | 14 ++++++++-----
 composites/ebean-mysql/pom.xml      | 14 ++++++++-----
 composites/ebean-nuodb/pom.xml      | 14 ++++++++-----
 composites/ebean-oracle/pom.xml     | 14 ++++++++-----
 composites/ebean-postgres/pom.xml   | 14 ++++++++-----
 composites/ebean-sqlite/pom.xml     | 14 ++++++++-----
 composites/ebean-sqlserver/pom.xml  | 14 ++++++++-----
 composites/ebean-yugabyte/pom.xml   | 14 ++++++++-----
 composites/ebean/pom.xml            | 16 +++++++++------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 32 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-csv-reader/pom.xml            | 12 +++++------
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-joda-time/pom.xml             |  8 +++-----
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 12 +++++------
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 ++++++++++++++++-------------
 platforms/clickhouse/pom.xml        |  8 ++++++--
 platforms/db2/pom.xml               |  8 ++++++--
 platforms/h2/pom.xml                |  8 ++++++--
 platforms/hana/pom.xml              |  8 ++++++--
 platforms/hsqldb/pom.xml            |  8 ++++++--
 platforms/mariadb/pom.xml           | 10 ++++++---
 platforms/mysql/pom.xml             |  8 ++++++--
 platforms/nuodb/pom.xml             |  8 ++++++--
 platforms/oracle/pom.xml            |  8 ++++++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++++++--
 platforms/sqlanywhere/pom.xml       |  8 ++++++--
 platforms/sqlite/pom.xml            |  8 ++++++--
 platforms/sqlserver/pom.xml         |  8 ++++++--
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 47 files changed, 305 insertions(+), 197 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 04ba5def2..530bd7ad9 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 86ea4941b..b1c2137ea 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index d9f339091..9181a45da 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index d16215f05..b2ac1f3a9 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index d28fa4c62..929da6ee3 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index db7d43f25..dfa6810b8 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 87efb3966..a88b63e1c 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index b320113a9..97193b845 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 80a535dea..0a1019bfe 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 838fdd76b..e8762e563 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 6e3028c6b..240a81331 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 255a07b22..f2f0effec 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 2e2ef0ef0..10150d25b 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index aee406bc1..ef6249d8f 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,19 +16,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -41,14 +41,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 207a70fd6..f39462f53 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 63e4472ce..94d3531dc 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 009e64c55..53db2069b 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index dedfceff5..e1d79737e 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,94 +89,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.0-SNAPSHOT</version>
+        <version>13.9.0</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 143bbd467..ed8c2ad22 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 799ad94e2..2ac0c8dd6 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.0</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index d43f72bfe..ed229bcdc 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -16,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index ca445ed4f..cd8d87e5b 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 991e02f93..047f77417 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 32706dd19..feac5a4d5 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index f5a151905..687031a4a 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 690e25dac..d56c9ce7e 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 43d3ed2e5..7ab69e3ad 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 3bba23f67..e9963a52f 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 084b105f1..59deabfc7 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -105,14 +105,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 58ac22f63..ca07ec7d8 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 57915acfc..77791bff2 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,68 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index d7fcbc8ec..e66663dd8 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 206b36f19..e8036182c 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 08025557d..05f9e9b94 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,4 +34,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 1c34f6783..54b6f4f1b 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 47b39fb57..cdb0cfd15 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 50fd3f86b..44f916f91 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,14 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 49149656a..fb448c13a 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 89beb3528..2548df46c 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 75da31c1d..a1897d820 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 3eb1bcdfb..20d1e6e82 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 93c7acd3d..b3700266b 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index e7598a177..df2df5237 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index b37488de1..a4f15a49e 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index dbba89e7c..4f3496405 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.0</tag>
+  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 74485babd..34ba36394 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.9.0-SNAPSHOT</version>
+  <version>13.9.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 28307bbe4..243fc2ce1 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.0</version>
   </parent>
 
   <name>querybean generator</name>

From 28d70cf9c4bd93d84c167b2434d6be9413a07975 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Sep 2022 12:33:08 +1200
Subject: [PATCH 072/127] [maven-release-plugin] prepare for next development
 iteration

---
 composites/ebean-clickhouse/pom.xml | 14 +++++--------
 composites/ebean-cockroach/pom.xml  | 14 +++++--------
 composites/ebean-db2/pom.xml        | 14 +++++--------
 composites/ebean-h2/pom.xml         | 14 +++++--------
 composites/ebean-hana/pom.xml       | 14 +++++--------
 composites/ebean-mariadb/pom.xml    | 14 +++++--------
 composites/ebean-mysql/pom.xml      | 14 +++++--------
 composites/ebean-nuodb/pom.xml      | 14 +++++--------
 composites/ebean-oracle/pom.xml     | 14 +++++--------
 composites/ebean-postgres/pom.xml   | 14 +++++--------
 composites/ebean-sqlite/pom.xml     | 14 +++++--------
 composites/ebean-sqlserver/pom.xml  | 14 +++++--------
 composites/ebean-yugabyte/pom.xml   | 14 +++++--------
 composites/ebean/pom.xml            | 16 ++++++---------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 32 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-csv-reader/pom.xml            |  8 ++++----
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 12 +++++------
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 +++++++++++++----------------
 platforms/clickhouse/pom.xml        |  8 ++------
 platforms/db2/pom.xml               |  8 ++------
 platforms/h2/pom.xml                |  8 ++------
 platforms/hana/pom.xml              |  8 ++------
 platforms/hsqldb/pom.xml            |  8 ++------
 platforms/mariadb/pom.xml           | 10 +++------
 platforms/mysql/pom.xml             |  8 ++------
 platforms/nuodb/pom.xml             |  8 ++------
 platforms/oracle/pom.xml            |  8 ++------
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++------
 platforms/sqlanywhere/pom.xml       |  8 ++------
 platforms/sqlite/pom.xml            |  8 ++------
 platforms/sqlserver/pom.xml         |  8 ++------
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 47 files changed, 191 insertions(+), 303 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 530bd7ad9..7bd9aa3e9 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index b1c2137ea..c7bcfa55f 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 9181a45da..3d82c64c7 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index b2ac1f3a9..b9e297018 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 929da6ee3..2894a9c75 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index dfa6810b8..7430d75b7 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index a88b63e1c..62e3c8e32 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 97193b845..3c9bb0df5 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 0a1019bfe..02b4b7b5a 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index e8762e563..07fefc18c 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 240a81331..3e9484d5c 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index f2f0effec..9adf58a03 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 10150d25b..24a931204 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index ef6249d8f..31eec3e1c 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,19 +16,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -41,18 +41,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index f39462f53..8aaf05526 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 94d3531dc..20f3aaa7e 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 53db2069b..7ef5d73ac 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index e1d79737e..6029aa06c 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,94 +89,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.0</version>
+        <version>13.9.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index ed8c2ad22..adbf1bdbd 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 2ac0c8dd6..bbead632a 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index ed229bcdc..02f150051 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index cd8d87e5b..a55ef65bd 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 047f77417..79222ef98 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index feac5a4d5..64a53129c 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index 687031a4a..a663e3458 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index d56c9ce7e..d8161453a 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 7ab69e3ad..5cf8498dc 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index e9963a52f..a07ba2162 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 59deabfc7..20af1e5bc 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -105,14 +105,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index ca07ec7d8..177e71254 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 77791bff2..68eb3d370 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,68 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index e66663dd8..741f7e68f 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index e8036182c..02da79d69 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 05f9e9b94..897c6e6d7 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,8 +34,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 54b6f4f1b..1a43494a5 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index cdb0cfd15..8405a7c9f 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 44f916f91..c7d7bb1be 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index fb448c13a..4327346f7 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 2548df46c..4c844820b 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index a1897d820..b0d241090 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 20d1e6e82..39cb9863e 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index b3700266b..d93304146 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index df2df5237..698e6bd04 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index a4f15a49e..e501f7064 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 4f3496405..2d1193bdd 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.0</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.0</tag>
-  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 34ba36394..b0c404ba4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.9.0</version>
+  <version>13.9.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 243fc2ce1..9b8a83cac 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 563340edbd44de51c4c9f52a3c311bc6ffa028f4 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Sep 2022 16:47:22 +1200
Subject: [PATCH 073/127] Bump to 13.9.1-SNAPSHOT after release

---
 ebean-kotlin/pom.xml      | 6 +++---
 tests/test-java16/pom.xml | 6 +++---
 tests/test-kotlin/pom.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index 331b89904..a5d6f3550 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.0-SNAPSHOT</version>
+    <version>13.9.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 7b3a12da5..0c91e1350 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.9.0-SNAPSHOT</version>
+              <version>13.9.1-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 0c2c7da55..64d4709ae 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.0-SNAPSHOT</version>
+      <version>13.9.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From 7df168f2320b341a7cd3101a2f46d5186a0880b8 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Sep 2022 17:08:11 +1200
Subject: [PATCH 074/127] ENH: Add Transaction.rollbackAndContinue()

Typically useful for handling DuplicateKeyException where we expect
DuplicateKeyException to be thrown and catch it with the intention of
continuing processing using the same transaction.

Note that some databases like Oracle do not require this explicit
rollback() and would work without the rollbackAndContinue(). Postgres
in particular requires the rollback() call on the underlying connection
such that we can continue using that transaction/java.sql.Connection.

Note that in the existing test we can see that rollbackAndContinue()
is pretty close to being syntactic sugar. I think adding rollbackAndContinue()
is justified and complements the existing commitAndContinue().
---
 .../java/io/ebean/DuplicateKeyException.java  | 22 ++++++++++
 .../src/main/java/io/ebean/Transaction.java   | 29 ++++++++++++++
 .../ImplicitReadOnlyTransaction.java          | 17 +++++---
 .../server/transaction/JdbcTransaction.java   | 40 +++++++++++++------
 .../server/transaction/TChangeLogHolder.java  |  3 ++
 .../tests/insert/TestInsertDuplicateKey.java  | 13 ++----
 6 files changed, 96 insertions(+), 28 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/DuplicateKeyException.java b/ebean-api/src/main/java/io/ebean/DuplicateKeyException.java
index 681b4dd27..0495015da 100644
--- a/ebean-api/src/main/java/io/ebean/DuplicateKeyException.java
+++ b/ebean-api/src/main/java/io/ebean/DuplicateKeyException.java
@@ -2,6 +2,28 @@ package io.ebean;
 
 /**
  * Thrown when a duplicate is attempted on a unique constraint.
+ * <p>
+ * In terms of catching this exception with the view of continuing processing
+ * using the same transaction look to use {@link Transaction#rollbackAndContinue()}.
+ *
+ * <pre>{@code
+ *
+ *   try (Transaction txn = database.beginTransaction()) {
+ *
+ *     try {
+ *       ...
+ *       database.save(bean);
+ *       database.flush();
+ *     } catch (DuplicateKeyException e) {
+ *       // carry on processing using the transaction
+ *       txn.rollbackAndContinue();
+ *       ...
+ *     }
+ *
+ *     txn.commit();
+ *   }
+ *
+ * }</pre>
  */
 public class DuplicateKeyException extends DataIntegrityException {
   private static final long serialVersionUID = -4771932723285724817L;
diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java
index 08c584231..065396a92 100644
--- a/ebean-api/src/main/java/io/ebean/Transaction.java
+++ b/ebean-api/src/main/java/io/ebean/Transaction.java
@@ -144,6 +144,35 @@ public interface Transaction extends AutoCloseable {
    */
   void rollback(Throwable e) throws PersistenceException;
 
+  /**
+   * Performs a rollback on the underlying JDBC connection with the intention of
+   * continuing to use this same transaction and performing a commit or rollback
+   * later to complete the transaction.
+   * <p>
+   * Typically used when catching {@link DuplicateKeyException} where we wish to
+   * rollback work done at that point but carry on processing using the transaction.
+   *
+   * <pre>{@code
+   *
+   *   try (Transaction txn = database.beginTransaction()) {
+   *
+   *     try {
+   *       ...
+   *       database.save(bean);
+   *       database.flush();
+   *     } catch (DuplicateKeyException e) {
+   *       // carry on processing using the transaction
+   *       txn.rollbackAndContinue();
+   *       ...
+   *     }
+   *
+   *     txn.commit();
+   *   }
+   *
+   * }</pre>
+   */
+  void rollbackAndContinue();
+
   /**
    * Set when we want nested transactions to use Savepoint's.
    * <p>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
index 2dfa2a454..7ffa36f8d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java
@@ -240,7 +240,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
 
   @Override
   public boolean isReadOnly() {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
@@ -252,7 +252,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
 
   @Override
   public void setReadOnly(boolean readOnly) {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
@@ -403,7 +403,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    */
   @Override
   public void setPersistenceContext(SpiPersistenceContext context) {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.persistenceContext = context;
@@ -465,7 +465,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    */
   @Override
   public Connection getInternalConnection() {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     return connection;
@@ -508,7 +508,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    */
   @Override
   public void commit() {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     // expect AutoCommit so just deactivate / put back into pool
@@ -532,6 +532,11 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
     throw new IllegalStateException(notExpectedMessage);
   }
 
+  @Override
+  public void rollbackAndContinue() {
+    // do nothing
+  }
+
   /**
    * Rollback the transaction.
    */
@@ -546,7 +551,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    */
   @Override
   public void rollback(Throwable cause) throws PersistenceException {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     // expect AutoCommit so it really has already committed
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 0ad958e25..5d3f9c213 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -424,7 +424,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public boolean isReadOnly() {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
@@ -436,7 +436,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public void setReadOnly(boolean readOnly) {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
@@ -459,7 +459,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public final void setBatchMode(boolean batchMode) {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.batchMode = batchMode;
@@ -472,7 +472,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public final void setBatchOnCascade(boolean batchMode) {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.batchOnCascadeMode = batchMode;
@@ -666,7 +666,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   @Override
   public final void flush() {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     internalBatchFlush();
@@ -707,7 +707,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   @Override
   public final void setPersistenceContext(SpiPersistenceContext context) {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     this.persistenceContext = context;
@@ -776,7 +776,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   @Override
   public Connection getInternalConnection() {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     return connection;
@@ -920,7 +920,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     if (rollbackOnly) {
       return;
     }
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
@@ -945,7 +945,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       rollback();
       return;
     }
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
@@ -1014,6 +1014,22 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     this.nestedUseSavepoint = true;
   }
 
+  @Override
+  public void rollbackAndContinue() {
+    if (!active) {
+      throw new IllegalStateException(illegalStateMessage);
+    }
+    internalBatchClear();
+    if (changeLogHolder != null) {
+      changeLogHolder.clear();
+    }
+    try {
+      performRollback();
+    } catch (SQLException ex) {
+      throw new PersistenceException(ex);
+    }
+  }
+
   /**
    * Rollback the transaction.
    */
@@ -1028,7 +1044,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   @Override
   public void rollback(Throwable cause) throws PersistenceException {
-    if (!isActive()) {
+    if (!active) {
       throw new IllegalStateException(illegalStateMessage);
     }
     try {
@@ -1066,7 +1082,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   @Override
   public void end() throws PersistenceException {
-    if (isActive()) {
+    if (active) {
       rollback();
     }
   }
@@ -1075,7 +1091,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return true if the transaction is active.
    */
   @Override
-  public boolean isActive() {
+  public final boolean isActive() {
     return active;
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java
index b2a7269d0..73a497fad 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TChangeLogHolder.java
@@ -96,4 +96,7 @@ public final class TChangeLogHolder {
     owner.sendChangeLog(changes);
   }
 
+  void clear() {
+    changes.getChanges().clear();
+  }
 }
diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java
index 4ffa8f8e9..b894d4de6 100644
--- a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java
+++ b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java
@@ -1,16 +1,15 @@
 package org.tests.insert;
 
-import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.DuplicateKeyException;
 import io.ebean.annotation.Transactional;
+import io.ebean.xtest.BaseTestCase;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tests.model.draftable.Document;
 
-import java.sql.SQLException;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -92,14 +91,8 @@ public class TestInsertDuplicateKey extends BaseTestCase {
       DB.getDefault().currentTransaction().flush();
     } catch (DuplicateKeyException e) {
       log.info("duplicate failed but just continue" + e.getMessage());
-      try {
-        // typically we would use transaction.commitAndContinue()
-        // ... this is a rollback and continue type scenario
-        // ... more sensible to use a second transaction that do this
-        DB.getDefault().currentTransaction().connection().rollback();
-      } catch (SQLException e1) {
-        e1.printStackTrace();
-      }
+      // rollback and continue using the transaction
+      DB.getDefault().currentTransaction().rollbackAndContinue();
     }
 
     Document doc0 = new Document();

From d517dea27f3f85c560fcab810a4369b3f9454946 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Sep 2022 22:26:52 +1200
Subject: [PATCH 075/127] ENH: Add Transaction.rollbackAndContinue()

---
 .../main/java/io/ebeaninternal/api/ScopedTransaction.java   | 5 +++++
 .../io/ebeaninternal/server/transaction/NoTransaction.java  | 6 +++++-
 .../server/transaction/SavepointTransaction.java            | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
index 10fa49a13..6fb30ddde 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java
@@ -111,6 +111,11 @@ public final class ScopedTransaction extends SpiTransactionProxy {
     }
   }
 
+  @Override
+  public void rollbackAndContinue() {
+    transaction.rollbackAndContinue();
+  }
+
   @Override
   public void rollback() throws PersistenceException {
     try {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
index 529a7ca0a..ff094b643 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java
@@ -78,10 +78,14 @@ final class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void rollback() throws PersistenceException {
+  public void rollbackAndContinue() {
     // do nothing
   }
 
+  @Override
+  public void rollback() throws PersistenceException {
+    // do nothing
+  }
 
   @Override
   public void rollback(Throwable e) throws PersistenceException {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
index aa4bc978e..b170b71a2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
@@ -69,6 +69,11 @@ final class SavepointTransaction extends SpiTransactionProxy {
     }
   }
 
+  @Override
+  public void rollbackAndContinue() {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public void rollback() throws PersistenceException {
     rollbackSavepoint(null);

From bcc21b1c041436ab61479da386fede5a8cf68cae Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 1 Sep 2022 22:45:17 +1200
Subject: [PATCH 076/127] #2818 - Fix Concurrent modification of listenerNotify
 TransactionEvent list

The issue fixed here is that SavepointTransaction was effectively using the
TransactionEvent of the underlying 'parent' transaction. The fix is for
SavepointTransaction to have its own TransactionEvent.
---
 .../server/transaction/SavepointTransaction.java       | 10 ++++++++++
 .../tests/transaction/TestNestedSubTransaction.java    |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
index aa4bc978e..8dfcd3b37 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.transaction;
 
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiTransactionProxy;
+import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.server.util.Str;
 
 import javax.persistence.PersistenceException;
@@ -25,6 +26,7 @@ final class SavepointTransaction extends SpiTransactionProxy {
 
   private boolean rollbackOnly;
   private int state;
+  private TransactionEvent event;
 
   SavepointTransaction(SpiTransaction transaction, TransactionManager manager) throws SQLException {
     this.manager = manager;
@@ -40,6 +42,14 @@ final class SavepointTransaction extends SpiTransactionProxy {
     this.logPrefix = transaction.getLogPrefix() + spPrefix;
   }
 
+  @Override
+  public TransactionEvent getEvent() {
+    if (event == null) {
+      event = new TransactionEvent();
+    }
+    return event;
+  }
+
   @Override
   public String getLogPrefix() {
     return logPrefix;
diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
index e8f32eced..86161b8aa 100644
--- a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
+++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java
@@ -4,6 +4,8 @@ import io.ebean.*;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
+import io.ebeaninternal.api.SpiTransaction;
+import io.ebeaninternal.api.TransactionEvent;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.EBasic;
 
@@ -75,10 +77,15 @@ public class TestNestedSubTransaction extends BaseTestCase {
 
       server.save(bean);
 
+      TransactionEvent event0 = ((SpiTransaction) txn0).getEvent();
+
       try (Transaction txn1 = server.beginTransaction()) {
         bean.setName("updateNested");
         server.save(bean);
 
+        TransactionEvent event1 = ((SpiTransaction) txn1).getEvent();
+        assertThat(event1).isNotSameAs(event0);
+
         try (Transaction txn2 = server.beginTransaction()) {
           bean.setName("barney");
           DB.save(bean);

From c60362f6e15baf4ba6e59101f2e73a81fd65527c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Sep 2022 09:10:15 +1200
Subject: [PATCH 077/127] Bump ebean-agent to 13.9.1 - no effective change

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0c404ba4..21e557b8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.9.0</ebean-agent.version>
-    <ebean-maven-plugin.version>13.9.0</ebean-maven-plugin.version>
+    <ebean-agent.version>13.9.1</ebean-agent.version>
+    <ebean-maven-plugin.version>13.9.1</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

From 74321277ff708f16f03c663544e2113eaf69a2f7 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Sep 2022 09:16:01 +1200
Subject: [PATCH 078/127] [maven-release-plugin] prepare release
 ebean-parent-13.9.1

---
 composites/ebean-clickhouse/pom.xml | 14 ++++++++-----
 composites/ebean-cockroach/pom.xml  | 14 ++++++++-----
 composites/ebean-db2/pom.xml        | 14 ++++++++-----
 composites/ebean-h2/pom.xml         | 14 ++++++++-----
 composites/ebean-hana/pom.xml       | 14 ++++++++-----
 composites/ebean-mariadb/pom.xml    | 14 ++++++++-----
 composites/ebean-mysql/pom.xml      | 14 ++++++++-----
 composites/ebean-nuodb/pom.xml      | 14 ++++++++-----
 composites/ebean-oracle/pom.xml     | 14 ++++++++-----
 composites/ebean-postgres/pom.xml   | 14 ++++++++-----
 composites/ebean-sqlite/pom.xml     | 14 ++++++++-----
 composites/ebean-sqlserver/pom.xml  | 14 ++++++++-----
 composites/ebean-yugabyte/pom.xml   | 14 ++++++++-----
 composites/ebean/pom.xml            | 16 +++++++++------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 32 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-csv-reader/pom.xml            |  8 ++++----
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 12 +++++------
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 ++++++++++++++++-------------
 platforms/clickhouse/pom.xml        |  8 ++++++--
 platforms/db2/pom.xml               |  8 ++++++--
 platforms/h2/pom.xml                |  8 ++++++--
 platforms/hana/pom.xml              |  8 ++++++--
 platforms/hsqldb/pom.xml            |  8 ++++++--
 platforms/mariadb/pom.xml           | 10 ++++++---
 platforms/mysql/pom.xml             |  8 ++++++--
 platforms/nuodb/pom.xml             |  8 ++++++--
 platforms/oracle/pom.xml            |  8 ++++++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++++++--
 platforms/sqlanywhere/pom.xml       |  8 ++++++--
 platforms/sqlite/pom.xml            |  8 ++++++--
 platforms/sqlserver/pom.xml         |  8 ++++++--
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 47 files changed, 303 insertions(+), 191 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 7bd9aa3e9..8d3c62a95 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index c7bcfa55f..057437d7e 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 3d82c64c7..0218f5f50 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index b9e297018..5e9b43c05 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 2894a9c75..ba0a4a03f 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 7430d75b7..66d98c9f4 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 62e3c8e32..35640bda8 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 3c9bb0df5..fdba3a3a4 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 02b4b7b5a..114538d35 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 07fefc18c..fc6b7386a 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 3e9484d5c..784bf5629 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 9adf58a03..9edaacdc1 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 24a931204..4151f19ad 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 31eec3e1c..be7c58403 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,19 +16,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -41,14 +41,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 8aaf05526..81e6e139d 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 20f3aaa7e..637d27c69 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 7ef5d73ac..c657cee60 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 6029aa06c..a406aa4c6 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,94 +89,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.1-SNAPSHOT</version>
+        <version>13.9.1</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index adbf1bdbd..63df8e522 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index bbead632a..dedcc3614 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.1</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index 02f150051..91461a6c2 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index a55ef65bd..1249153cc 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 79222ef98..89e8eed8c 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 64a53129c..3db2e9dd9 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index a663e3458..efe45c790 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index d8161453a..238433b9c 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 5cf8498dc..99ef63cc2 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index a07ba2162..6c8f2087f 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 20af1e5bc..eae2cb6a7 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -105,14 +105,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 177e71254..4c4a7e6e8 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 68eb3d370..0659dec87 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,68 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 741f7e68f..0788786ac 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 02da79d69..45a0b0bd9 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 897c6e6d7..6df9b3941 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,4 +34,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 1a43494a5..8601b4d46 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 8405a7c9f..e4f1c9919 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index c7d7bb1be..bb4a0a898 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,14 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 4327346f7..f6b4ca49d 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 4c844820b..1398aaa18 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index b0d241090..de15a1625 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 39cb9863e..e02135fc2 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index d93304146..62c0a7d38 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 698e6bd04..2a53e15ac 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index e501f7064..ad66048ce 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 2d1193bdd..a44402e35 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.1</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.1</tag>
+  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 21e557b8f..e784cef11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.9.1-SNAPSHOT</version>
+  <version>13.9.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 9b8a83cac..c4abda648 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.1</version>
   </parent>
 
   <name>querybean generator</name>

From 5b1ace8607896e87392dcba647453e2788f7907e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Sep 2022 09:16:08 +1200
Subject: [PATCH 079/127] [maven-release-plugin] prepare for next development
 iteration

---
 composites/ebean-clickhouse/pom.xml | 14 +++++--------
 composites/ebean-cockroach/pom.xml  | 14 +++++--------
 composites/ebean-db2/pom.xml        | 14 +++++--------
 composites/ebean-h2/pom.xml         | 14 +++++--------
 composites/ebean-hana/pom.xml       | 14 +++++--------
 composites/ebean-mariadb/pom.xml    | 14 +++++--------
 composites/ebean-mysql/pom.xml      | 14 +++++--------
 composites/ebean-nuodb/pom.xml      | 14 +++++--------
 composites/ebean-oracle/pom.xml     | 14 +++++--------
 composites/ebean-postgres/pom.xml   | 14 +++++--------
 composites/ebean-sqlite/pom.xml     | 14 +++++--------
 composites/ebean-sqlserver/pom.xml  | 14 +++++--------
 composites/ebean-yugabyte/pom.xml   | 14 +++++--------
 composites/ebean/pom.xml            | 16 ++++++---------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 32 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-csv-reader/pom.xml            |  8 ++++----
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 12 +++++------
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 +++++++++++++----------------
 platforms/clickhouse/pom.xml        |  8 ++------
 platforms/db2/pom.xml               |  8 ++------
 platforms/h2/pom.xml                |  8 ++------
 platforms/hana/pom.xml              |  8 ++------
 platforms/hsqldb/pom.xml            |  8 ++------
 platforms/mariadb/pom.xml           | 10 +++------
 platforms/mysql/pom.xml             |  8 ++------
 platforms/nuodb/pom.xml             |  8 ++------
 platforms/oracle/pom.xml            |  8 ++------
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++------
 platforms/sqlanywhere/pom.xml       |  8 ++------
 platforms/sqlite/pom.xml            |  8 ++------
 platforms/sqlserver/pom.xml         |  8 ++------
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 47 files changed, 191 insertions(+), 303 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 8d3c62a95..57ebb759c 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 057437d7e..93817910a 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 0218f5f50..4ae0affeb 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 5e9b43c05..52b747f34 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index ba0a4a03f..637c6a262 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 66d98c9f4..fffdc4004 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 35640bda8..f178b354d 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index fdba3a3a4..4abbe7ad1 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 114538d35..51dcde226 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index fc6b7386a..79748f8e1 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 784bf5629..ddfcbc665 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 9edaacdc1..67e86b116 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 4151f19ad..7a2879c5a 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index be7c58403..5099e2088 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,19 +16,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -41,18 +41,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 81e6e139d..626db2d80 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 637d27c69..987410cdb 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index c657cee60..d1207a527 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index a406aa4c6..50cb48ad9 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,94 +89,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.1</version>
+        <version>13.9.2-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 63df8e522..3e503d4aa 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index dedcc3614..75cab30f2 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index 91461a6c2..f35b928a7 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 1249153cc..1334f5f94 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 89e8eed8c..863ce60d7 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 3db2e9dd9..8b2becc34 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index efe45c790..a8ce19836 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 238433b9c..dd4378bb1 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 99ef63cc2..8d061fe1a 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 6c8f2087f..6d4e27cac 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index eae2cb6a7..ef67e4bf1 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -105,14 +105,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 4c4a7e6e8..0f2df51c1 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 0659dec87..c6cd3e71d 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,68 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 0788786ac..3979e0790 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 45a0b0bd9..30d1f573e 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 6df9b3941..44e250df3 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,8 +34,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 8601b4d46..ce7d6d06f 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index e4f1c9919..6363c314d 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index bb4a0a898..b2c7025af 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index f6b4ca49d..665e8e814 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 1398aaa18..c83c6d016 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index de15a1625..a45dae051 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index e02135fc2..0ced51c05 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 62c0a7d38..3f4bd1fb2 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 2a53e15ac..d15cd9cce 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index ad66048ce..db7bcd97c 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index a44402e35..b03ccf2e2 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.1</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.1</tag>
-  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index e784cef11..09ccf9b12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.9.1</version>
+  <version>13.9.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index c4abda648..5c6d312a9 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From ad938b2ce27c5166f21570372c4dd4163b109466 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Sep 2022 09:34:59 +1200
Subject: [PATCH 080/127] Bump to 13.9.2-SNAPSHOT after release

---
 ebean-kotlin/pom.xml      | 6 +++---
 tests/test-java16/pom.xml | 6 +++---
 tests/test-kotlin/pom.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index a5d6f3550..f5605c0cf 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.1-SNAPSHOT</version>
+    <version>13.9.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 0c91e1350..ea0331b0a 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.9.1-SNAPSHOT</version>
+              <version>13.9.2-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 64d4709ae..fb7499d4d 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.1-SNAPSHOT</version>
+      <version>13.9.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From 674150dc755fda7d82c839d8437c3d774670344b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 2 Sep 2022 10:50:23 +1200
Subject: [PATCH 081/127] Minor dependency bump for jackson, assertj-core,
 joda-time, h2database

---
 ebean-core/pom.xml                             | 13 ++++++-------
 ebean-core/src/main/java/module-info.java      |  2 +-
 ebean-joda-time/pom.xml                        |  2 +-
 ebean-querybean/pom.xml                        |  2 +-
 ebean-querybean/src/main/java/module-info.java |  2 +-
 ebean-test/pom.xml                             |  4 ++--
 ebean-test/src/main/java/module-info.java      |  1 -
 pom.xml                                        |  4 ++--
 8 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 75cab30f2..b0dfed881 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -19,6 +19,11 @@
   </scm>
 
   <dependencies>
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.9.2-SNAPSHOT</version>
+    </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
@@ -38,12 +43,6 @@
       <version>${ebean-migration-auto.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
@@ -106,7 +105,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.9.7</version>
+      <version>2.11.1</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java
index 73c0e92f4..ee9ba85ea 100644
--- a/ebean-core/src/main/java/module-info.java
+++ b/ebean-core/src/main/java/module-info.java
@@ -37,7 +37,7 @@ module io.ebean.core {
   requires static java.naming;
   requires static java.validation;
   requires static org.postgresql.jdbc;
-  requires static joda.time;
+  requires static org.joda.time;
 
   exports io.ebeaninternal.server.cache;
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index a8ce19836..eb5a70fcd 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 8d061fe1a..70294328f 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>1.6</version>
+      <version>2.11.1</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-querybean/src/main/java/module-info.java b/ebean-querybean/src/main/java/module-info.java
index b45c04c57..b82ec244a 100644
--- a/ebean-querybean/src/main/java/module-info.java
+++ b/ebean-querybean/src/main/java/module-info.java
@@ -5,7 +5,7 @@ module io.ebean.querybean {
   requires io.ebean.api;
   requires io.ebean.core;
   requires static io.ebean.types;
-  requires static joda.time;
+  requires static org.joda.time;
   requires static io.avaje.jsr305x;
 
 }
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index ef67e4bf1..74eaaa1d4 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.22.0</version>
+      <version>3.23.1</version>
     </dependency>
 
     <!-- Including JAXB for DB Migration generation with Java 11+ -->
@@ -155,7 +155,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.11.0</version>
+      <version>2.11.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/src/main/java/module-info.java b/ebean-test/src/main/java/module-info.java
index 823483a0e..428c3b3f4 100644
--- a/ebean-test/src/main/java/module-info.java
+++ b/ebean-test/src/main/java/module-info.java
@@ -23,7 +23,6 @@ module io.ebean.test {
   requires transitive com.h2database;
 
   // support testing
-  requires static org.slf4j;
   requires static org.junit.jupiter.api;
   requires static jdk.management;
   requires static io.avaje.jsr305x;
diff --git a/pom.xml b/pom.xml
index 09ccf9b12..3fdfe8f71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,8 +39,8 @@
 
   <properties>
     <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
-    <jackson.version>2.13.2</jackson.version>
-    <h2database.version>2.1.212</h2database.version>
+    <jackson.version>2.13.3</jackson.version>
+    <h2database.version>2.1.214</h2database.version>
     <ebean-persistence-api.version>3.0</ebean-persistence-api.version>
     <ebean-types.version>3.0</ebean-types.version>
     <ebean-annotation.version>8.2</ebean-annotation.version>

From fbb73d465c70d627a9400a606f44ec7ef545c531 Mon Sep 17 00:00:00 2001
From: Noemi Praml <noemi.praml@foconis.de>
Date: Fri, 2 Sep 2022 10:08:31 +0200
Subject: [PATCH 082/127] FIX DB2 migration: reorg table must be called after
 drop not null

---
 .../dbmigration/ddlgeneration/platform/DB2Ddl.java   | 11 ++++++-----
 .../io/ebean/xtest/dbmigration/DbMigrationTest.java  |  1 +
 .../src/test/java/misc/migration/v1_0/ETable.java    | 12 ++++++++++++
 .../src/test/java/misc/migration/v1_1/ETable.java    |  5 +++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
index e0eea9377..265cc4392 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
@@ -39,12 +39,12 @@ public class DB2Ddl extends PlatformDdl {
       return String.format(MOVE_TABLE, tablename.toUpperCase(), tableSpace, indexSpace, lobSpace);
     }
   }
-  
+
   @Override
   public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, String[] nullableColumns) {
     if (nullableColumns == null || nullableColumns.length == 0) {
       return super.alterTableAddUniqueConstraint(tableName, uqName, columns, nullableColumns);
-    }     
+    }
 
     if (uqName == null) {
       throw new NullPointerException();
@@ -66,7 +66,7 @@ public class DB2Ddl extends PlatformDdl {
   public void addTablespace(DdlBuffer apply, String tablespaceName, String indexTablespace, String lobTablespace) {
     apply.append(" in ").append(tablespaceName).append(" index in ").append(indexTablespace).append(" long in ").append(lobTablespace);
   }
-  
+
   @Override
   public void alterTableAddColumn(DdlWrite writer, String tableName, Column column, boolean onHistoryTable, String defaultValue) {
 
@@ -209,7 +209,7 @@ public class DB2Ddl extends PlatformDdl {
 
     /**
      * determine, if we need a reorg.
-     * 
+     *
      * See: https://www.ibm.com/docs/en/db2/11.5?topic=statements-alter-table The following is the full list of REORG-recommended
      * ALTER statements that cause a version change and place the table into a REORG-pending state:
      * <ul>
@@ -221,7 +221,7 @@ public class DB2Ddl extends PlatformDdl {
      * Decreasing the length of a VARCHAR or VARGRAPHIC column without truncating trailing blanks from existing data, when no indexes
      * exist on the column
      * </ul>
-     * 
+     *
      */
     private boolean checkReorg(AlterCmd cmd) {
       switch (cmd.getOperation()) {
@@ -230,6 +230,7 @@ public class DB2Ddl extends PlatformDdl {
       case "alter column":
         String alter = cmd.getAlternation();
         return alter.equals("set not null")
+          || alter.equals("drop not null")
           || alter.equals("drop not default")
           || alter.startsWith("set data type"); // note: altering varchar length only is not detected here
       default:
diff --git a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
index 02378bc86..9a3cff37c 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
@@ -293,6 +293,7 @@ public class DbMigrationTest extends BaseTestCase {
       table.setFrom("foo");
       table.setTo("bar");
       table.setIndex("id");
+      table.setTextfield("test");
       tmpServer.save(table);
       table = tmpServer.find(ETable.class).where().eq("index", "id").findOne();
       assert table != null;
diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java
index dce7920af..0a593993f 100644
--- a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java
+++ b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java
@@ -3,6 +3,7 @@ package misc.migration.v1_0;
 import io.ebean.annotation.DbComment;
 import io.ebean.annotation.History;
 import io.ebean.annotation.Index;
+import io.ebean.annotation.NotNull;
 
 import javax.persistence.*;
 import java.util.List;
@@ -36,6 +37,17 @@ public class ETable {
   @OneToMany(mappedBy = "foreign")
   List<ETable> foreigns;
 
+  @NotNull
+  private String textfield;
+
+  public void setTextfield(String textfield) {
+    this.textfield = textfield;
+  }
+
+  public String getTextfield() {
+    return textfield;
+  }
+
   public String getIndex() {
     return index;
   }
diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java
index 6372c9233..20926d60f 100644
--- a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java
+++ b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java
@@ -39,4 +39,9 @@ public class ETable {
 
   @OneToMany(mappedBy = "foreign")
   List<ETable> foreigns;
+
+  private String textfield;
+
+  @Index
+  private String textfield2;
 }

From 117844b5eea718d8068fdbbbf5f660fee1b31e13 Mon Sep 17 00:00:00 2001
From: Noemi Praml <noemi.praml@foconis.de>
Date: Fri, 2 Sep 2022 10:41:46 +0200
Subject: [PATCH 083/127] Fix Unittests with drop not null

(cherry picked from commit 98e0e3b9caee328542340f829e6cfdcb0f40b6d0)
---
 .../ddlgeneration/platform/PlatformDdl_AlterColumnTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
index 7bf3e8d57..9804e0c43 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java
@@ -175,7 +175,8 @@ public class PlatformDdl_AlterColumnTest {
     sql = alterColumn(db2Ddl, alter);
     softly.assertThat(sql).isEqualTo("-- apply alter tables\n"
       + "alter table mytab alter column acol drop default;\n"
-      + "alter table mytab alter column acol drop not null;\n");
+      + "alter table mytab alter column acol drop not null;\n"
+      + "call sysproc.admin_cmd('reorg table mytab');\n");
 
   }
 
@@ -319,7 +320,8 @@ public class PlatformDdl_AlterColumnTest {
 
     sql = alterColumn(db2Ddl, alter);
     softly.assertThat(sql).isEqualTo("-- apply alter tables\n"
-      + "alter table mytab alter column acol drop not null;\n");
+      + "alter table mytab alter column acol drop not null;\n"
+      + "call sysproc.admin_cmd('reorg table mytab');\n");
   }
 
   @Test

From 808ba719f4feccbb32c124f0f994ca02c2ddd515 Mon Sep 17 00:00:00 2001
From: Noemi Praml <noemi.praml@foconis.de>
Date: Fri, 2 Sep 2022 11:44:41 +0200
Subject: [PATCH 084/127] Fix mariadb, mysql stored procedure
 usp_ebean_drop_column - reserved keywords

(cherry picked from commit b0df1775092149b60e2ce9839be74a05f84cc2e3)
---
 .../io/ebeaninternal/dbmigration/builtin-extra-ddl.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml b/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
index 1212f1f4c..34d3f0177 100644
--- a/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
+++ b/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
@@ -136,7 +136,7 @@ FETCH curs INTO c_fk_name;
 IF done THEN
 LEAVE read_loop;
 END IF;
-SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP FOREIGN KEY ', c_fk_name);
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 END LOOP;
@@ -155,7 +155,7 @@ delimiter $$
 CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
 BEGIN
 CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
-SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP COLUMN `', p_column_name, '`');
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 END

From 8fe6de376dcc01321b47b3b49187ba08907b0c35 Mon Sep 17 00:00:00 2001
From: Noemi Praml <noemi.praml@foconis.de>
Date: Fri, 2 Sep 2022 12:15:03 +0200
Subject: [PATCH 085/127] Fix sqlserver stored procedures - reserved keywords

(cherry picked from commit 09bcf6dbb967c83f4bca3613df5d443975691a08)
---
 .../io/ebeaninternal/dbmigration/builtin-extra-ddl.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml b/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
index 34d3f0177..4955f2c98 100644
--- a/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
+++ b/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml
@@ -36,7 +36,7 @@ BEGIN
   FETCH NEXT FROM index_cursor INTO @indexName
   WHILE @@FETCH_STATUS = 0
     BEGIN
-      set @sql = 'drop index ' + @indexName + ' on ' + @tableName;
+      set @sql = 'drop index ' + @indexName + ' on [' + @tableName + ']';
       EXECUTE(@sql);
 
       FETCH NEXT FROM index_cursor INTO @indexName
@@ -58,7 +58,7 @@ BEGIN
     join sys.columns t2 on t1.object_id = t2.default_object_id
     where t1.parent_object_id = OBJECT_ID(@tableName) and t2.name = @columnName;
 
-  if @tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
+  if @tmp is not null EXEC('alter table [' + @tableName +'] drop constraint ' + @tmp);
 END
 GO
 
@@ -85,7 +85,7 @@ BEGIN
   FETCH NEXT FROM name_cursor INTO @constraintName
   WHILE @@FETCH_STATUS = 0
     BEGIN
-      set @sql = 'alter table ' + @tableName + ' drop constraint ' + @constraintName;
+      set @sql = 'alter table [' + @tableName + '] drop constraint ' + @constraintName;
       EXECUTE(@sql);
 
       FETCH NEXT FROM name_cursor INTO @constraintName
@@ -107,7 +107,7 @@ BEGIN
   EXEC usp_ebean_drop_default_constraint @tableName, @columnName;
   EXEC usp_ebean_drop_constraints @tableName, @columnName;
 
-  set @sql = 'alter table ' + @tableName + ' drop column ' + @columnName;
+  set @sql = 'alter table [' + @tableName + '] drop column [' + @columnName + ']';
   EXECUTE(@sql);
 END
 GO

From 13622f6b62f68a266f1d7d69f5e965c277cef287 Mon Sep 17 00:00:00 2001
From: Noemi Praml <noemi.praml@foconis.de>
Date: Fri, 2 Sep 2022 13:27:11 +0200
Subject: [PATCH 086/127] migrations scripts

---
 .../dbmigration/clickhouse/1.0__initial.sql   |  3 +-
 .../dbmigration/clickhouse/1.1.sql            |  2 ++
 .../clickhouse/1.4__dropsFor_1.3.sql          |  2 ++
 .../clickhouse/idx_clickhouse.migrations      |  6 ++--
 .../dbmigration/cockroach/1.0__initial.sql    |  1 +
 .../dbmigration/cockroach/1.1.sql             |  3 ++
 .../dbmigration/cockroach/1.3.sql             |  1 +
 .../cockroach/1.4__dropsFor_1.3.sql           |  2 ++
 .../cockroach/idx_cockroach.migrations        |  8 ++---
 .../dbmigration/db2fori/1.0__initial.sql      |  1 +
 .../migrationtest/dbmigration/db2fori/1.1.sql |  7 +++++
 .../migrationtest/dbmigration/db2fori/1.3.sql |  9 ++++++
 .../dbmigration/db2fori/1.4__dropsFor_1.3.sql |  8 +++++
 .../dbmigration/db2fori/idx_db2.migrations    |  8 ++---
 .../dbmigration/db2legacy/1.0__initial.sql    |  1 +
 .../dbmigration/db2legacy/1.1.sql             |  3 ++
 .../dbmigration/db2legacy/1.3.sql             |  1 +
 .../db2legacy/1.4__dropsFor_1.3.sql           |  2 ++
 .../db2legacy/idx_generic.migrations          |  8 ++---
 .../dbmigration/db2luw/1.0__initial.sql       |  1 +
 .../migrationtest/dbmigration/db2luw/1.1.sql  |  7 +++++
 .../migrationtest/dbmigration/db2luw/1.3.sql  |  9 ++++++
 .../dbmigration/db2luw/1.4__dropsFor_1.3.sql  |  8 +++++
 .../dbmigration/db2luw/idx_db2.migrations     |  8 ++---
 .../dbmigration/db2zos/1.0__initial.sql       |  1 +
 .../migrationtest/dbmigration/db2zos/1.1.sql  |  7 +++++
 .../migrationtest/dbmigration/db2zos/1.3.sql  |  9 ++++++
 .../dbmigration/db2zos/1.4__dropsFor_1.3.sql  |  8 +++++
 .../dbmigration/db2zos/idx_db2.migrations     |  8 ++---
 .../dbmigration/generic/1.0__initial.sql      |  1 +
 .../migrationtest/dbmigration/generic/1.1.sql |  3 ++
 .../migrationtest/dbmigration/generic/1.3.sql |  1 +
 .../dbmigration/generic/1.4__dropsFor_1.3.sql |  2 ++
 .../generic/idx_generic.migrations            |  8 ++---
 .../dbmigration/h2/1.0__initial.sql           |  2 ++
 .../migrationtest/dbmigration/h2/1.1.sql      |  5 +++
 .../migrationtest/dbmigration/h2/1.3.sql      |  1 +
 .../dbmigration/h2/1.4__dropsFor_1.3.sql      |  8 +++++
 .../dbmigration/h2/idx_h2.migrations          |  8 ++---
 .../dbmigration/hana/1.0__initial.sql         |  2 ++
 .../migrationtest/dbmigration/hana/1.1.sql    |  9 ++++--
 .../migrationtest/dbmigration/hana/1.3.sql    |  7 +++++
 .../dbmigration/hana/1.4__dropsFor_1.3.sql    |  6 ++++
 .../dbmigration/hana/idx_hana.migrations      |  8 ++---
 .../dbmigration/hsqldb/1.0__initial.sql       |  1 +
 .../migrationtest/dbmigration/hsqldb/1.1.sql  |  3 ++
 .../migrationtest/dbmigration/hsqldb/1.3.sql  |  1 +
 .../dbmigration/hsqldb/1.4__dropsFor_1.3.sql  |  2 ++
 .../dbmigration/hsqldb/idx_hsqldb.migrations  |  8 ++---
 .../mariadb-noprocs/1.0__initial.sql          |  1 +
 .../dbmigration/mariadb-noprocs/1.1.sql       |  3 ++
 .../dbmigration/mariadb-noprocs/1.3.sql       |  1 +
 .../mariadb-noprocs/1.4__dropsFor_1.3.sql     |  2 ++
 .../mariadb-noprocs/idx_mariadb.migrations    |  8 ++---
 .../dbmigration/mariadb/1.0__initial.sql      |  1 +
 .../migrationtest/dbmigration/mariadb/1.1.sql |  3 ++
 .../migrationtest/dbmigration/mariadb/1.3.sql |  1 +
 .../dbmigration/mariadb/1.4__dropsFor_1.3.sql |  2 ++
 .../dbmigration/mariadb/I__create_procs.sql   |  4 +--
 .../mariadb/idx_mariadb.migrations            | 10 +++---
 .../dbmigration/model/1.0__initial.model.xml  |  1 +
 .../dbmigration/model/1.1.model.xml           |  3 ++
 .../dbmigration/model/1.3.model.xml           |  3 ++
 .../model/1.4__dropsFor_1.3.model.xml         |  2 ++
 .../dbmigration/mysql/1.0__initial.sql        |  6 ++--
 .../migrationtest/dbmigration/mysql/1.1.sql   |  9 ++++--
 .../migrationtest/dbmigration/mysql/1.3.sql   |  1 +
 .../dbmigration/mysql/1.4__dropsFor_1.3.sql   | 19 ++++++++++++
 .../dbmigration/mysql/I__create_procs.sql     |  4 +--
 .../dbmigration/mysql/idx_mysql.migrations    | 10 +++---
 .../dbmigration/mysql55/1.0__initial.sql      |  6 ++--
 .../migrationtest/dbmigration/mysql55/1.1.sql |  9 ++++--
 .../migrationtest/dbmigration/mysql55/1.3.sql |  1 +
 .../dbmigration/mysql55/1.4__dropsFor_1.3.sql | 19 ++++++++++++
 .../dbmigration/mysql55/I__create_procs.sql   |  4 +--
 .../dbmigration/mysql55/idx_mysql.migrations  | 10 +++---
 .../dbmigration/nuodb/1.0__initial.sql        |  6 ++--
 .../migrationtest/dbmigration/nuodb/1.1.sql   |  9 ++++--
 .../migrationtest/dbmigration/nuodb/1.3.sql   |  1 +
 .../dbmigration/nuodb/1.4__dropsFor_1.3.sql   | 21 +++++++++++++
 .../dbmigration/nuodb/idx_nuodb.migrations    |  8 ++---
 .../dbmigration/oracle/1.0__initial.sql       |  1 +
 .../migrationtest/dbmigration/oracle/1.1.sql  |  3 ++
 .../migrationtest/dbmigration/oracle/1.3.sql  |  1 +
 .../dbmigration/oracle/1.4__dropsFor_1.3.sql  |  2 ++
 .../dbmigration/oracle/idx_oracle.migrations  |  8 ++---
 .../dbmigration/oracle11/1.0__initial.sql     |  1 +
 .../dbmigration/oracle11/1.1.sql              |  3 ++
 .../dbmigration/oracle11/1.3.sql              |  1 +
 .../oracle11/1.4__dropsFor_1.3.sql            |  2 ++
 .../oracle11/idx_oracle.migrations            |  8 ++---
 .../dbmigration/postgres/1.0__initial.sql     |  5 +--
 .../dbmigration/postgres/1.1.sql              |  9 ++++--
 .../dbmigration/postgres/1.3.sql              |  1 +
 .../postgres/1.4__dropsFor_1.3.sql            | 31 +++++++++++++++++++
 .../postgres/idx_postgres.migrations          |  8 ++---
 .../dbmigration/postgres9/1.0__initial.sql    |  5 +--
 .../dbmigration/postgres9/1.1.sql             |  9 ++++--
 .../dbmigration/postgres9/1.3.sql             |  1 +
 .../postgres9/1.4__dropsFor_1.3.sql           | 31 +++++++++++++++++++
 .../postgres9/idx_postgres.migrations         |  8 ++---
 .../dbmigration/sqlanywhere/1.0__initial.sql  |  1 +
 .../dbmigration/sqlanywhere/1.1.sql           |  3 ++
 .../dbmigration/sqlanywhere/1.3.sql           |  1 +
 .../sqlanywhere/1.4__dropsFor_1.3.sql         |  2 ++
 .../sqlanywhere/idx_sqlanywhere.migrations    |  8 ++---
 .../dbmigration/sqlite/1.0__initial.sql       |  1 +
 .../migrationtest/dbmigration/sqlite/1.1.sql  |  3 ++
 .../migrationtest/dbmigration/sqlite/1.3.sql  |  1 +
 .../dbmigration/sqlite/1.4__dropsFor_1.3.sql  |  2 ++
 .../dbmigration/sqlite/idx_sqlite.migrations  |  8 ++---
 .../dbmigration/sqlserver16/1.0__initial.sql  |  1 +
 .../dbmigration/sqlserver16/1.1.sql           |  3 ++
 .../dbmigration/sqlserver16/1.3.sql           |  1 +
 .../sqlserver16/1.4__dropsFor_1.3.sql         |  5 +++
 .../sqlserver16/I__create_procs.sql           |  8 ++---
 .../sqlserver16/idx_sqlserver.migrations      | 10 +++---
 .../dbmigration/sqlserver17/1.0__initial.sql  |  1 +
 .../dbmigration/sqlserver17/1.1.sql           |  3 ++
 .../dbmigration/sqlserver17/1.3.sql           |  1 +
 .../sqlserver17/1.4__dropsFor_1.3.sql         |  5 +++
 .../sqlserver17/I__create_procs.sql           |  8 ++---
 .../sqlserver17/idx_sqlserver.migrations      | 10 +++---
 .../dbmigration/yugabyte/1.0__initial.sql     |  6 ++--
 .../dbmigration/yugabyte/1.1.sql              |  9 ++++--
 .../dbmigration/yugabyte/1.3.sql              |  1 +
 .../yugabyte/1.4__dropsFor_1.3.sql            | 31 +++++++++++++++++++
 .../yugabyte/idx_yugabyte.migrations          |  8 ++---
 128 files changed, 554 insertions(+), 141 deletions(-)

diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql
index f98c28775..228422449 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql
@@ -126,7 +126,8 @@ create table "table" (
   "from"                        String,
   "to"                          String,
   "varchar"                     String,
-  "foreign"                     String
+  "foreign"                     String,
+  textfield                     String
 ) ENGINE = Log();
 
 create table migtest_mtm_c (
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.1.sql
index 0489ae14d..9849b051c 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.1.sql
@@ -38,7 +38,9 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table "table" alter column textfield set null;
 alter table "table" add column "select" String;
+alter table "table" add column textfield2 String;
 alter table migtest_ckey_detail add column one_key UInt32;
 alter table migtest_ckey_detail add column two_key String;
 alter table migtest_ckey_parent add column assoc_id UInt32;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.4__dropsFor_1.3.sql
index b4087d6d6..b7d11cb4d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.4__dropsFor_1.3.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
index c3612c6c2..15a78f72e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations
@@ -1,6 +1,6 @@
-235371332,      1.0__initial.sql
-74490120,       1.1.sql
+193400547,      1.0__initial.sql
+540706946,      1.1.sql
 688811494,      1.2__dropsFor_1.1.sql
 1015552567,     1.3.sql
-80209848,       1.4__dropsFor_1.3.sql
+255653518,      1.4__dropsFor_1.3.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql
index 71fc29b04..4f47e0774 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql
index 5c0070d16..183dcdc71 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql
@@ -46,7 +46,9 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -116,3 +118,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql
index 8397edb71..88945c112 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql
@@ -16,6 +16,7 @@ drop index uq_migtest_e_basic_indextest5 cascade;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.4__dropsFor_1.3.sql
index 6db145c5c..a643969f8 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.4__dropsFor_1.3.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
index 521df7740..debd08772 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations
@@ -1,7 +1,7 @@
--703764770,     1.0__initial.sql
-773862451,      1.1.sql
+1434934404,     1.0__initial.sql
+1284257915,     1.1.sql
 856096334,      1.2__dropsFor_1.1.sql
-17665322,       1.3.sql
--820814009,     1.4__dropsFor_1.3.sql
+-1551362011,    1.3.sql
+-971909974,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql
index 98315d5d8..9931da4b1 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql
@@ -152,6 +152,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint pk_table primary key ("index")
 );
 comment on column "table"."index" is 'this is a comment';
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql
index 669dacdf7..3032d4353 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql
@@ -130,7 +130,10 @@ alter table "table" drop versioning;
 CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','TESTTS','TESTTS','TESTTS','','','','','','MOVE');
 CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTER','TSMASTER','','','','','','MOVE');
 -- apply alter tables
+alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
+call sysproc.admin_cmd('reorg table "table"');
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -180,7 +183,10 @@ alter table migtest_e_history6_history alter column test_number2 drop not null;
 call sysproc.admin_cmd('reorg table migtest_e_history6_history');
 alter table migtest_e_softdelete add column deleted smallint default 0 default false not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history alter column textfield drop not null;
 alter table table_history add column "select" varchar(255);
+alter table table_history add column textfield2 varchar(255);
+call sysproc.admin_cmd('reorg table table_history');
 -- apply post alter
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 create unique index uq_migtest_e_basic_description on migtest_e_basic(description) exclude null keys;
@@ -232,3 +238,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql
index 67dc90eff..5baddc80a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql
@@ -147,6 +147,13 @@ if exists (select indname from syscat.indexes where indschema = current_schema a
   execute stmt;
 end if;
 end$$;
+delimiter $$
+begin
+if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_TABLE_TEXTFIELD2') then
+  prepare stmt from 'drop index ix_table_textfield2';
+  execute stmt;
+end if;
+end$$;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
@@ -200,9 +207,11 @@ alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string drop not null;
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+call sysproc.admin_cmd('reorg table migtest_e_history2');
 alter table migtest_e_history2_history alter column test_string drop not null;
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
+call sysproc.admin_cmd('reorg table migtest_e_history2_history');
 alter table migtest_e_history4 alter column test_number set data type integer;
 call sysproc.admin_cmd('reorg table migtest_e_history4');
 alter table migtest_e_history4_history alter column test_number set data type integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql
index 95bd2ed00..ecc7c99fa 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql
@@ -4,7 +4,11 @@ alter table migtest_e_history drop versioning;
 alter table migtest_e_history drop period system_time;
 alter table migtest_e_history2 drop versioning;
 alter table migtest_e_history5 drop versioning;
+alter table "table" drop versioning;
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
+call sysproc.admin_cmd('reorg table "table"');
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 call sysproc.admin_cmd('reorg table migtest_ckey_detail');
@@ -36,10 +40,14 @@ alter table migtest_e_softdelete drop column deleted;
 call sysproc.admin_cmd('reorg table migtest_e_softdelete');
 alter table migtest_oto_child drop column master_id;
 call sysproc.admin_cmd('reorg table migtest_oto_child');
+alter table table_history drop column textfield;
+alter table table_history drop column textfield2;
+call sysproc.admin_cmd('reorg table table_history');
 -- apply post alter
 drop table migtest_e_history_history;
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;
 alter table migtest_e_history5 add versioning use history table migtest_e_history5_history;
+alter table "table" add versioning use history table table_history;
 drop table migtest_e_user;
 delimiter $$
 begin
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
index 1ef685958..16c7b2cec 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
@@ -1,7 +1,7 @@
-1873955813,     1.0__initial.sql
--1557626294,    1.1.sql
+-1467839063,    1.0__initial.sql
+-184000413,     1.1.sql
 -1187336846,    1.2__dropsFor_1.1.sql
-2066110925,     1.3.sql
--1713819679,    1.4__dropsFor_1.3.sql
+-150875853,     1.3.sql
+946163478,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql
index 4deaeeaa5..7b7bddd1d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql
index 7d28dfd4b..645d357f2 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql
@@ -46,7 +46,9 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table "table" alter column textfield set null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -119,3 +121,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql
index ac80b64d5..d41f2877a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql
@@ -16,6 +16,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.4__dropsFor_1.3.sql
index b4087d6d6..b7d11cb4d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.4__dropsFor_1.3.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_generic.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_generic.migrations
index d016b1917..c9faf50c4 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_generic.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_generic.migrations
@@ -1,6 +1,6 @@
--710189690,     1.0__initial.sql
--145836847,     1.1.sql
+-1547037623,    1.0__initial.sql
+253988246,      1.1.sql
 688811494,      1.2__dropsFor_1.1.sql
-2025934113,     1.3.sql
-80209848,       1.4__dropsFor_1.3.sql
+509168727,      1.3.sql
+255653518,      1.4__dropsFor_1.3.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql
index 7bd62bcb0..8b9d60aad 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql
@@ -152,6 +152,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint pk_table primary key ("index")
 );
 comment on column "table"."index" is 'this is a comment';
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql
index 9c00294bc..2f4beedaa 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql
@@ -130,7 +130,10 @@ alter table "table" drop versioning;
 CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','TESTTS','TESTTS','TESTTS','','','','','','MOVE');
 CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTER','TSMASTER','','','','','','MOVE');
 -- apply alter tables
+alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
+call sysproc.admin_cmd('reorg table "table"');
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -180,7 +183,10 @@ alter table migtest_e_history6_history alter column test_number2 drop not null;
 call sysproc.admin_cmd('reorg table migtest_e_history6_history');
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history alter column textfield drop not null;
 alter table table_history add column "select" varchar(255);
+alter table table_history add column textfield2 varchar(255);
+call sysproc.admin_cmd('reorg table table_history');
 -- apply post alter
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 create unique index uq_migtest_e_basic_description on migtest_e_basic(description) exclude null keys;
@@ -232,3 +238,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql
index f61a3c695..4a672dd72 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql
@@ -147,6 +147,13 @@ if exists (select indname from syscat.indexes where indschema = current_schema a
   execute stmt;
 end if;
 end$$;
+delimiter $$
+begin
+if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_TABLE_TEXTFIELD2') then
+  prepare stmt from 'drop index ix_table_textfield2';
+  execute stmt;
+end if;
+end$$;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
@@ -200,9 +207,11 @@ alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string drop not null;
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+call sysproc.admin_cmd('reorg table migtest_e_history2');
 alter table migtest_e_history2_history alter column test_string drop not null;
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
+call sysproc.admin_cmd('reorg table migtest_e_history2_history');
 alter table migtest_e_history4 alter column test_number set data type integer;
 call sysproc.admin_cmd('reorg table migtest_e_history4');
 alter table migtest_e_history4_history alter column test_number set data type integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql
index 95bd2ed00..ecc7c99fa 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql
@@ -4,7 +4,11 @@ alter table migtest_e_history drop versioning;
 alter table migtest_e_history drop period system_time;
 alter table migtest_e_history2 drop versioning;
 alter table migtest_e_history5 drop versioning;
+alter table "table" drop versioning;
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
+call sysproc.admin_cmd('reorg table "table"');
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 call sysproc.admin_cmd('reorg table migtest_ckey_detail');
@@ -36,10 +40,14 @@ alter table migtest_e_softdelete drop column deleted;
 call sysproc.admin_cmd('reorg table migtest_e_softdelete');
 alter table migtest_oto_child drop column master_id;
 call sysproc.admin_cmd('reorg table migtest_oto_child');
+alter table table_history drop column textfield;
+alter table table_history drop column textfield2;
+call sysproc.admin_cmd('reorg table table_history');
 -- apply post alter
 drop table migtest_e_history_history;
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;
 alter table migtest_e_history5 add versioning use history table migtest_e_history5_history;
+alter table "table" add versioning use history table table_history;
 drop table migtest_e_user;
 delimiter $$
 begin
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
index 544b1fcb9..146c2c1d8 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
@@ -1,8 +1,8 @@
 1307787475,     I__create_tablespaces.sql
--1998060342,    1.0__initial.sql
-1595289592,     1.1.sql
+2058232717,     1.0__initial.sql
+-1450326352,    1.1.sql
 -1187336846,    1.2__dropsFor_1.1.sql
--1088179698,    1.3.sql
--1713819679,    1.4__dropsFor_1.3.sql
+1976888196,     1.3.sql
+946163478,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql
index 7bd62bcb0..8b9d60aad 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql
@@ -152,6 +152,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint pk_table primary key ("index")
 );
 comment on column "table"."index" is 'this is a comment';
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql
index 9c00294bc..2f4beedaa 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql
@@ -130,7 +130,10 @@ alter table "table" drop versioning;
 CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','TESTTS','TESTTS','TESTTS','','','','','','MOVE');
 CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTER','TSMASTER','','','','','','MOVE');
 -- apply alter tables
+alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
+call sysproc.admin_cmd('reorg table "table"');
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -180,7 +183,10 @@ alter table migtest_e_history6_history alter column test_number2 drop not null;
 call sysproc.admin_cmd('reorg table migtest_e_history6_history');
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history alter column textfield drop not null;
 alter table table_history add column "select" varchar(255);
+alter table table_history add column textfield2 varchar(255);
+call sysproc.admin_cmd('reorg table table_history');
 -- apply post alter
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 create unique index uq_migtest_e_basic_description on migtest_e_basic(description) exclude null keys;
@@ -232,3 +238,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql
index f61a3c695..4a672dd72 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql
@@ -147,6 +147,13 @@ if exists (select indname from syscat.indexes where indschema = current_schema a
   execute stmt;
 end if;
 end$$;
+delimiter $$
+begin
+if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_TABLE_TEXTFIELD2') then
+  prepare stmt from 'drop index ix_table_textfield2';
+  execute stmt;
+end if;
+end$$;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
@@ -200,9 +207,11 @@ alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string drop not null;
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+call sysproc.admin_cmd('reorg table migtest_e_history2');
 alter table migtest_e_history2_history alter column test_string drop not null;
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
+call sysproc.admin_cmd('reorg table migtest_e_history2_history');
 alter table migtest_e_history4 alter column test_number set data type integer;
 call sysproc.admin_cmd('reorg table migtest_e_history4');
 alter table migtest_e_history4_history alter column test_number set data type integer;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql
index 95bd2ed00..ecc7c99fa 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql
@@ -4,7 +4,11 @@ alter table migtest_e_history drop versioning;
 alter table migtest_e_history drop period system_time;
 alter table migtest_e_history2 drop versioning;
 alter table migtest_e_history5 drop versioning;
+alter table "table" drop versioning;
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
+call sysproc.admin_cmd('reorg table "table"');
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 call sysproc.admin_cmd('reorg table migtest_ckey_detail');
@@ -36,10 +40,14 @@ alter table migtest_e_softdelete drop column deleted;
 call sysproc.admin_cmd('reorg table migtest_e_softdelete');
 alter table migtest_oto_child drop column master_id;
 call sysproc.admin_cmd('reorg table migtest_oto_child');
+alter table table_history drop column textfield;
+alter table table_history drop column textfield2;
+call sysproc.admin_cmd('reorg table table_history');
 -- apply post alter
 drop table migtest_e_history_history;
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;
 alter table migtest_e_history5 add versioning use history table migtest_e_history5_history;
+alter table "table" add versioning use history table table_history;
 drop table migtest_e_user;
 delimiter $$
 begin
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
index 06ee096d3..2d8e70ad2 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
@@ -1,7 +1,7 @@
--1998060342,    1.0__initial.sql
-1595289592,     1.1.sql
+2058232717,     1.0__initial.sql
+-1450326352,    1.1.sql
 -1187336846,    1.2__dropsFor_1.1.sql
--1088179698,    1.3.sql
--1713819679,    1.4__dropsFor_1.3.sql
+1976888196,     1.3.sql
+946163478,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql
index 4deaeeaa5..7b7bddd1d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.1.sql
index 7d28dfd4b..645d357f2 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.1.sql
@@ -46,7 +46,9 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table "table" alter column textfield set null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -119,3 +121,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql
index ac80b64d5..d41f2877a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql
@@ -16,6 +16,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.4__dropsFor_1.3.sql
index b4087d6d6..b7d11cb4d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.4__dropsFor_1.3.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
index d016b1917..c9faf50c4 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations
@@ -1,6 +1,6 @@
--710189690,     1.0__initial.sql
--145836847,     1.1.sql
+-1547037623,    1.0__initial.sql
+253988246,      1.1.sql
 688811494,      1.2__dropsFor_1.1.sql
-2025934113,     1.3.sql
-80209848,       1.4__dropsFor_1.3.sql
+509168727,      1.3.sql
+255653518,      1.4__dropsFor_1.3.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql
index 421988c4d..d405e6e70 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
@@ -254,6 +255,7 @@ create table table_history(
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255),
   sys_period_start              timestamp,
   sys_period_end                timestamp
 );
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql
index 10e15fc7b..93ae665e6 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql
@@ -58,7 +58,9 @@ drop view migtest_e_history6_with_history;
 drop trigger table_history_upd;
 drop view table_with_history;
 -- apply alter tables
+alter table "table" alter column textfield set null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -96,7 +98,9 @@ alter table migtest_e_history6 alter column test_number2 set null;
 alter table migtest_e_history6_history alter column test_number2 set null;
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history alter column textfield set null;
 alter table table_history add column "select" varchar(255);
+alter table table_history add column textfield2 varchar(255);
 -- apply post alter
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
@@ -161,3 +165,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql
index 7d0188eed..844fb66bd 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql
@@ -16,6 +16,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.4__dropsFor_1.3.sql
index feea9437a..e7863869a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.4__dropsFor_1.3.sql
@@ -9,7 +9,11 @@ drop trigger migtest_e_history2_history_upd;
 drop view migtest_e_history2_with_history;
 drop trigger migtest_e_history5_history_upd;
 drop view migtest_e_history5_with_history;
+drop trigger table_history_upd;
+drop view table_with_history;
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
@@ -30,11 +34,15 @@ alter table migtest_e_history5 drop column test_boolean;
 alter table migtest_e_history5_history drop column test_boolean;
 alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
+alter table table_history drop column textfield;
+alter table table_history drop column textfield2;
 -- apply post alter
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.platform.h2.H2HistoryTrigger";
 create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
 create trigger migtest_e_history5_history_upd before update,delete on migtest_e_history5 for each row call "io.ebean.platform.h2.H2HistoryTrigger";
+create view table_with_history as select * from "table" union all select * from table_history;
+create trigger table_history_upd before update,delete on "table" for each row call "io.ebean.platform.h2.H2HistoryTrigger";
 drop table if exists migtest_e_user;
 drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations
index e7d2d1dc7..a58bd9139 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations
@@ -1,8 +1,8 @@
--1806036603,    1.0__initial.sql
--1296236140,    1.1.sql
+-1854589550,    1.0__initial.sql
+1979519453,     1.1.sql
 1579867974,     1.2__dropsFor_1.1.sql
--877392737,     1.3.sql
-116139207,      1.4__dropsFor_1.3.sql
+-285485598,     1.3.sql
+-1120611041,    1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql
index a6b08b371..2c4188555 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql
@@ -156,6 +156,7 @@ create column table "table" (
   "to"                          nvarchar(255),
   "varchar"                     nvarchar(255),
   "foreign"                     nvarchar(255),
+  textfield                     nvarchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
@@ -257,6 +258,7 @@ create column table table_history (
  "to" nvarchar(255),
  "varchar" nvarchar(255),
  "foreign" nvarchar(255),
+ textfield nvarchar(255) not null,
  sys_period_start timestamp,
  sys_period_end timestamp
 );
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql
index 00f9b2570..98d826685 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql
@@ -100,7 +100,9 @@ update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 alter table migtest_e_history6 drop system versioning;
 alter table "table" drop system versioning;
 -- apply alter tables
-alter table "table" add ("select" nvarchar(255));
+alter table "table" alter (textfield nvarchar(255));
+alter table "table" add ("select" nvarchar(255),
+   textfield2 nvarchar(255));
 alter table migtest_ckey_detail add (one_key integer,
    two_key nvarchar(127));
 alter table migtest_ckey_parent add (assoc_id integer);
@@ -130,7 +132,9 @@ alter table migtest_e_history6 alter (test_number1 integer default 42 not null,
 alter table migtest_e_history6_history alter (test_number2 integer);
 alter table migtest_e_softdelete add (deleted boolean default false not null);
 alter table migtest_oto_child add (master_id bigint);
-alter table table_history add ("select" nvarchar(255));
+alter table table_history alter (textfield nvarchar(255));
+alter table table_history add ("select" nvarchar(255),
+   textfield2 nvarchar(255));
 -- apply post alter
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 -- cannot create unique index "uq_migtest_e_basic_description" on table "migtest_e_basic" with nullable columns;
@@ -192,3 +196,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 -- explicit index "ix_migtest_e_basic_indextest3" for single column "indextest3" of table "migtest_e_basic" is not necessary;
 -- explicit index "ix_migtest_e_basic_indextest6" for single column "indextest6" of table "migtest_e_basic" is not necessary;
+-- explicit index "ix_table_textfield2" for single column "textfield2" of table ""table"" is not necessary;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql
index 228ebaa58..e818117ed 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql
@@ -76,6 +76,13 @@ declare exit handler for sql_error_code 261 begin end;
 exec 'drop index ix_migtest_e_basic_indextest6';
 end;
 $$;
+delimiter $$
+do
+begin
+declare exit handler for sql_error_code 261 begin end;
+exec 'drop index ix_table_textfield2';
+end;
+$$;
 -- apply changes
 create column table "migtest_QuOtEd" (
   id                            nvarchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.4__dropsFor_1.3.sql
index d49afa4be..801ddd022 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.4__dropsFor_1.3.sql
@@ -7,7 +7,10 @@ drop table migtest_e_history_history cascade;
 -- apply changes
 alter table migtest_e_history2 drop system versioning;
 alter table migtest_e_history5 drop system versioning;
+alter table "table" drop system versioning;
 -- apply alter tables
+CALL usp_ebean_drop_column('"table"', 'textfield');
+CALL usp_ebean_drop_column('"table"', 'textfield2');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'one_key');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'two_key');
 CALL usp_ebean_drop_column('migtest_ckey_parent', 'assoc_id');
@@ -26,9 +29,12 @@ CALL usp_ebean_drop_column('migtest_e_history5', 'test_boolean');
 CALL usp_ebean_drop_column('migtest_e_history5_history', 'test_boolean');
 CALL usp_ebean_drop_column('migtest_e_softdelete', 'deleted');
 CALL usp_ebean_drop_column('migtest_oto_child', 'master_id');
+CALL usp_ebean_drop_column('table_history', 'textfield');
+CALL usp_ebean_drop_column('table_history', 'textfield2');
 -- apply post alter
 alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated;
 alter table migtest_e_history5 add system versioning history table migtest_e_history5_history not validated;
+alter table "table" add system versioning history table table_history not validated;
 drop table migtest_e_user cascade;
 drop table migtest_mtm_c_migtest_mtm_m cascade;
 drop table migtest_mtm_m_migtest_mtm_c cascade;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations
index 10183c98f..467fc71ec 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations
@@ -1,8 +1,8 @@
 -745347271,     I__create_procs.sql
-1631114894,     1.0__initial.sql
--534043487,     1.1.sql
+-2017770851,    1.0__initial.sql
+-1727762906,    1.1.sql
 1535221752,     1.2__dropsFor_1.1.sql
-483907844,      1.3.sql
-1812245353,     1.4__dropsFor_1.3.sql
+-1046661128,    1.3.sql
+1185007986,     1.4__dropsFor_1.3.sql
 1906063401,     R__order_views_hana.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql
index f84501c10..ff2f34299 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql
index 03c8737c7..94010fa00 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql
@@ -46,7 +46,9 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table "table" alter column textfield set null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -119,3 +121,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql
index de92cd16f..3d4fb1409 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql
@@ -16,6 +16,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.4__dropsFor_1.3.sql
index 19c77f211..9387dec42 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.4__dropsFor_1.3.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations
index 97e572937..61c09dc8e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations
@@ -1,7 +1,7 @@
--906026927,     1.0__initial.sql
-936644233,      1.1.sql
+1833930558,     1.0__initial.sql
+84224587,       1.1.sql
 -848622216,     1.2__dropsFor_1.1.sql
-781720387,      1.3.sql
--972999284,     1.4__dropsFor_1.3.sql
+19356381,       1.3.sql
+1661935263,     1.4__dropsFor_1.3.sql
 861001272,      R__order_views_hsqldb.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql
index be0dfa028..f9b1b3f43 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql
@@ -151,6 +151,7 @@ create table `table` (
   `to`                          varchar(255),
   `varchar`                     varchar(255),
   `foreign`                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique (`to`),
   constraint uq_table_varchar unique (`varchar`),
   constraint pk_table primary key (`index`)
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.1.sql
index 1f6356a45..4213de18e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.1.sql
@@ -44,7 +44,9 @@ SET @@system_versioning_alter_history = 1;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table `table` modify textfield varchar(255);
 alter table `table` add column `select` varchar(255);
+alter table `table` add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -108,3 +110,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on `table` (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql
index fc633abc6..6fd34becb 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql
@@ -13,6 +13,7 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
+drop index ix_table_textfield2 on `table`;
 -- apply changes
 create table `migtest_QuOtEd` (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.4__dropsFor_1.3.sql
index b15ac579e..2f4425f31 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.4__dropsFor_1.3.sql
@@ -2,6 +2,8 @@
 -- apply changes
 SET @@system_versioning_alter_history = 1;
 -- apply alter tables
+alter table `table` drop column textfield;
+alter table `table` drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
index d56859c0a..98022f4e3 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations
@@ -1,7 +1,7 @@
-168258180,      1.0__initial.sql
-1552926718,     1.1.sql
+-2111548334,    1.0__initial.sql
+-1101751768,    1.1.sql
 919151678,      1.2__dropsFor_1.1.sql
--1031408459,    1.3.sql
--446860935,     1.4__dropsFor_1.3.sql
+-1572621686,    1.3.sql
+1686135364,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql
index be0dfa028..f9b1b3f43 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql
@@ -151,6 +151,7 @@ create table `table` (
   `to`                          varchar(255),
   `varchar`                     varchar(255),
   `foreign`                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique (`to`),
   constraint uq_table_varchar unique (`varchar`),
   constraint pk_table primary key (`index`)
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.1.sql
index 1f6356a45..4213de18e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.1.sql
@@ -44,7 +44,9 @@ SET @@system_versioning_alter_history = 1;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table `table` modify textfield varchar(255);
 alter table `table` add column `select` varchar(255);
+alter table `table` add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -108,3 +110,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on `table` (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql
index fc633abc6..6fd34becb 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql
@@ -13,6 +13,7 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
+drop index ix_table_textfield2 on `table`;
 -- apply changes
 create table `migtest_QuOtEd` (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.4__dropsFor_1.3.sql
index abd31f737..cbc989b87 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.4__dropsFor_1.3.sql
@@ -2,6 +2,8 @@
 -- apply changes
 SET @@system_versioning_alter_history = 1;
 -- apply alter tables
+CALL usp_ebean_drop_column('table', 'textfield');
+CALL usp_ebean_drop_column('table', 'textfield2');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'one_key');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'two_key');
 CALL usp_ebean_drop_column('migtest_ckey_parent', 'assoc_id');
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/I__create_procs.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/I__create_procs.sql
index d13ec2708..1dd943f65 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/I__create_procs.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/I__create_procs.sql
@@ -22,7 +22,7 @@ FETCH curs INTO c_fk_name;
 IF done THEN
 LEAVE read_loop;
 END IF;
-SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP FOREIGN KEY ', c_fk_name);
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 END LOOP;
@@ -41,7 +41,7 @@ delimiter $$
 CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
 BEGIN
 CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
-SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP COLUMN `', p_column_name, '`');
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 END
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations
index 062f003bd..9b6cb159a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations
@@ -1,8 +1,8 @@
-1835064798,     I__create_procs.sql
-168258180,      1.0__initial.sql
-1552926718,     1.1.sql
+-1933396282,    I__create_procs.sql
+-2111548334,    1.0__initial.sql
+-1101751768,    1.1.sql
 1187950993,     1.2__dropsFor_1.1.sql
--1031408459,    1.3.sql
--692020559,     1.4__dropsFor_1.3.sql
+-1572621686,    1.3.sql
+772508824,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
index c58d005d9..b0d93151a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
@@ -112,6 +112,7 @@
             <column name="&quot;to&quot;" type="varchar"/>
             <column name="&quot;varchar&quot;" type="varchar"/>
             <column name="&quot;foreign&quot;" type="varchar" references="&quot;table&quot;.&quot;index&quot;" foreignKeyName="fk_table_foreign" foreignKeyIndex="ix_table_foreign"/>
+            <column name="textfield" type="varchar" notnull="true"/>
             <uniqueConstraint name="uq_table_to" columnNames="&quot;to&quot;" oneToOne="false" nullableColumns="&quot;to&quot;"/>
             <uniqueConstraint name="uq_table_varchar" columnNames="&quot;varchar&quot;" oneToOne="false" nullableColumns="&quot;varchar&quot;"/>
         </createTable>
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml
index 27bfee165..1c704408c 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml
@@ -73,8 +73,10 @@
             <column name="deleted" type="boolean" defaultValue="false" notnull="true"/>
         </addColumn>
         <alterColumn columnName="&quot;index&quot;" tableName="&quot;table&quot;" withHistory="true" comment="this is an other comment"/>
+        <alterColumn columnName="textfield" tableName="&quot;table&quot;" withHistory="true" currentType="varchar" notnull="false" currentNotnull="true"/>
         <addColumn tableName="&quot;table&quot;" withHistory="true">
             <column name="&quot;select&quot;" type="varchar"/>
+            <column name="textfield2" type="varchar"/>
         </addColumn>
         <addUniqueConstraint constraintName="uq_table_select" tableName="&quot;table&quot;" columnNames="&quot;select&quot;" oneToOne="false" nullableColumns="&quot;select&quot;"/>
         <createTable name="migtest_e_user" pkName="pk_migtest_e_user">
@@ -103,6 +105,7 @@
         </addColumn>
         <createIndex indexName="ix_migtest_e_basic_indextest3" tableName="migtest_e_basic" columns="indextest3"/>
         <createIndex indexName="ix_migtest_e_basic_indextest6" tableName="migtest_e_basic" columns="indextest6"/>
+        <createIndex indexName="ix_table_textfield2" tableName="&quot;table&quot;" columns="textfield2"/>
         <createIndex indexName="ix_migtest_oto_child_name" tableName="migtest_oto_child" columns="name" platforms="POSTGRES"/>
         <dropIndex indexName="ix_migtest_e_basic_indextest1" tableName="migtest_e_basic"/>
         <dropIndex indexName="ix_migtest_e_basic_indextest5" tableName="migtest_e_basic"/>
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml
index ca95c8f6d..8aac45e36 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml
@@ -61,6 +61,7 @@
         <createIndex indexName="ix_migtest_oto_master_lowername" tableName="migtest_oto_master" columns="lower(name)" unique="true" platforms="POSTGRES"/>
         <dropIndex indexName="ix_migtest_e_basic_indextest3" tableName="migtest_e_basic"/>
         <dropIndex indexName="ix_migtest_e_basic_indextest6" tableName="migtest_e_basic"/>
+        <dropIndex indexName="ix_table_textfield2" tableName="&quot;table&quot;"/>
     </changeSet>
     <changeSet type="pendingDrops">
         <dropColumn columnName="one_key" tableName="migtest_ckey_detail"/>
@@ -77,6 +78,8 @@
         <dropColumn columnName="new_column" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_boolean" tableName="migtest_e_history5" withHistory="true"/>
         <dropColumn columnName="deleted" tableName="migtest_e_softdelete"/>
+        <dropColumn columnName="textfield" tableName="&quot;table&quot;" withHistory="true"/>
+        <dropColumn columnName="textfield2" tableName="&quot;table&quot;" withHistory="true"/>
         <dropColumn columnName="master_id" tableName="migtest_oto_child"/>
         <dropTable name="migtest_e_user" sequenceCol="id"/>
         <dropTable name="migtest_mtm_c_migtest_mtm_m"/>
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.4__dropsFor_1.3.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.4__dropsFor_1.3.model.xml
index 19dce6648..a18446b1a 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.4__dropsFor_1.3.model.xml
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.4__dropsFor_1.3.model.xml
@@ -15,6 +15,8 @@
         <dropColumn columnName="new_column" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="test_boolean" tableName="migtest_e_history5" withHistory="true"/>
         <dropColumn columnName="deleted" tableName="migtest_e_softdelete"/>
+        <dropColumn columnName="textfield" tableName="&quot;table&quot;" withHistory="true"/>
+        <dropColumn columnName="textfield2" tableName="&quot;table&quot;" withHistory="true"/>
         <dropColumn columnName="master_id" tableName="migtest_oto_child"/>
         <dropTable name="migtest_e_user" sequenceCol="id"/>
         <dropTable name="migtest_mtm_c_migtest_mtm_m"/>
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql
index dd9c89e5c..f2eb08f85 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql
@@ -151,6 +151,7 @@ create table `table` (
   `to`                          varchar(255),
   `varchar`                     varchar(255),
   `foreign`                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique (`to`),
   constraint uq_table_varchar unique (`varchar`),
   constraint pk_table primary key (`index`)
@@ -298,6 +299,7 @@ create table table_history(
   `to`                          varchar(255),
   `varchar`                     varchar(255),
   `foreign`                     varchar(255),
+  textfield                     varchar(255),
   sys_period_start              datetime(6),
   sys_period_end                datetime(6)
 );
@@ -305,12 +307,12 @@ create view table_with_history as select * from `table` union all select * from
 lock tables `table` write;
 delimiter $$
 create trigger table_history_upd before update on `table` for each row begin
-    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`foreign`);
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `foreign`, textfield) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`foreign`, OLD.textfield);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger table_history_del before delete on `table` for each row begin
-    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`foreign`);
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `foreign`, textfield) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`foreign`, OLD.textfield);
 end$$
 unlock tables;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql
index ea2513195..2b8461633 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql
@@ -61,7 +61,9 @@ drop trigger table_history_upd;
 drop trigger table_history_del;
 drop view table_with_history;
 -- apply alter tables
+alter table `table` modify textfield varchar(255);
 alter table `table` add column `select` varchar(255);
+alter table `table` add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -93,7 +95,9 @@ alter table migtest_e_history6 modify test_number2 integer;
 alter table migtest_e_history6_history modify test_number2 integer;
 alter table migtest_e_softdelete add column deleted tinyint(1) default 0 not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history modify textfield varchar(255);
 alter table table_history add column `select` varchar(255);
+alter table table_history add column textfield2 varchar(255);
 -- apply post alter
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
 update migtest_e_basic set new_boolean_field = old_boolean;
@@ -186,12 +190,12 @@ create view table_with_history as select * from `table` union all select * from
 lock tables `table` write;
 delimiter $$
 create trigger table_history_upd before update on `table` for each row begin
-    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`);
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`, textfield, textfield2) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`, OLD.textfield, OLD.textfield2);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger table_history_del before delete on `table` for each row begin
-    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`);
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`, textfield, textfield2) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`, OLD.textfield, OLD.textfield2);
 end$$
 unlock tables;
 alter table `table` add constraint uq_table_select unique  (`select`);
@@ -224,3 +228,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on `table` (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql
index 59325f7c9..410f3e719 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql
@@ -13,6 +13,7 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
+drop index ix_table_textfield2 on `table`;
 -- apply changes
 create table `migtest_QuOtEd` (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.4__dropsFor_1.3.sql
index 0cde3c7b2..f98131f6f 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.4__dropsFor_1.3.sql
@@ -12,7 +12,12 @@ drop view migtest_e_history2_with_history;
 drop trigger migtest_e_history5_history_upd;
 drop trigger migtest_e_history5_history_del;
 drop view migtest_e_history5_with_history;
+drop trigger table_history_upd;
+drop trigger table_history_del;
+drop view table_with_history;
 -- apply alter tables
+CALL usp_ebean_drop_column('table', 'textfield');
+CALL usp_ebean_drop_column('table', 'textfield2');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'one_key');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'two_key');
 CALL usp_ebean_drop_column('migtest_ckey_parent', 'assoc_id');
@@ -33,6 +38,8 @@ CALL usp_ebean_drop_column('migtest_e_history5', 'test_boolean');
 CALL usp_ebean_drop_column('migtest_e_history5_history', 'test_boolean');
 CALL usp_ebean_drop_column('migtest_e_softdelete', 'deleted');
 CALL usp_ebean_drop_column('migtest_oto_child', 'master_id');
+CALL usp_ebean_drop_column('table_history', 'textfield');
+CALL usp_ebean_drop_column('table_history', 'textfield2');
 -- apply post alter
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 lock tables migtest_e_history2 write;
@@ -58,6 +65,18 @@ create trigger migtest_e_history5_history_del before delete on migtest_e_history
     insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
 end$$
 unlock tables;
+create view table_with_history as select * from `table` union all select * from table_history;
+lock tables `table` write;
+delimiter $$
+create trigger table_history_upd before update on `table` for each row begin
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger table_history_del before delete on `table` for each row begin
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`);
+end$$
+unlock tables;
 drop table if exists migtest_e_user;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
 drop table if exists migtest_mtm_m_migtest_mtm_c;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/I__create_procs.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/I__create_procs.sql
index d13ec2708..1dd943f65 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/I__create_procs.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/I__create_procs.sql
@@ -22,7 +22,7 @@ FETCH curs INTO c_fk_name;
 IF done THEN
 LEAVE read_loop;
 END IF;
-SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP FOREIGN KEY ', c_fk_name);
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 END LOOP;
@@ -41,7 +41,7 @@ delimiter $$
 CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
 BEGIN
 CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
-SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP COLUMN `', p_column_name, '`');
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 END
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations
index 95bc6e4eb..adf927e95 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations
@@ -1,8 +1,8 @@
-1835064798,     I__create_procs.sql
-776107385,      1.0__initial.sql
--1234435534,    1.1.sql
+-1933396282,    I__create_procs.sql
+1980830787,     1.0__initial.sql
+-92753611,      1.1.sql
 -1097227916,    1.2__dropsFor_1.1.sql
--1972055805,    1.3.sql
-379252952,      1.4__dropsFor_1.3.sql
+1674664705,     1.3.sql
+-1282113429,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql
index 47f10a181..b1db29fc1 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql
@@ -151,6 +151,7 @@ create table `table` (
   `to`                          varchar(255),
   `varchar`                     varchar(255),
   `foreign`                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique (`to`),
   constraint uq_table_varchar unique (`varchar`),
   constraint pk_table primary key (`index`)
@@ -298,6 +299,7 @@ create table table_history(
   `to`                          varchar(255),
   `varchar`                     varchar(255),
   `foreign`                     varchar(255),
+  textfield                     varchar(255),
   sys_period_start              datetime(6),
   sys_period_end                datetime(6)
 );
@@ -305,12 +307,12 @@ create view table_with_history as select * from `table` union all select * from
 lock tables `table` write;
 delimiter $$
 create trigger table_history_upd before update on `table` for each row begin
-    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`foreign`);
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `foreign`, textfield) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`foreign`, OLD.textfield);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger table_history_del before delete on `table` for each row begin
-    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`foreign`);
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `foreign`, textfield) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`foreign`, OLD.textfield);
 end$$
 unlock tables;
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql
index ea2513195..2b8461633 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql
@@ -61,7 +61,9 @@ drop trigger table_history_upd;
 drop trigger table_history_del;
 drop view table_with_history;
 -- apply alter tables
+alter table `table` modify textfield varchar(255);
 alter table `table` add column `select` varchar(255);
+alter table `table` add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -93,7 +95,9 @@ alter table migtest_e_history6 modify test_number2 integer;
 alter table migtest_e_history6_history modify test_number2 integer;
 alter table migtest_e_softdelete add column deleted tinyint(1) default 0 not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history modify textfield varchar(255);
 alter table table_history add column `select` varchar(255);
+alter table table_history add column textfield2 varchar(255);
 -- apply post alter
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
 update migtest_e_basic set new_boolean_field = old_boolean;
@@ -186,12 +190,12 @@ create view table_with_history as select * from `table` union all select * from
 lock tables `table` write;
 delimiter $$
 create trigger table_history_upd before update on `table` for each row begin
-    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`);
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`, textfield, textfield2) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`, OLD.textfield, OLD.textfield2);
     set NEW.sys_period_start = now(6);
 end$$
 delimiter $$
 create trigger table_history_del before delete on `table` for each row begin
-    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`);
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`, textfield, textfield2) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`, OLD.textfield, OLD.textfield2);
 end$$
 unlock tables;
 alter table `table` add constraint uq_table_select unique  (`select`);
@@ -224,3 +228,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on `table` (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql
index 59325f7c9..410f3e719 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql
@@ -13,6 +13,7 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
+drop index ix_table_textfield2 on `table`;
 -- apply changes
 create table `migtest_QuOtEd` (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.4__dropsFor_1.3.sql
index 0cde3c7b2..f98131f6f 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.4__dropsFor_1.3.sql
@@ -12,7 +12,12 @@ drop view migtest_e_history2_with_history;
 drop trigger migtest_e_history5_history_upd;
 drop trigger migtest_e_history5_history_del;
 drop view migtest_e_history5_with_history;
+drop trigger table_history_upd;
+drop trigger table_history_del;
+drop view table_with_history;
 -- apply alter tables
+CALL usp_ebean_drop_column('table', 'textfield');
+CALL usp_ebean_drop_column('table', 'textfield2');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'one_key');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'two_key');
 CALL usp_ebean_drop_column('migtest_ckey_parent', 'assoc_id');
@@ -33,6 +38,8 @@ CALL usp_ebean_drop_column('migtest_e_history5', 'test_boolean');
 CALL usp_ebean_drop_column('migtest_e_history5_history', 'test_boolean');
 CALL usp_ebean_drop_column('migtest_e_softdelete', 'deleted');
 CALL usp_ebean_drop_column('migtest_oto_child', 'master_id');
+CALL usp_ebean_drop_column('table_history', 'textfield');
+CALL usp_ebean_drop_column('table_history', 'textfield2');
 -- apply post alter
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 lock tables migtest_e_history2 write;
@@ -58,6 +65,18 @@ create trigger migtest_e_history5_history_del before delete on migtest_e_history
     insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number);
 end$$
 unlock tables;
+create view table_with_history as select * from `table` union all select * from table_history;
+lock tables `table` write;
+delimiter $$
+create trigger table_history_upd before update on `table` for each row begin
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`);
+    set NEW.sys_period_start = now(6);
+end$$
+delimiter $$
+create trigger table_history_del before delete on `table` for each row begin
+    insert into table_history (sys_period_start,sys_period_end,`index`, `from`, `to`, `varchar`, `select`, `foreign`) values (OLD.sys_period_start, now(6),OLD.`index`, OLD.`from`, OLD.`to`, OLD.`varchar`, OLD.`select`, OLD.`foreign`);
+end$$
+unlock tables;
 drop table if exists migtest_e_user;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
 drop table if exists migtest_mtm_m_migtest_mtm_c;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/I__create_procs.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/I__create_procs.sql
index d13ec2708..1dd943f65 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/I__create_procs.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/I__create_procs.sql
@@ -22,7 +22,7 @@ FETCH curs INTO c_fk_name;
 IF done THEN
 LEAVE read_loop;
 END IF;
-SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name);
+SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP FOREIGN KEY ', c_fk_name);
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 END LOOP;
@@ -41,7 +41,7 @@ delimiter $$
 CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
 BEGIN
 CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
-SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name);
+SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP COLUMN `', p_column_name, '`');
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 END
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations
index 29cc0fd02..bbf93e18d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations
@@ -1,8 +1,8 @@
-1835064798,     I__create_procs.sql
--1717521141,    1.0__initial.sql
--1234435534,    1.1.sql
+-1933396282,    I__create_procs.sql
+369577572,      1.0__initial.sql
+-92753611,      1.1.sql
 -1097227916,    1.2__dropsFor_1.1.sql
--1972055805,    1.3.sql
-379252952,      1.4__dropsFor_1.3.sql
+1674664705,     1.3.sql
+-1282113429,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql
index 02cb7f494..b5d81c5bd 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
@@ -313,6 +314,7 @@ create table table_history(
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255),
   sys_period_start              datetime(6),
   sys_period_end                datetime(6)
 );
@@ -320,13 +322,13 @@ create view table_with_history as select * from "table" union all select * from
 delimiter $$
 create or replace trigger table_history_upd for "table" before update for each row as 
     NEW.sys_period_start = greatest(current_timestamp, date_add(OLD.sys_period_start, interval 1 microsecond));
-    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "foreign") values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign");
+    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "foreign", textfield) values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign", OLD.textfield);
 end_trigger;
 $$
 
 delimiter $$
 create or replace trigger table_history_del for "table" before delete for each row as
-    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "foreign") values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign");
+    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "foreign", textfield) values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign", OLD.textfield);
 end_trigger;
 $$
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.1.sql
index 2261591dd..31cdd3756 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.1.sql
@@ -64,7 +64,9 @@ drop trigger table_history_upd;
 drop trigger table_history_del;
 drop view table_with_history;
 -- apply alter tables
+alter table "table" alter column textfield set null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -102,7 +104,9 @@ alter table migtest_e_history6 alter column test_number2 set null;
 alter table migtest_e_history6_history alter column test_number2 set null;
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history alter column textfield set null;
 alter table table_history add column "select" varchar(255);
+alter table table_history add column textfield2 varchar(255);
 -- apply post alter
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
@@ -208,13 +212,13 @@ create view table_with_history as select * from "table" union all select * from
 delimiter $$
 create or replace trigger table_history_upd for "table" before update for each row as 
     NEW.sys_period_start = greatest(current_timestamp, date_add(OLD.sys_period_start, interval 1 microsecond));
-    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "select", "foreign") values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "select", "foreign", textfield, textfield2) values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign", OLD.textfield, OLD.textfield2);
 end_trigger;
 $$
 
 delimiter $$
 create or replace trigger table_history_del for "table" before delete for each row as
-    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "select", "foreign") values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "select", "foreign", textfield, textfield2) values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign", OLD.textfield, OLD.textfield2);
 end_trigger;
 $$
 
@@ -248,3 +252,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql
index 53837ffc5..ca422f7c7 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql
@@ -16,6 +16,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.4__dropsFor_1.3.sql
index feeb1d7cf..257fb38bd 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.4__dropsFor_1.3.sql
@@ -12,7 +12,12 @@ drop view migtest_e_history2_with_history;
 drop trigger migtest_e_history5_history_upd;
 drop trigger migtest_e_history5_history_del;
 drop view migtest_e_history5_with_history;
+drop trigger table_history_upd;
+drop trigger table_history_del;
+drop view table_with_history;
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
@@ -33,6 +38,8 @@ alter table migtest_e_history5 drop column test_boolean;
 alter table migtest_e_history5_history drop column test_boolean;
 alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
+alter table table_history drop column textfield;
+alter table table_history drop column textfield2;
 -- apply post alter
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 delimiter $$
@@ -62,6 +69,20 @@ create or replace trigger migtest_e_history5_history_del for migtest_e_history5
 end_trigger;
 $$
 
+create view table_with_history as select * from "table" union all select * from table_history;
+delimiter $$
+create or replace trigger table_history_upd for "table" before update for each row as 
+    NEW.sys_period_start = greatest(current_timestamp, date_add(OLD.sys_period_start, interval 1 microsecond));
+    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "select", "foreign") values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+end_trigger;
+$$
+
+delimiter $$
+create or replace trigger table_history_del for "table" before delete for each row as
+    insert into table_history (sys_period_start,sys_period_end,"index", "from", "to", "varchar", "select", "foreign") values (OLD.sys_period_start, NEW.sys_period_start,OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+end_trigger;
+$$
+
 drop table if exists migtest_e_user;
 drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
index 3a4cbeb55..1342d6508 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations
@@ -1,7 +1,7 @@
--355978970,     1.0__initial.sql
--667611059,     1.1.sql
+390216918,      1.0__initial.sql
+-2079708895,    1.1.sql
 1530685455,     1.2__dropsFor_1.1.sql
-1263834751,     1.3.sql
--1189704269,    1.4__dropsFor_1.3.sql
+73983167,       1.3.sql
+-1118858496,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql
index ced9cf2cd..4b2f1f9a5 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar2(255),
   "varchar"                     varchar2(255),
   "foreign"                     varchar2(255),
+  textfield                     varchar2(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql
index f67704c3e..f78c04b78 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql
@@ -91,7 +91,9 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table "table" modify textfield null;
 alter table "table" add "select" varchar2(255);
+alter table "table" add textfield2 varchar2(255);
 alter table migtest_ckey_detail add one_key number(10);
 alter table migtest_ckey_detail add two_key varchar2(127);
 alter table migtest_ckey_parent add assoc_id number(10);
@@ -164,3 +166,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql
index 14204acde..ada955aab 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql
@@ -88,6 +88,7 @@ end;
 $$;
 drop index ix_migtest_e_basic_indextest3;
 drop index ix_migtest_e_basic_indextest6;
+drop index ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar2(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.4__dropsFor_1.3.sql
index 38e77cae7..57b6f9a7e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.4__dropsFor_1.3.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations
index cf60af39b..160b8b601 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations
@@ -1,8 +1,8 @@
-1374133214,     1.0__initial.sql
--2091161947,    1.1.sql
+1757923548,     1.0__initial.sql
+740264587,      1.1.sql
 930172034,      1.2__dropsFor_1.1.sql
--1621367223,    1.3.sql
-663051206,      1.4__dropsFor_1.3.sql
+-1896525025,    1.3.sql
+2037899598,     1.4__dropsFor_1.3.sql
 1357801733,     R__oracle_only_views.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql
index aeb4dc5a7..bfbc238c4 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql
@@ -174,6 +174,7 @@ create table "table" (
   "to"                          varchar2(255),
   "varchar"                     varchar2(255),
   "foreign"                     varchar2(255),
+  textfield                     varchar2(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.1.sql
index 9088fa48b..7a24eef36 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.1.sql
@@ -92,7 +92,9 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table "table" modify textfield null;
 alter table "table" add "select" varchar2(255);
+alter table "table" add textfield2 varchar2(255);
 alter table migtest_ckey_detail add one_key number(10);
 alter table migtest_ckey_detail add two_key varchar2(127);
 alter table migtest_ckey_parent add assoc_id number(10);
@@ -165,3 +167,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql
index 97091b812..60e60243b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql
@@ -88,6 +88,7 @@ end;
 $$;
 drop index ix_migtest_e_basic_indextest3;
 drop index ix_migtest_e_basic_indextest6;
+drop index ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar2(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.4__dropsFor_1.3.sql
index 38e77cae7..57b6f9a7e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.4__dropsFor_1.3.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
index d50ab5194..3095da37b 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations
@@ -1,8 +1,8 @@
-1070168506,     1.0__initial.sql
--1116696749,    1.1.sql
+-1422254768,    1.0__initial.sql
+-123689547,     1.1.sql
 930172034,      1.2__dropsFor_1.1.sql
--144959080,     1.3.sql
-663051206,      1.4__dropsFor_1.3.sql
+1967473644,     1.3.sql
+2037899598,     1.4__dropsFor_1.3.sql
 1357801733,     R__oracle_only_views.sql
 561281075,      R__order_views.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql
index 1fc2b0f70..766e79bca 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
@@ -329,11 +330,11 @@ begin
   lowerTs = lower(OLD.sys_period);
   upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign", textfield) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign", OLD.textfield);
     NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign", textfield) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign", OLD.textfield);
     return old;
   end if;
 end;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql
index 43517b9ee..4bdf82afc 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql
@@ -75,7 +75,9 @@ drop function if exists table_history_version();
 
 drop view table_with_history;
 -- apply alter tables
+alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -112,7 +114,9 @@ alter table migtest_e_history6 alter column test_number2 drop not null;
 alter table migtest_e_history6_history alter column test_number2 drop not null;
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history alter column textfield drop not null;
 alter table table_history add column "select" varchar(255);
+alter table table_history add column textfield2 varchar(255);
 -- apply post alter
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
@@ -275,11 +279,11 @@ begin
   lowerTs = lower(OLD.sys_period);
   upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign", textfield, textfield2) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign", OLD.textfield, OLD.textfield2);
     NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign", textfield, textfield2) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign", OLD.textfield, OLD.textfield2);
     return old;
   end if;
 end;
@@ -319,4 +323,5 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index if not exists ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index if not exists ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index if not exists ix_table_textfield2 on "table" (textfield2);
 create index if not exists ix_migtest_oto_child_name on migtest_oto_child (name);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql
index 585f3ffb6..e024c1aa3 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql
@@ -16,6 +16,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.4__dropsFor_1.3.sql
index 822e9f61a..abf1cd14d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.4__dropsFor_1.3.sql
@@ -15,7 +15,13 @@ drop trigger if exists migtest_e_history5_history_upd on migtest_e_history5 casc
 drop function if exists migtest_e_history5_history_version();
 
 drop view migtest_e_history5_with_history;
+drop trigger if exists table_history_upd on "table" cascade;
+drop function if exists table_history_version();
+
+drop view table_with_history;
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
@@ -35,6 +41,8 @@ alter table migtest_e_history5 drop column test_boolean;
 alter table migtest_e_history5_history drop column test_boolean;
 alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
+alter table table_history drop column textfield;
+alter table table_history drop column textfield2;
 -- apply post alter
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 create or replace function migtest_e_history2_history_version() returns trigger as $$
@@ -82,6 +90,29 @@ create trigger migtest_e_history5_history_upd
   before update or delete on migtest_e_history5
   for each row execute procedure migtest_e_history5_history_version();
 
+create view table_with_history as select * from "table" union all select * from table_history;
+create or replace function table_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
+begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
+  if (TG_OP = 'UPDATE') then
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    NEW.sys_period = tstzrange(upperTs,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger table_history_upd
+  before update or delete on "table"
+  for each row execute procedure table_history_version();
+
 drop table if exists migtest_e_user cascade;
 drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m cascade;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations
index 1ef12b383..06ebb0b61 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations
@@ -1,8 +1,8 @@
-2094204208,     1.0__initial.sql
--1092950076,    1.1.sql
+-769462329,     1.0__initial.sql
+409812555,      1.1.sql
 -261111052,     1.2__dropsFor_1.1.sql
-1335621453,     1.3.sql
-1729345905,     1.4__dropsFor_1.3.sql
+1214144459,     1.3.sql
+-709144111,     1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
 561281075,      R__order_views.sql
 283077354,      R__pg_indexes.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql
index a9869f95b..21fa13691 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
@@ -329,11 +330,11 @@ begin
   lowerTs = lower(OLD.sys_period);
   upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign", textfield) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign", OLD.textfield);
     NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign", textfield) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign", OLD.textfield);
     return old;
   end if;
 end;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.1.sql
index aaa3fd79b..4cf767c51 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.1.sql
@@ -75,7 +75,9 @@ drop function if exists table_history_version();
 
 drop view table_with_history;
 -- apply alter tables
+alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -112,7 +114,9 @@ alter table migtest_e_history6 alter column test_number2 drop not null;
 alter table migtest_e_history6_history alter column test_number2 drop not null;
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history alter column textfield drop not null;
 alter table table_history add column "select" varchar(255);
+alter table table_history add column textfield2 varchar(255);
 -- apply post alter
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
@@ -275,11 +279,11 @@ begin
   lowerTs = lower(OLD.sys_period);
   upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign", textfield, textfield2) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign", OLD.textfield, OLD.textfield2);
     NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign", textfield, textfield2) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign", OLD.textfield, OLD.textfield2);
     return old;
   end if;
 end;
@@ -319,4 +323,5 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index if not exists ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index if not exists ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index if not exists ix_table_textfield2 on "table" (textfield2);
 create index if not exists ix_migtest_oto_child_name on migtest_oto_child (name);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql
index 401b5a211..eba9fb564 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql
@@ -16,6 +16,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.4__dropsFor_1.3.sql
index 822e9f61a..abf1cd14d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.4__dropsFor_1.3.sql
@@ -15,7 +15,13 @@ drop trigger if exists migtest_e_history5_history_upd on migtest_e_history5 casc
 drop function if exists migtest_e_history5_history_version();
 
 drop view migtest_e_history5_with_history;
+drop trigger if exists table_history_upd on "table" cascade;
+drop function if exists table_history_version();
+
+drop view table_with_history;
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
@@ -35,6 +41,8 @@ alter table migtest_e_history5 drop column test_boolean;
 alter table migtest_e_history5_history drop column test_boolean;
 alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
+alter table table_history drop column textfield;
+alter table table_history drop column textfield2;
 -- apply post alter
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 create or replace function migtest_e_history2_history_version() returns trigger as $$
@@ -82,6 +90,29 @@ create trigger migtest_e_history5_history_upd
   before update or delete on migtest_e_history5
   for each row execute procedure migtest_e_history5_history_version();
 
+create view table_with_history as select * from "table" union all select * from table_history;
+create or replace function table_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
+begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
+  if (TG_OP = 'UPDATE') then
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    NEW.sys_period = tstzrange(upperTs,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger table_history_upd
+  before update or delete on "table"
+  for each row execute procedure table_history_version();
+
 drop table if exists migtest_e_user cascade;
 drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m cascade;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
index 8c262040d..5136723e3 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations
@@ -1,8 +1,8 @@
--231429368,     1.0__initial.sql
-1978065929,     1.1.sql
+-309942302,     1.0__initial.sql
+2116598611,     1.1.sql
 -261111052,     1.2__dropsFor_1.1.sql
--893728811,     1.3.sql
-1729345905,     1.4__dropsFor_1.3.sql
+-388526579,     1.3.sql
+-709144111,     1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
 561281075,      R__order_views.sql
 283077354,      R__pg_indexes.sql
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql
index 6f14a9835..3d79a3500 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.1.sql
index 86c17934e..f6c2af545 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.1.sql
@@ -46,7 +46,9 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+alter table "table" alter column textfield set null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -119,3 +121,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql
index e028819d5..88a290c0f 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql
@@ -16,6 +16,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.4__dropsFor_1.3.sql
index b4087d6d6..b7d11cb4d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.4__dropsFor_1.3.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
index d402eabae..5c3f07503 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations
@@ -1,6 +1,6 @@
-736698620,      1.0__initial.sql
--1254905907,    1.1.sql
+-951189503,     1.0__initial.sql
+128425002,      1.1.sql
 688811494,      1.2__dropsFor_1.1.sql
--2020328769,    1.3.sql
-80209848,       1.4__dropsFor_1.3.sql
+-519291959,     1.3.sql
+255653518,      1.4__dropsFor_1.3.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql
index 0c2e27345..bfd05a961 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql
@@ -159,6 +159,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index"),
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql
index 28efd29ab..3c93d203c 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql
@@ -51,7 +51,9 @@ update migtest_e_history2 set test_string = 'unknown' where test_string is null;
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- apply alter tables
+-- not supported: alter table "table" alter column textfield set null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -105,3 +107,4 @@ create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id);
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql
index 01458d882..791293355 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql
@@ -16,6 +16,7 @@
 -- not supported: alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.4__dropsFor_1.3.sql
index b4087d6d6..b7d11cb4d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.4__dropsFor_1.3.sql
@@ -1,5 +1,7 @@
 -- Migrationscripts for ebean unittest
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations
index 56cae1ad7..6fa5eb1cb 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations
@@ -1,7 +1,7 @@
-346470730,      1.0__initial.sql
-35635339,       1.1.sql
+-1527127682,    1.0__initial.sql
+1828386122,     1.1.sql
 688811494,      1.2__dropsFor_1.1.sql
-1092030960,     1.3.sql
-80209848,       1.4__dropsFor_1.3.sql
+536935117,      1.3.sql
+255653518,      1.4__dropsFor_1.3.sql
 2034589659,     R__order_views_sqlite.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql
index 756c7bce8..b57f44881 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql
@@ -152,6 +152,7 @@ create table [table] (
   [to]                          varchar(255),
   [varchar]                     varchar(255),
   [foreign]                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint pk_table primary key ([index])
 );
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.1.sql
index a2de5c9f5..015546583 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.1.sql
@@ -66,7 +66,9 @@ update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- history migration goes here
 -- alter table [table] set (system_versioning = on (history_table=dbo.table_history));
 -- apply alter tables
+alter table [table] alter column textfield varchar(255);
 alter table [table] add [select] varchar(255);
+alter table [table] add textfield2 varchar(255);
 alter table migtest_ckey_detail add one_key integer;
 alter table migtest_ckey_detail add two_key varchar(127);
 alter table migtest_ckey_parent add assoc_id integer;
@@ -143,3 +145,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on [table] (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql
index 7802b1395..cdbfa5810 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql
@@ -21,6 +21,7 @@ IF OBJECT_ID('uq_migtest_e_basic_indextest5', 'UQ') IS NOT NULL alter table migt
 IF OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest3') drop index ix_migtest_e_basic_indextest3 ON migtest_e_basic;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest6') drop index ix_migtest_e_basic_indextest6 ON migtest_e_basic;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('"table"','U') AND name = 'ix_table_textfield2') drop index ix_table_textfield2 ON "table";
 -- apply changes
 create table [migtest_QuOtEd] (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.4__dropsFor_1.3.sql
index 00b08667c..feeefad50 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.4__dropsFor_1.3.sql
@@ -10,7 +10,12 @@ alter table migtest_e_history drop period for system_time;
 -- alter table migtest_e_history5 set (system_versioning = off (history_table=dbo.migtest_e_history5_history));
 -- history migration goes here
 -- alter table migtest_e_history5 set (system_versioning = on (history_table=dbo.migtest_e_history5_history));
+-- alter table [table] set (system_versioning = off (history_table=dbo.table_history));
+-- history migration goes here
+-- alter table [table] set (system_versioning = on (history_table=dbo.table_history));
 -- apply alter tables
+EXEC usp_ebean_drop_column "table", textfield;
+EXEC usp_ebean_drop_column "table", textfield2;
 EXEC usp_ebean_drop_column migtest_ckey_detail, one_key;
 EXEC usp_ebean_drop_column migtest_ckey_detail, two_key;
 EXEC usp_ebean_drop_column migtest_ckey_parent, assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/I__create_procs.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/I__create_procs.sql
index 6f916bcc9..af5206c05 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/I__create_procs.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/I__create_procs.sql
@@ -33,7 +33,7 @@ BEGIN
   FETCH NEXT FROM index_cursor INTO @indexName
   WHILE @@FETCH_STATUS = 0
     BEGIN
-      set @sql = 'drop index ' + @indexName + ' on ' + @tableName;
+      set @sql = 'drop index ' + @indexName + ' on [' + @tableName + ']';
       EXECUTE(@sql);
 
       FETCH NEXT FROM index_cursor INTO @indexName
@@ -55,7 +55,7 @@ BEGIN
     join sys.columns t2 on t1.object_id = t2.default_object_id
     where t1.parent_object_id = OBJECT_ID(@tableName) and t2.name = @columnName;
 
-  if @tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
+  if @tmp is not null EXEC('alter table [' + @tableName +'] drop constraint ' + @tmp);
 END
 GO
 
@@ -82,7 +82,7 @@ BEGIN
   FETCH NEXT FROM name_cursor INTO @constraintName
   WHILE @@FETCH_STATUS = 0
     BEGIN
-      set @sql = 'alter table ' + @tableName + ' drop constraint ' + @constraintName;
+      set @sql = 'alter table [' + @tableName + '] drop constraint ' + @constraintName;
       EXECUTE(@sql);
 
       FETCH NEXT FROM name_cursor INTO @constraintName
@@ -104,7 +104,7 @@ BEGIN
   EXEC usp_ebean_drop_default_constraint @tableName, @columnName;
   EXEC usp_ebean_drop_constraints @tableName, @columnName;
 
-  set @sql = 'alter table ' + @tableName + ' drop column ' + @columnName;
+  set @sql = 'alter table [' + @tableName + '] drop column [' + @columnName + ']';
   EXECUTE(@sql);
 END
 GO
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
index d82f304dc..fb9b56a17 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations
@@ -1,8 +1,8 @@
--2122378240,    I__create_procs.sql
--1324388010,    1.0__initial.sql
-287498538,      1.1.sql
+891357544,      I__create_procs.sql
+380683504,      1.0__initial.sql
+1291465909,     1.1.sql
 -1431095657,    1.2__dropsFor_1.1.sql
--2048567958,    1.3.sql
--410961452,     1.4__dropsFor_1.3.sql
+1335479744,     1.3.sql
+-628940135,     1.4__dropsFor_1.3.sql
 1607822082,     R__order_views_mssql.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql
index caf403e9b..e241e2ea6 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql
@@ -170,6 +170,7 @@ create table [table] (
   [to]                          nvarchar(255),
   [varchar]                     nvarchar(255),
   [foreign]                     nvarchar(255),
+  textfield                     nvarchar(255) not null,
   constraint pk_table primary key ([index])
 );
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql
index e576e3db3..55dab5ea4 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql
@@ -67,7 +67,9 @@ update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
 -- history migration goes here
 -- alter table [table] set (system_versioning = on (history_table=dbo.table_history));
 -- apply alter tables
+alter table [table] alter column textfield nvarchar(255);
 alter table [table] add [select] nvarchar(255);
+alter table [table] add textfield2 nvarchar(255);
 alter table migtest_ckey_detail add one_key integer;
 alter table migtest_ckey_detail add two_key nvarchar(127);
 alter table migtest_ckey_parent add assoc_id integer;
@@ -144,3 +146,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index ix_table_textfield2 on [table] (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql
index 055b0d489..860097c2e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql
@@ -21,6 +21,7 @@ IF OBJECT_ID('uq_migtest_e_basic_indextest5', 'UQ') IS NOT NULL alter table migt
 IF OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest3') drop index ix_migtest_e_basic_indextest3 ON migtest_e_basic;
 IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest6') drop index ix_migtest_e_basic_indextest6 ON migtest_e_basic;
+IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('"table"','U') AND name = 'ix_table_textfield2') drop index ix_table_textfield2 ON "table";
 -- apply changes
 create table [migtest_QuOtEd] (
   id                            nvarchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.4__dropsFor_1.3.sql
index 00b08667c..feeefad50 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.4__dropsFor_1.3.sql
@@ -10,7 +10,12 @@ alter table migtest_e_history drop period for system_time;
 -- alter table migtest_e_history5 set (system_versioning = off (history_table=dbo.migtest_e_history5_history));
 -- history migration goes here
 -- alter table migtest_e_history5 set (system_versioning = on (history_table=dbo.migtest_e_history5_history));
+-- alter table [table] set (system_versioning = off (history_table=dbo.table_history));
+-- history migration goes here
+-- alter table [table] set (system_versioning = on (history_table=dbo.table_history));
 -- apply alter tables
+EXEC usp_ebean_drop_column "table", textfield;
+EXEC usp_ebean_drop_column "table", textfield2;
 EXEC usp_ebean_drop_column migtest_ckey_detail, one_key;
 EXEC usp_ebean_drop_column migtest_ckey_detail, two_key;
 EXEC usp_ebean_drop_column migtest_ckey_parent, assoc_id;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/I__create_procs.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/I__create_procs.sql
index 6f916bcc9..af5206c05 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/I__create_procs.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/I__create_procs.sql
@@ -33,7 +33,7 @@ BEGIN
   FETCH NEXT FROM index_cursor INTO @indexName
   WHILE @@FETCH_STATUS = 0
     BEGIN
-      set @sql = 'drop index ' + @indexName + ' on ' + @tableName;
+      set @sql = 'drop index ' + @indexName + ' on [' + @tableName + ']';
       EXECUTE(@sql);
 
       FETCH NEXT FROM index_cursor INTO @indexName
@@ -55,7 +55,7 @@ BEGIN
     join sys.columns t2 on t1.object_id = t2.default_object_id
     where t1.parent_object_id = OBJECT_ID(@tableName) and t2.name = @columnName;
 
-  if @tmp is not null EXEC('alter table ' + @tableName +' drop constraint ' + @tmp);
+  if @tmp is not null EXEC('alter table [' + @tableName +'] drop constraint ' + @tmp);
 END
 GO
 
@@ -82,7 +82,7 @@ BEGIN
   FETCH NEXT FROM name_cursor INTO @constraintName
   WHILE @@FETCH_STATUS = 0
     BEGIN
-      set @sql = 'alter table ' + @tableName + ' drop constraint ' + @constraintName;
+      set @sql = 'alter table [' + @tableName + '] drop constraint ' + @constraintName;
       EXECUTE(@sql);
 
       FETCH NEXT FROM name_cursor INTO @constraintName
@@ -104,7 +104,7 @@ BEGIN
   EXEC usp_ebean_drop_default_constraint @tableName, @columnName;
   EXEC usp_ebean_drop_constraints @tableName, @columnName;
 
-  set @sql = 'alter table ' + @tableName + ' drop column ' + @columnName;
+  set @sql = 'alter table [' + @tableName + '] drop column [' + @columnName + ']';
   EXECUTE(@sql);
 END
 GO
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations
index 019d940a0..edff6a17e 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations
@@ -1,8 +1,8 @@
--2122378240,    I__create_procs.sql
-2004279493,     1.0__initial.sql
-1649898025,     1.1.sql
+891357544,      I__create_procs.sql
+542129917,      1.0__initial.sql
+837691787,      1.1.sql
 -1431095657,    1.2__dropsFor_1.1.sql
-294205466,      1.3.sql
--410961452,     1.4__dropsFor_1.3.sql
+-545642423,     1.3.sql
+-628940135,     1.4__dropsFor_1.3.sql
 1607822082,     R__order_views_mssql.sql
 
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql
index 91c6c6fc5..c39acd1ae 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql
@@ -156,6 +156,7 @@ create table "table" (
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255) not null,
   constraint uq_table_to unique ("to"),
   constraint uq_table_varchar unique ("varchar"),
   constraint pk_table primary key ("index")
@@ -348,6 +349,7 @@ create table table_history(
   "to"                          varchar(255),
   "varchar"                     varchar(255),
   "foreign"                     varchar(255),
+  textfield                     varchar(255),
   sys_period                    tstzrange
 );
 create view table_with_history as select * from "table" union all select * from table_history;
@@ -359,11 +361,11 @@ begin
   lowerTs = lower(OLD.sys_period);
   upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign", textfield) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign", OLD.textfield);
     NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "foreign", textfield) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."foreign", OLD.textfield);
     return old;
   end if;
 end;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.1.sql
index 7d50265ea..8e13c0a20 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.1.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.1.sql
@@ -70,7 +70,9 @@ drop function if exists table_history_version();
 
 drop view table_with_history;
 -- apply alter tables
+alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
+alter table "table" add column textfield2 varchar(255);
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -107,7 +109,9 @@ alter table migtest_e_history6 alter column test_number2 drop not null;
 alter table migtest_e_history6_history alter column test_number2 drop not null;
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 alter table migtest_oto_child add column master_id bigint;
+alter table table_history alter column textfield drop not null;
 alter table table_history add column "select" varchar(255);
+alter table table_history add column textfield2 varchar(255);
 -- apply post alter
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));
 alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique  (description);
@@ -274,11 +278,11 @@ begin
   lowerTs = lower(OLD.sys_period);
   upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
   if (TG_OP = 'UPDATE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign", textfield, textfield2) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign", OLD.textfield, OLD.textfield2);
     NEW.sys_period = tstzrange(upperTs,null);
     return new;
   elsif (TG_OP = 'DELETE') then
-    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign", textfield, textfield2) values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign", OLD.textfield, OLD.textfield2);
     return old;
   end if;
 end;
@@ -318,3 +322,4 @@ alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id fore
 
 create index if not exists ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
 create index if not exists ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index if not exists ix_table_textfield2 on "table" (textfield2);
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql
index 4b04c0cbb..8665eb808 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql
@@ -16,6 +16,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
+drop index if exists ix_table_textfield2;
 -- apply changes
 create table "migtest_QuOtEd" (
   id                            varchar(255) not null,
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.4__dropsFor_1.3.sql
index 822e9f61a..abf1cd14d 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.4__dropsFor_1.3.sql
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.4__dropsFor_1.3.sql
@@ -15,7 +15,13 @@ drop trigger if exists migtest_e_history5_history_upd on migtest_e_history5 casc
 drop function if exists migtest_e_history5_history_version();
 
 drop view migtest_e_history5_with_history;
+drop trigger if exists table_history_upd on "table" cascade;
+drop function if exists table_history_version();
+
+drop view table_with_history;
 -- apply alter tables
+alter table "table" drop column textfield;
+alter table "table" drop column textfield2;
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
 alter table migtest_ckey_parent drop column assoc_id;
@@ -35,6 +41,8 @@ alter table migtest_e_history5 drop column test_boolean;
 alter table migtest_e_history5_history drop column test_boolean;
 alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
+alter table table_history drop column textfield;
+alter table table_history drop column textfield2;
 -- apply post alter
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 create or replace function migtest_e_history2_history_version() returns trigger as $$
@@ -82,6 +90,29 @@ create trigger migtest_e_history5_history_upd
   before update or delete on migtest_e_history5
   for each row execute procedure migtest_e_history5_history_version();
 
+create view table_with_history as select * from "table" union all select * from table_history;
+create or replace function table_history_version() returns trigger as $$
+declare
+  lowerTs timestamptz;
+  upperTs timestamptz;
+begin
+  lowerTs = lower(OLD.sys_period);
+  upperTs = greatest(lowerTs + '1 microsecond',current_timestamp);
+  if (TG_OP = 'UPDATE') then
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    NEW.sys_period = tstzrange(upperTs,null);
+    return new;
+  elsif (TG_OP = 'DELETE') then
+    insert into table_history (sys_period,"index", "from", "to", "varchar", "select", "foreign") values (tstzrange(lowerTs,upperTs), OLD."index", OLD."from", OLD."to", OLD."varchar", OLD."select", OLD."foreign");
+    return old;
+  end if;
+end;
+$$ LANGUAGE plpgsql;
+
+create trigger table_history_upd
+  before update or delete on "table"
+  for each row execute procedure table_history_version();
+
 drop table if exists migtest_e_user cascade;
 drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m cascade;
diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations
index 0781d38af..dd232e9a8 100644
--- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations
+++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations
@@ -1,7 +1,7 @@
-1497343697,     1.0__initial.sql
--870102763,     1.1.sql
+-1409672039,    1.0__initial.sql
+380200367,      1.1.sql
 -261111052,     1.2__dropsFor_1.1.sql
--158984239,     1.3.sql
-1729345905,     1.4__dropsFor_1.3.sql
+-2084806674,    1.3.sql
+-709144111,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

From cbd213aad375972b3c34d842bb49d731e3094100 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 5 Sep 2022 17:02:45 +1200
Subject: [PATCH 087/127] #2823 - Revert JdbcTransaction.isActive() back to be
 non-final method

---
 .../server/transaction/JdbcTransaction.java   | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
index 5d3f9c213..9fae2e21c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
@@ -424,9 +424,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public boolean isReadOnly() {
-    if (!active) {
-      throw new IllegalStateException(illegalStateMessage);
-    }
     try {
       return connection.isReadOnly();
     } catch (SQLException e) {
@@ -436,9 +433,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public void setReadOnly(boolean readOnly) {
-    if (!active) {
-      throw new IllegalStateException(illegalStateMessage);
-    }
     try {
       localReadOnly = readOnly;
       connection.setReadOnly(readOnly);
@@ -459,9 +453,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public final void setBatchMode(boolean batchMode) {
-    if (!active) {
-      throw new IllegalStateException(illegalStateMessage);
-    }
     this.batchMode = batchMode;
   }
 
@@ -472,9 +463,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
 
   @Override
   public final void setBatchOnCascade(boolean batchMode) {
-    if (!active) {
-      throw new IllegalStateException(illegalStateMessage);
-    }
     this.batchOnCascadeMode = batchMode;
   }
 
@@ -666,9 +654,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   @Override
   public final void flush() {
-    if (!active) {
-      throw new IllegalStateException(illegalStateMessage);
-    }
     internalBatchFlush();
   }
 
@@ -707,9 +692,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   @Override
   public final void setPersistenceContext(SpiPersistenceContext context) {
-    if (!active) {
-      throw new IllegalStateException(illegalStateMessage);
-    }
     this.persistenceContext = context;
   }
 
@@ -776,9 +758,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   @Override
   public Connection getInternalConnection() {
-    if (!active) {
-      throw new IllegalStateException(illegalStateMessage);
-    }
     return connection;
   }
 
@@ -1091,7 +1070,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    * Return true if the transaction is active.
    */
   @Override
-  public final boolean isActive() {
+  public boolean isActive() {
     return active;
   }
 

From 4218d5bd4837222d331ce04c6bd697b32345858a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 5 Sep 2022 17:29:36 +1200
Subject: [PATCH 088/127] Bump ebean-agent to 13.9.2 (no effective change)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3fdfe8f71..fa9ede70b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.9.1</ebean-agent.version>
-    <ebean-maven-plugin.version>13.9.1</ebean-maven-plugin.version>
+    <ebean-agent.version>13.9.2</ebean-agent.version>
+    <ebean-maven-plugin.version>13.9.2</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

From e813edae01e9eb05e3a27bcb6e71fce0b01cb196 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 5 Sep 2022 17:44:28 +1200
Subject: [PATCH 089/127] [maven-release-plugin] prepare release
 ebean-parent-13.9.2

---
 composites/ebean-clickhouse/pom.xml | 14 ++++++++-----
 composites/ebean-cockroach/pom.xml  | 14 ++++++++-----
 composites/ebean-db2/pom.xml        | 14 ++++++++-----
 composites/ebean-h2/pom.xml         | 14 ++++++++-----
 composites/ebean-hana/pom.xml       | 14 ++++++++-----
 composites/ebean-mariadb/pom.xml    | 14 ++++++++-----
 composites/ebean-mysql/pom.xml      | 14 ++++++++-----
 composites/ebean-nuodb/pom.xml      | 14 ++++++++-----
 composites/ebean-oracle/pom.xml     | 14 ++++++++-----
 composites/ebean-postgres/pom.xml   | 14 ++++++++-----
 composites/ebean-sqlite/pom.xml     | 14 ++++++++-----
 composites/ebean-sqlserver/pom.xml  | 14 ++++++++-----
 composites/ebean-yugabyte/pom.xml   | 14 ++++++++-----
 composites/ebean/pom.xml            | 16 +++++++++------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 32 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-csv-reader/pom.xml            |  8 ++++----
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 12 +++++------
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 ++++++++++++++++-------------
 platforms/clickhouse/pom.xml        |  8 ++++++--
 platforms/db2/pom.xml               |  8 ++++++--
 platforms/h2/pom.xml                |  8 ++++++--
 platforms/hana/pom.xml              |  8 ++++++--
 platforms/hsqldb/pom.xml            |  8 ++++++--
 platforms/mariadb/pom.xml           | 10 ++++++---
 platforms/mysql/pom.xml             |  8 ++++++--
 platforms/nuodb/pom.xml             |  8 ++++++--
 platforms/oracle/pom.xml            |  8 ++++++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++++++--
 platforms/sqlanywhere/pom.xml       |  8 ++++++--
 platforms/sqlite/pom.xml            |  8 ++++++--
 platforms/sqlserver/pom.xml         |  8 ++++++--
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 47 files changed, 303 insertions(+), 191 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 57ebb759c..d428edcf5 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 93817910a..9fff0a9dc 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 4ae0affeb..4dfb94801 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 52b747f34..5583da9ca 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 637c6a262..c532948ce 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index fffdc4004..2a786aef7 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index f178b354d..c38c0f5dd 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 4abbe7ad1..bf1ffb5d1 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 51dcde226..c8b46ef1e 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 79748f8e1..0811b3297 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index ddfcbc665..9e65d819d 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 67e86b116..2057f6c2f 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 7a2879c5a..a5ab05468 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 5099e2088..795ece307 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,19 +16,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -41,14 +41,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 626db2d80..4ca47c66b 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 987410cdb..987b22ffd 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index d1207a527..75b46f99b 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.2</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 50cb48ad9..0a1cb495f 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,94 +89,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.2-SNAPSHOT</version>
+        <version>13.9.2</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 3e503d4aa..00a42ee39 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index b0dfed881..c8af25b7c 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,14 +15,14 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.2</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -143,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index f35b928a7..d1fae816c 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 1334f5f94..ce9a15e9c 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 863ce60d7..ba06f6172 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 8b2becc34..912048487 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.2</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index eb5a70fcd..cc39af82a 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index dd4378bb1..fcd4c4ad3 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 70294328f..bfc85c138 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 6d4e27cac..0c78edd1f 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 74eaaa1d4..ec2178ac3 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -105,14 +105,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 0f2df51c1..63b7bd33f 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index c6cd3e71d..f1c8273aa 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,68 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 3979e0790..6c06890c9 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 30d1f573e..3f7d86598 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 44e250df3..a9afe2fc9 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,4 +34,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index ce7d6d06f..8023b179d 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 6363c314d..047346302 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index b2c7025af..07c298362 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,14 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 665e8e814..be76070cb 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index c83c6d016..0596fa76a 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index a45dae051..8319026c2 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 0ced51c05..c4ee1ecd7 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 3f4bd1fb2..21dd9c198 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index d15cd9cce..4240b58a3 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index db7bcd97c..587b604eb 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index b03ccf2e2..6ea0f3a77 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.2</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.2</tag>
+  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index fa9ede70b..481732e50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.9.2-SNAPSHOT</version>
+  <version>13.9.2</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.2</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 5c6d312a9..8a5280939 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.2</version>
   </parent>
 
   <name>querybean generator</name>

From 7c23dd06f8428d8e30e3b05d0d6c533a1f1e7746 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 5 Sep 2022 17:44:35 +1200
Subject: [PATCH 090/127] [maven-release-plugin] prepare for next development
 iteration

---
 composites/ebean-clickhouse/pom.xml | 14 +++++--------
 composites/ebean-cockroach/pom.xml  | 14 +++++--------
 composites/ebean-db2/pom.xml        | 14 +++++--------
 composites/ebean-h2/pom.xml         | 14 +++++--------
 composites/ebean-hana/pom.xml       | 14 +++++--------
 composites/ebean-mariadb/pom.xml    | 14 +++++--------
 composites/ebean-mysql/pom.xml      | 14 +++++--------
 composites/ebean-nuodb/pom.xml      | 14 +++++--------
 composites/ebean-oracle/pom.xml     | 14 +++++--------
 composites/ebean-postgres/pom.xml   | 14 +++++--------
 composites/ebean-sqlite/pom.xml     | 14 +++++--------
 composites/ebean-sqlserver/pom.xml  | 14 +++++--------
 composites/ebean-yugabyte/pom.xml   | 14 +++++--------
 composites/ebean/pom.xml            | 16 ++++++---------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 32 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-csv-reader/pom.xml            |  8 ++++----
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 12 +++++------
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 +++++++++++++----------------
 platforms/clickhouse/pom.xml        |  8 ++------
 platforms/db2/pom.xml               |  8 ++------
 platforms/h2/pom.xml                |  8 ++------
 platforms/hana/pom.xml              |  8 ++------
 platforms/hsqldb/pom.xml            |  8 ++------
 platforms/mariadb/pom.xml           | 10 +++------
 platforms/mysql/pom.xml             |  8 ++------
 platforms/nuodb/pom.xml             |  8 ++------
 platforms/oracle/pom.xml            |  8 ++------
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++------
 platforms/sqlanywhere/pom.xml       |  8 ++------
 platforms/sqlite/pom.xml            |  8 ++------
 platforms/sqlserver/pom.xml         |  8 ++------
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 47 files changed, 191 insertions(+), 303 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index d428edcf5..325a08b36 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 9fff0a9dc..e54b7fb54 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 4dfb94801..b7ca8580b 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 5583da9ca..34ff1b3d1 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index c532948ce..17778f995 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 2a786aef7..48a633bcf 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index c38c0f5dd..a773aea58 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index bf1ffb5d1..e6390806a 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index c8b46ef1e..d35c38ca6 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 0811b3297..9681d4079 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 9e65d819d..ab98db436 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 2057f6c2f..120ad3635 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index a5ab05468..f21c70ef0 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 795ece307..9bf3fe041 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,19 +16,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -41,18 +41,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 4ca47c66b..ddad731da 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 987b22ffd..574614a47 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 75b46f99b..cd8fe3659 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 0a1cb495f..d8d18b0a8 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,94 +89,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.2</version>
+        <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 00a42ee39..f761398ee 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index c8af25b7c..d897a28f6 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,14 +15,14 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -143,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index d1fae816c..1dd91c9b6 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index ce9a15e9c..36f5d3340 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index ba06f6172..546fd122b 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 912048487..9e965ef28 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index cc39af82a..769d89dc6 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index fcd4c4ad3..e561b7b6b 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index bfc85c138..174e0274a 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 0c78edd1f..a0f50b261 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index ec2178ac3..4c50ebdc2 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -105,14 +105,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 63b7bd33f..3ed0a8dca 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index f1c8273aa..b0bd37bb3 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,68 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 6c06890c9..4f0a22382 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 3f7d86598..18bc780c6 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index a9afe2fc9..5e51d404b 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,8 +34,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 8023b179d..69b408505 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 047346302..3d429da78 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 07c298362..0f2efa0f7 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index be76070cb..5a73ba502 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 0596fa76a..4f7b459f5 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 8319026c2..804fe28bd 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index c4ee1ecd7..0ddefb398 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 21dd9c198..e621f016f 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 4240b58a3..003337cd2 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 587b604eb..42bcc1b68 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 6ea0f3a77..7ebf81726 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.2</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.2</tag>
-  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 481732e50..15d12f281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.9.2</version>
+  <version>13.9.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 8a5280939..a400130dd 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 94dbd9d6ad48971459261dff5ad280c585795992 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 5 Sep 2022 19:28:41 +1200
Subject: [PATCH 091/127] Bump to 13.9.3-SNAPSHOT after release

---
 ebean-kotlin/pom.xml      | 6 +++---
 tests/test-java16/pom.xml | 6 +++---
 tests/test-kotlin/pom.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index f5605c0cf..f3bb1a351 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.2-SNAPSHOT</version>
+    <version>13.9.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index ea0331b0a..a49bb8dc4 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.9.2-SNAPSHOT</version>
+              <version>13.9.3-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index fb7499d4d..717288b85 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.2-SNAPSHOT</version>
+      <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From 39de9d56dbd0d6925fbbded8509d9883bd38497b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Sep 2022 19:55:43 +1200
Subject: [PATCH 092/127] #2825 - DB Migration - create schema migration is
 repeated unnecessarily

---
 .../dbmigration/model/ModelContainer.java             | 11 +++++++----
 .../dbmigration/model/ModelContainerApplyTest.java    |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
index 3e615fd7d..afd52d186 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java
@@ -161,7 +161,9 @@ public class ModelContainer {
         applyChange((AlterForeignKey) change);
       } else if (change instanceof AddTableComment) {
         applyChange((AddTableComment) change);
-      } else if (change instanceof Sql || change instanceof CreateSchema) {
+      } else if (change instanceof CreateSchema) {
+        applyChange((CreateSchema)change);
+      } else if (change instanceof Sql) {
         // do nothing
       } else {
         throw new IllegalArgumentException("No rule for " + change);
@@ -173,7 +175,6 @@ public class ModelContainer {
    * Set the withHistory flag on the associated base table.
    */
   private void applyChange(AddHistoryTable change) {
-
     MTable table = tables.get(change.getBaseTable());
     if (table == null) {
       throw new IllegalStateException("Table [" + change.getBaseTable() + "] does not exist in model?");
@@ -185,7 +186,6 @@ public class ModelContainer {
    * Unset the withHistory flag on the associated base table.
    */
   protected void applyChange(DropHistoryTable change) {
-
     MTable table = tables.get(change.getBaseTable());
     if (table != null) {
       table.setWithHistory(false);
@@ -228,6 +228,10 @@ public class ModelContainer {
     }
   }
 
+  protected void applyChange(CreateSchema createSchema) {
+    schemas.add(createSchema.getName());
+  }
+
   /**
    * Apply a CreateTable change to the model.
    */
@@ -426,7 +430,6 @@ public class ModelContainer {
    * Register a drop column on a history tables that has not been applied yet.
    */
   private void registerPendingDropColumn(DropColumn dropColumn) {
-
     MTable table = getTable(dropColumn.getTableName());
     if (table == null) {
       throw new IllegalArgumentException("Table [" + dropColumn.getTableName() + "] not found?");
diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
index 48769a6dc..3daca11b2 100644
--- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
+++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
@@ -45,6 +45,8 @@ class ModelContainerApplyTest {
 
     ModelContainer model = new ModelContainer();
     model.apply(migration, MigrationVersion.parse("1.1"));
+
+    assertThat(model.getSchemas()).contains("foo");
   }
 
   private Migration newMigration(Object change) {

From 5c1b4780850d99af7a1b827f228c5cc99cedb476 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Sep 2022 21:39:36 +1200
Subject: [PATCH 093/127] Refactor extract ebean-json-node module - support for
 Jackson JsonNode (into separate module)

---
 composites/ebean/pom.xml                      |  6 ++
 ebean-bom/pom.xml                             |  6 ++
 ebean-core-type/pom.xml                       |  8 ++
 .../io/ebean/core}/type/PostgresHelper.java   | 17 +++-
 .../io/ebean/core/type/ScalarTypeSet.java     | 28 +++++++
 .../ebean/core/type/ScalarTypeSetFactory.java | 17 ++++
 .../src/main/java/module-info.java            |  1 +
 .../ebeaninternal/server/persist/Binder.java  |  1 +
 .../server/type/DefaultTypeManager.java       | 82 ++++---------------
 .../server/type/ScalarTypeCidr.java           |  1 +
 .../server/type/ScalarTypeInet.java           |  1 +
 .../type/ScalarTypeInetAddressPostgres.java   |  1 +
 .../server/type/ScalarTypeJsonList.java       |  5 +-
 .../type/ScalarTypeJsonMapPostgres.java       |  1 +
 .../server/type/ScalarTypeJsonSet.java        |  5 +-
 .../server/type/ScalarTypeJsonString.java     |  1 +
 .../server/type/TypeJsonManager.java          |  1 +
 ebean-core/src/main/java/module-info.java     |  1 +
 ebean-json-node/pom.xml                       | 52 ++++++++++++
 .../ebean/jackson/jsonnode/JsonNodeSet.java   | 51 ++++++++++++
 .../jackson/jsonnode/JsonNodeTypeFactory.java | 31 +++++++
 .../jackson/jsonnode}/ScalarTypeJsonNode.java | 11 +--
 .../jsonnode}/ScalarTypeJsonNodePostgres.java |  3 +-
 .../src/main/java/module-info.java            | 10 +++
 .../io.ebean.core.type.ScalarTypeSetFactory   |  1 +
 ebean-test/pom.xml                            |  7 ++
 pom.xml                                       |  1 +
 27 files changed, 266 insertions(+), 84 deletions(-)
 rename {ebean-core/src/main/java/io/ebeaninternal/server => ebean-core-type/src/main/java/io/ebean/core}/type/PostgresHelper.java (51%)
 create mode 100644 ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSet.java
 create mode 100644 ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSetFactory.java
 create mode 100644 ebean-json-node/pom.xml
 create mode 100644 ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java
 create mode 100644 ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-json-node/src/main/java/io/ebean/jackson/jsonnode}/ScalarTypeJsonNode.java (95%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-json-node/src/main/java/io/ebean/jackson/jsonnode}/ScalarTypeJsonNodePostgres.java (94%)
 create mode 100644 ebean-json-node/src/main/java/module-info.java
 create mode 100644 ebean-json-node/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory

diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 9bf3fe041..8c41257dc 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -31,6 +31,12 @@
       <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-json-node</artifactId>
+      <version>13.9.3-SNAPSHOT</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index d8d18b0a8..6813c7840 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -116,6 +116,12 @@
         <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-json-node</artifactId>
+        <version>13.9.3-SNAPSHOT</version>
+      </dependency>
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index f761398ee..5511e1088 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -26,6 +26,14 @@
       <optional>true</optional>
     </dependency>
 
+    <!-- Provided scope for Postgres JSON/JSONB support -->
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>42.4.1</version>
+      <optional>true</optional>
+    </dependency>
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java b/ebean-core-type/src/main/java/io/ebean/core/type/PostgresHelper.java
similarity index 51%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/PostgresHelper.java
index 768c7a751..c18359704 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/PostgresHelper.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/PostgresHelper.java
@@ -1,5 +1,7 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
+import io.ebean.annotation.Platform;
+import io.ebean.config.dbplatform.DatabasePlatform;
 import org.postgresql.util.PGobject;
 
 import java.sql.SQLException;
@@ -9,12 +11,12 @@ public final class PostgresHelper {
   /**
    * The Postgres JSON DB type.
    */
-  static final String JSON_TYPE = "json";
+  public static final String JSON_TYPE = "json";
 
   /**
    * The Postgres JSONB DB type.
    */
-  static final String JSONB_TYPE = "jsonb";
+  public static final String JSONB_TYPE = "jsonb";
 
   static final String INET_TYPE = "inet";
 
@@ -31,4 +33,13 @@ public final class PostgresHelper {
     pgo.setValue(rawJson);
     return pgo;
   }
+
+  /**
+   * Return true if the platform is Postgres or compatible like Yugabyte, Cockroach.
+   */
+  public static boolean isPostgresCompatible(DatabasePlatform databasePlatform) {
+    return databasePlatform.isPlatform(Platform.POSTGRES)
+      || databasePlatform.isPlatform(Platform.YUGABYTE)
+      || databasePlatform.isPlatform(Platform.COCKROACH);
+  }
 }
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSet.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSet.java
new file mode 100644
index 000000000..725ebac3f
--- /dev/null
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSet.java
@@ -0,0 +1,28 @@
+package io.ebean.core.type;
+
+import io.avaje.lang.Nullable;
+
+/**
+ * A ScalarType that has variations based on the mapped JDBC type (like VARCHAR, CLOB, JSON etc).
+ */
+public interface ScalarTypeSet<T> {
+
+  /**
+   * The property type these scalar types map to.
+   */
+  Class<?> type();
+
+  /**
+   * Return a default ScalarType to use when no other annotations like {@code @DbJson} are present.
+   */
+  @Nullable
+  ScalarType<?> defaultType();
+
+  /**
+   * Return the scalarType to use for the given jdbc type.
+   * <p>
+   * For example VARCHAR, CLOB, JSON etc.
+   */
+  ScalarType<T> forType(int jdbcType);
+
+}
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSetFactory.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSetFactory.java
new file mode 100644
index 000000000..21d133a37
--- /dev/null
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeSetFactory.java
@@ -0,0 +1,17 @@
+package io.ebean.core.type;
+
+import io.avaje.lang.Nullable;
+import io.ebean.config.DatabaseConfig;
+
+/**
+ * Factory to create ScalarTypeSet.
+ */
+public interface ScalarTypeSetFactory {
+
+  /**
+   * Create the ScalarTypeSet given the config and optional objectMapper.
+   */
+  @Nullable
+  ScalarTypeSet<?> createTypeSet(DatabaseConfig config, @Nullable Object objectMapper);
+
+}
diff --git a/ebean-core-type/src/main/java/module-info.java b/ebean-core-type/src/main/java/module-info.java
index 557d5a302..88be6d462 100644
--- a/ebean-core-type/src/main/java/module-info.java
+++ b/ebean-core-type/src/main/java/module-info.java
@@ -4,6 +4,7 @@ module io.ebean.core.type {
 
   requires transitive java.sql;
   requires transitive io.ebean.api;
+  requires static org.postgresql.jdbc;
 
   requires static com.fasterxml.jackson.core;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index 5dd0af06a..e51dee906 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.persist;
 
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.PostgresHelper;
 import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.CoreLog;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index bc644954e..b3a5d99bd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.type;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.annotation.*;
 import io.ebean.config.DatabaseConfig;
@@ -9,9 +8,7 @@ import io.ebean.config.PlatformConfig;
 import io.ebean.config.ScalarTypeConverter;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.core.type.DocPropertyType;
-import io.ebean.core.type.ExtraTypeFactory;
-import io.ebean.core.type.ScalarType;
+import io.ebean.core.type.*;
 import io.ebean.types.Cidr;
 import io.ebean.types.Inet;
 import io.ebean.util.AnnotationUtil;
@@ -51,6 +48,7 @@ public final class DefaultTypeManager implements TypeManager {
 
   private static final System.Logger log = CoreLog.internal;
 
+  private final Map<Class<?>, ScalarTypeSet<?>> typeSets = new HashMap<>();
   private final ConcurrentHashMap<Class<?>, ScalarType<?>> typeMap;
   private final ConcurrentHashMap<Integer, ScalarType<?>> nativeMap;
   private final ConcurrentHashMap<String, ScalarType<?>> logicalMap;
@@ -71,28 +69,7 @@ public final class DefaultTypeManager implements TypeManager {
   private final EnumType defaultEnumType;
   private final DatabasePlatform databasePlatform;
 
-  // OPTIONAL ScalarTypes registered if Jackson/JsonNode is in the classpath
 
-  /**
-   * Jackson's JsonNode storage to Clob.
-   */
-  private ScalarType<?> jsonNodeClob;
-  /**
-   * Jackson's JsonNode storage to Blob.
-   */
-  private ScalarType<?> jsonNodeBlob;
-  /**
-   * Jackson's JsonNode storage to Varchar.
-   */
-  private ScalarType<?> jsonNodeVarchar;
-  /**
-   * Jackson's JsonNode storage to Postgres JSON or Clob.
-   */
-  private ScalarType<?> jsonNodeJson;
-  /**
-   * Jackson's JsonNode storage to Postgres JSONB or Clob.
-   */
-  private ScalarType<?> jsonNodeJsonb;
 
   private final PlatformArrayTypeFactory arrayTypeListFactory;
   private final PlatformArrayTypeFactory arrayTypeSetFactory;
@@ -120,7 +97,6 @@ public final class DefaultTypeManager implements TypeManager {
 
     initialiseStandard(config);
     initialiseJavaTimeTypes(config);
-    initialiseJacksonTypes();
     loadTypesFromProviders(config, objectMapper);
     loadGeoTypeBinder(config);
 
@@ -160,16 +136,21 @@ public final class DefaultTypeManager implements TypeManager {
    * Load custom scalar types registered via ExtraTypeFactory and ServiceLoader.
    */
   private void loadTypesFromProviders(DatabaseConfig config, Object objectMapper) {
-    ServiceLoader<ExtraTypeFactory> factories = ServiceLoader.load(ExtraTypeFactory.class);
-    Iterator<ExtraTypeFactory> iterator = factories.iterator();
-    if (iterator.hasNext()) {
-      // use the cacheFactory (via classpath service loader)
-      ExtraTypeFactory plugin = iterator.next();
-      List<? extends ScalarType<?>> types = plugin.createTypes(config, objectMapper);
-      for (ScalarType<?> type : types) {
+    for (ExtraTypeFactory plugin : ServiceLoader.load(ExtraTypeFactory.class)) {
+      for (ScalarType<?> type : plugin.createTypes(config, objectMapper)) {
         add(type);
       }
     }
+    for (ScalarTypeSetFactory factory : ServiceLoader.load(ScalarTypeSetFactory.class)) {
+      ScalarTypeSet<?> typeSet = factory.createTypeSet(config, objectMapper);
+      if (typeSet != null) {
+        typeSets.put(typeSet.type(), typeSet);
+        ScalarType<?> defaultType = typeSet.defaultType();
+        if (defaultType != null) {
+          typeMap.put(typeSet.type(), defaultType);
+        }
+      }
+    }
   }
 
   private boolean isPostgresCompatible(DatabasePlatform databasePlatform) {
@@ -350,19 +331,9 @@ public final class DefaultTypeManager implements TypeManager {
       }
     }
     if (objectMapperPresent && prop.getMutationDetection() == MutationDetection.DEFAULT) {
-      if (type.equals(JsonNode.class)) {
-        switch (dbType) {
-          case Types.VARCHAR:
-            return jsonNodeVarchar;
-          case Types.BLOB:
-            return jsonNodeBlob;
-          case Types.CLOB:
-            return jsonNodeClob;
-          case DbPlatformType.JSONB:
-            return jsonNodeJsonb;
-          default:
-            return jsonNodeJson;
-        }
+      ScalarTypeSet<?> typeSet = typeSets.get(type);
+      if (typeSet != null) {
+        return typeSet.forType(dbType);
       }
     }
     return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
@@ -709,25 +680,6 @@ public final class DefaultTypeManager implements TypeManager {
     }
   }
 
-  /**
-   * Add support for Jackson's JsonNode mapping to Clob, Blob, Varchar, JSON and JSONB.
-   */
-  private void initialiseJacksonTypes() {
-    if (objectMapper != null) {
-      ObjectMapper mapper = (ObjectMapper) objectMapper;
-      jsonNodeClob = new ScalarTypeJsonNode.Clob(mapper);
-      jsonNodeBlob = new ScalarTypeJsonNode.Blob(mapper);
-      jsonNodeVarchar = new ScalarTypeJsonNode.Varchar(mapper);
-      jsonNodeJson = jsonNodeClob;  // Default for non-Postgres databases
-      jsonNodeJsonb = jsonNodeClob; // Default for non-Postgres databases
-      if (postgres) {
-        jsonNodeJson = new ScalarTypeJsonNodePostgres.JSON(mapper);
-        jsonNodeJsonb = new ScalarTypeJsonNodePostgres.JSONB(mapper);
-      }
-      // add as default mapping for JsonNode (when not annotated with @DbJson etc)
-      typeMap.put(JsonNode.class, jsonNodeJson);
-    }
-  }
 
   private void initialiseJavaTimeTypes(DatabaseConfig config) {
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
index e355c2936..7cc2238e7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.PostgresHelper;
 import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebean.types.Cidr;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
index 40f52aca6..828e42a64 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.PostgresHelper;
 import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebean.types.Inet;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
index a09e7cfb0..fadcf3038 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.PostgresHelper;
 import io.ebean.core.type.ScalarTypeBaseVarchar;
 import io.ebean.text.TextException;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index 74b23c799..e37ff8cb6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -3,10 +3,7 @@ package io.ebeaninternal.server.type;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.DocPropertyType;
-import io.ebean.core.type.ScalarType;
+import io.ebean.core.type.*;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.json.ModifyAwareList;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
index ae33fa0e4..612048447 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMapPostgres.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.type;
 
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.PostgresHelper;
 
 import java.sql.SQLException;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
index 334e86417..0ae3248a4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
@@ -3,10 +3,7 @@ package io.ebeaninternal.server.type;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.core.type.DataBinder;
-import io.ebean.core.type.DataReader;
-import io.ebean.core.type.DocPropertyType;
-import io.ebean.core.type.ScalarType;
+import io.ebean.core.type.*;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.json.ModifyAwareSet;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonString.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonString.java
index 51fb54d4b..aa69300ed 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonString.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonString.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.PostgresHelper;
 import io.ebean.core.type.ScalarType;
 
 import java.sql.SQLException;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
index 25034e409..84ceac12b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.ModifyAwareType;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.core.type.PostgresHelper;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 final class TypeJsonManager {
diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java
index ee9ba85ea..58a3438c9 100644
--- a/ebean-core/src/main/java/module-info.java
+++ b/ebean-core/src/main/java/module-info.java
@@ -8,6 +8,7 @@ module io.ebean.core {
   uses io.ebean.config.dbplatform.DatabasePlatformProvider;
   uses io.ebean.datasource.DataSourceAlertFactory;
   uses io.ebean.core.type.ExtraTypeFactory;
+  uses io.ebean.core.type.ScalarTypeSetFactory;
   uses io.ebeanservice.docstore.api.DocStoreFactory;
   uses io.ebean.migration.auto.AutoMigrationRunner;
   uses io.avaje.classpath.scanner.ClassPathScannerFactory;
diff --git a/ebean-json-node/pom.xml b/ebean-json-node/pom.xml
new file mode 100644
index 000000000..dfefb9b9f
--- /dev/null
+++ b/ebean-json-node/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.9.3-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>ebean-json-node</artifactId>
+
+  <properties>
+    <maven.compiler.source>19</maven.compiler.source>
+    <maven.compiler.target>19</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core-type</artifactId>
+      <version>13.9.3-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+</project>
diff --git a/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java b/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java
new file mode 100644
index 000000000..c932d5339
--- /dev/null
+++ b/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java
@@ -0,0 +1,51 @@
+package io.ebean.jackson.jsonnode;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.ebean.config.dbplatform.DbPlatformType;
+import io.ebean.core.type.ScalarType;
+import io.ebean.core.type.ScalarTypeSet;
+
+import java.sql.Types;
+
+class JsonNodeSet implements ScalarTypeSet<JsonNode> {
+
+  final ScalarType<JsonNode> varchar;
+  final ScalarType<JsonNode> clob;
+  final ScalarType<JsonNode> blob;
+  final ScalarType<JsonNode> jsonb;
+  final ScalarType<JsonNode> json;
+
+  JsonNodeSet(ScalarType<JsonNode> varchar, ScalarType<JsonNode> clob, ScalarType<JsonNode> blob, ScalarType<JsonNode> jsonb, ScalarType<JsonNode> json) {
+    this.varchar = varchar;
+    this.clob = clob;
+    this.blob = blob;
+    this.jsonb = jsonb;
+    this.json = json;
+  }
+
+  @Override
+  public Class<?> type() {
+    return JsonNode.class;
+  }
+
+  @Override
+  public ScalarType<?> defaultType() {
+    return json;
+  }
+
+  @Override
+  public ScalarType<JsonNode> forType(int dbType) {
+    switch (dbType) {
+      case Types.VARCHAR:
+        return varchar;
+      case Types.BLOB:
+        return blob;
+      case Types.CLOB:
+        return clob;
+      case DbPlatformType.JSONB:
+        return jsonb;
+      default:
+        return json;
+    }
+  }
+}
diff --git a/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java b/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java
new file mode 100644
index 000000000..af8f198fe
--- /dev/null
+++ b/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java
@@ -0,0 +1,31 @@
+package io.ebean.jackson.jsonnode;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.ebean.config.DatabaseConfig;
+import io.ebean.core.type.PostgresHelper;
+import io.ebean.core.type.ScalarType;
+import io.ebean.core.type.ScalarTypeSet;
+import io.ebean.core.type.ScalarTypeSetFactory;
+
+public class JsonNodeTypeFactory implements ScalarTypeSetFactory {
+
+  @Override
+  public ScalarTypeSet<?> createTypeSet(DatabaseConfig config, Object objectMapper) {
+    if (objectMapper == null) {
+      return null;
+    }
+
+    ObjectMapper mapper = (ObjectMapper) objectMapper;
+    var varchar = new ScalarTypeJsonNode.Varchar(mapper);
+    var clob = new ScalarTypeJsonNode.Clob(mapper);
+    var blob = new ScalarTypeJsonNode.Blob(mapper);
+    ScalarType<JsonNode> json = clob;  // Default for non-Postgres databases
+    ScalarType<JsonNode> jsonb = clob; // Default for non-Postgres databases
+    if (PostgresHelper.isPostgresCompatible(config.getDatabasePlatform())) {
+      json = new ScalarTypeJsonNodePostgres.JSON(mapper);
+      jsonb = new ScalarTypeJsonNodePostgres.JSONB(mapper);
+    }
+    return new JsonNodeSet(varchar, clob, blob, jsonb, json);
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java
similarity index 95%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
rename to ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java
index 0c7959038..ca9859bde 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
+++ b/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.jackson.jsonnode;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -11,11 +11,7 @@ import io.ebean.core.type.ScalarTypeBase;
 import io.ebean.text.TextException;
 import io.ebean.util.IOUtils;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.sql.Types;
@@ -182,7 +178,8 @@ abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
     if (value == null) {
       dataOutput.writeBoolean(false);
     } else {
-      ScalarHelp.writeUTF(dataOutput, format(value));
+      dataOutput.writeBoolean(true);
+      dataOutput.writeUTF(format(value));
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java b/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java
similarity index 94%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
rename to ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java
index b23252367..c78a69b2b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
+++ b/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java
@@ -1,9 +1,10 @@
-package io.ebeaninternal.server.type;
+package io.ebean.jackson.jsonnode;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.DataBinder;
+import io.ebean.core.type.PostgresHelper;
 
 import java.sql.SQLException;
 
diff --git a/ebean-json-node/src/main/java/module-info.java b/ebean-json-node/src/main/java/module-info.java
new file mode 100644
index 000000000..ae48a30fb
--- /dev/null
+++ b/ebean-json-node/src/main/java/module-info.java
@@ -0,0 +1,10 @@
+import io.ebean.jackson.jsonnode.JsonNodeTypeFactory;
+
+module io.ebean.json.node {
+
+  requires io.ebean.core.type;
+  requires com.fasterxml.jackson.core;
+  requires com.fasterxml.jackson.databind;
+
+  provides io.ebean.core.type.ScalarTypeSetFactory with JsonNodeTypeFactory;
+}
diff --git a/ebean-json-node/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory b/ebean-json-node/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory
new file mode 100644
index 000000000..3ed48464a
--- /dev/null
+++ b/ebean-json-node/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory
@@ -0,0 +1 @@
+io.ebean.jackson.jsonnode.JsonNodeTypeFactory
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 4c50ebdc2..9e334b365 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -109,6 +109,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-json-node</artifactId>
+      <version>13.9.3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
diff --git a/pom.xml b/pom.xml
index 15d12f281..f2c505822 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
     <module>composites</module>
     <module>ebean-joda-time</module>
     <module>ebean-csv-reader</module>
+    <module>ebean-json-node</module>
     <!--    <module>ebean-kotlin</module>-->
 
   </modules>

From edddc935dfbfb9e228c4d25da3e17b52ae96f259 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Sep 2022 22:38:09 +1200
Subject: [PATCH 094/127] Update DefaultTypeManager to reuse
 PostgresHelper.isPostgresCompatible()

---
 .../server/type/DefaultTypeManager.java         | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index b3a5d99bd..babd896d9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -37,6 +37,7 @@ import java.time.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static io.ebean.core.type.PostgresHelper.isPostgresCompatible;
 import static java.lang.System.Logger.Level.*;
 
 /**
@@ -69,8 +70,6 @@ public final class DefaultTypeManager implements TypeManager {
   private final EnumType defaultEnumType;
   private final DatabasePlatform databasePlatform;
 
-
-
   private final PlatformArrayTypeFactory arrayTypeListFactory;
   private final PlatformArrayTypeFactory arrayTypeSetFactory;
   private GeoTypeBinder geoTypeBinder;
@@ -153,12 +152,6 @@ public final class DefaultTypeManager implements TypeManager {
     }
   }
 
-  private boolean isPostgresCompatible(DatabasePlatform databasePlatform) {
-    return databasePlatform.isPlatform(Platform.POSTGRES)
-      || databasePlatform.isPlatform(Platform.YUGABYTE)
-      || databasePlatform.isPlatform(Platform.COCKROACH);
-  }
-
   private boolean hstoreSupport() {
     return databasePlatform.isPlatform(Platform.POSTGRES);
   }
@@ -194,10 +187,10 @@ public final class DefaultTypeManager implements TypeManager {
   @Override
   public ScalarType<?> getScalarType(Type propertyType, Class<?> propertyClass) {
     if (propertyType instanceof ParameterizedType) {
-      ParameterizedType pt = (ParameterizedType)propertyType;
+      ParameterizedType pt = (ParameterizedType) propertyType;
       Type rawType = pt.getRawType();
       if (List.class == rawType || Set.class == rawType) {
-        return getArrayScalarType((Class<?>)rawType, propertyType, true);
+        return getArrayScalarType((Class<?>) rawType, propertyType, true);
       }
     }
     return getScalarType(propertyClass);
@@ -241,7 +234,7 @@ public final class DefaultTypeManager implements TypeManager {
         return found;
       }
       // second step - loop through interfaces of this type
-      for (Class<?> iface: parent.getInterfaces()) {
+      for (Class<?> iface : parent.getInterfaces()) {
         found = checkInheritedTypes(iface);
         if (found != null && found != ScalarTypeNotFound.INSTANCE) {
           typeMap.put(type, found); // store type for next lookup
@@ -349,7 +342,7 @@ public final class DefaultTypeManager implements TypeManager {
 
   private DocPropertyType getDocType(Type genericType) {
     if (genericType instanceof Class<?>) {
-      ScalarType<?> found = getScalarType((Class<?>)genericType);
+      ScalarType<?> found = getScalarType((Class<?>) genericType);
       if (found != null) {
         return found.docType();
       }

From aeb4b8ed25f5cc8446f6d6cdc8ee5b1d6f439bda Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Sep 2022 22:41:56 +1200
Subject: [PATCH 095/127] Refactor TypeManager - remove unnecessary add()
 method from interface allowing it to be private

---
 .../io/ebeaninternal/server/type/DefaultTypeManager.java     | 3 +--
 .../main/java/io/ebeaninternal/server/type/TypeManager.java  | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index babd896d9..75b2e5622 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -159,8 +159,7 @@ public final class DefaultTypeManager implements TypeManager {
   /**
    * Register a custom ScalarType.
    */
-  @Override
-  public void add(ScalarType<?> scalarType) {
+  private void add(ScalarType<?> scalarType) {
     typeMap.put(scalarType.type(), scalarType);
     logAdd(scalarType);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java
index 746dce154..0c9206149 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java
@@ -11,11 +11,6 @@ import java.lang.reflect.Type;
  */
 public interface TypeManager {
 
-  /**
-   * Register a ScalarType with the system.
-   */
-  void add(ScalarType<?> scalarType);
-
   /**
    * Return the scalar type for the given logical type.
    */

From 27beab2980b05017477a46c87c70493c8e9a9826 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Sep 2022 22:53:15 +1200
Subject: [PATCH 096/127] Refactor internal TypeManager change/improve its
 method names

---
 .../server/deploy/BeanDescriptorManager.java  |  6 +-
 .../deploy/parse/AnnotationAssocManys.java    |  6 +-
 .../server/deploy/parse/AnnotationFields.java |  2 +-
 .../deploy/parse/DeployCreateProperties.java  |  4 +-
 .../server/deploy/parse/DeployUtil.java       | 12 +--
 .../server/dto/DtoMetaConstructor.java        |  2 +-
 .../server/dto/DtoMetaProperty.java           |  2 +-
 .../server/json/DJsonScalar.java              |  2 +-
 .../ebeaninternal/server/persist/Binder.java  |  4 +-
 .../server/type/DefaultTypeManager.java       | 83 +++++++++----------
 .../server/type/TypeManager.java              | 23 +++--
 .../server/type/DefaultTypeManagerTest.java   | 26 +++---
 .../server/type/TestTypeManager.java          | 26 +++---
 13 files changed, 98 insertions(+), 100 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 9293d9d2c..db5430566 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -184,12 +184,12 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
 
   @Override
   public ScalarType<?> scalarType(String cast) {
-    return typeManager.getScalarType(cast);
+    return typeManager.type(cast);
   }
 
   @Override
   public ScalarType<?> scalarType(int jdbcType) {
-    return typeManager.getScalarType(jdbcType);
+    return typeManager.type(jdbcType);
   }
 
   /**
@@ -884,7 +884,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   private void makeOrderColumn(DeployBeanPropertyAssocMany<?> oneToMany) {
     DeployBeanDescriptor<?> targetDesc = targetDescriptor(oneToMany);
     DeployOrderColumn orderColumn = oneToMany.getOrderColumn();
-    final ScalarType<?> scalarType = typeManager.getScalarType(Integer.class);
+    final ScalarType<?> scalarType = typeManager.type(Integer.class);
     DeployBeanProperty orderProperty = new DeployBeanProperty(targetDesc, Integer.class, scalarType, null);
     orderProperty.setName(DeployOrderColumn.LOGICAL_NAME);
     orderProperty.setDbColumn(orderColumn.getName());
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 736602695..538d7c715 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -222,7 +222,7 @@ final class AnnotationAssocManys extends AnnotationAssoc {
         dbKeyColumn = mapKeyColumn.name();
       }
 
-      ScalarType<?> keyScalarType = util.getTypeManager().getScalarType(prop.getMapKeyType());
+      ScalarType<?> keyScalarType = util.getTypeManager().type(prop.getMapKeyType());
 
       DeployBeanProperty keyProp = new DeployBeanProperty(elementDescriptor, elementType, keyScalarType, null);
       setElementProperty(keyProp, "key", dbKeyColumn, sortOrder++);
@@ -234,10 +234,10 @@ final class AnnotationAssocManys extends AnnotationAssoc {
       }
     }
 
-    ScalarType<?> valueScalarType = util.getTypeManager().getScalarType(elementType);
+    ScalarType<?> valueScalarType = util.getTypeManager().type(elementType);
     if (valueScalarType == null && elementType.isEnum()) {
       Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>)elementType;
-      valueScalarType = util.getTypeManager().createEnumScalarType(enumClass, EnumType.STRING);
+      valueScalarType = util.getTypeManager().enumType(enumClass, EnumType.STRING);
     }
 
     boolean scalar = true;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index abedce6e4..7111dbfac 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -427,7 +427,7 @@ final class AnnotationFields extends AnnotationParser {
 
   private ScalarTypeBytesBase getDbEncryptType(DeployBeanProperty prop) {
     int dbType = prop.isLob() ? Types.BLOB : Types.VARBINARY;
-    return (ScalarTypeBytesBase) util.getTypeManager().getScalarType(dbType);
+    return (ScalarTypeBytesBase) util.getTypeManager().type(dbType);
   }
 
   private DataEncryptSupport createDataEncryptSupport(DeployBeanProperty prop) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
index cab048376..e8466ebae 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java
@@ -108,7 +108,7 @@ public final class DeployCreateProperties {
   @SuppressWarnings({"unchecked"})
   private DeployBeanProperty createManyType(DeployBeanDescriptor<?> desc, Class<?> targetType, ManyType manyType) {
     try {
-      ScalarType<?> scalarType = typeManager.getScalarType(targetType);
+      ScalarType<?> scalarType = typeManager.type(targetType);
       if (scalarType != null) {
         return new DeployBeanPropertySimpleCollection(desc, targetType, manyType);
       }
@@ -141,7 +141,7 @@ public final class DeployCreateProperties {
     if (propertyType.isEnum() || propertyType.isPrimitive()) {
       return new DeployBeanProperty(desc, propertyType, null, null);
     }
-    ScalarType<?> scalarType = typeManager.getScalarType(propertyType);
+    ScalarType<?> scalarType = typeManager.type(propertyType);
     if (scalarType != null) {
       return new DeployBeanProperty(desc, propertyType, scalarType, null);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index c20c0ad86..df0705f65 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -102,7 +102,7 @@ public final class DeployUtil {
     try {
       Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>) enumType;
       EnumType type = enumerated != null ? enumerated.value() : null;
-      ScalarType<?> scalarType = typeManager.createEnumScalarType(enumClass, type);
+      ScalarType<?> scalarType = typeManager.enumType(enumClass, type);
       prop.setScalarType(scalarType);
       prop.setDbType(scalarType.jdbcType());
     } catch (IllegalStateException e) {
@@ -137,7 +137,7 @@ public final class DeployUtil {
     // set via annotations
     Class<?> propType = property.getPropertyType();
     try {
-      ScalarType<?> scalarType = typeManager.getScalarType(propType, property.getDbType());
+      ScalarType<?> scalarType = typeManager.type(propType, property.getDbType());
       if (scalarType != null || property.isTransient()) {
         return scalarType;
       }
@@ -155,7 +155,7 @@ public final class DeployUtil {
    * Map to Postgres HSTORE type (with fallback to JSON storage in VARCHAR).
    */
   void setDbMap(DeployBeanProperty prop, DbMap dbMap) {
-    ScalarType<?> scalarType = typeManager.getDbMapScalarType();
+    ScalarType<?> scalarType = typeManager.dbMapType();
     int dbType = scalarType.jdbcType();
     prop.setDbType(dbType);
     prop.setScalarType(scalarType);
@@ -172,7 +172,7 @@ public final class DeployUtil {
    */
   void setDbArray(DeployBeanProperty prop, DbArray dbArray) {
     Class<?> type = prop.getPropertyType();
-    ScalarType<?> scalarType = typeManager.getArrayScalarType(type, prop.getGenericType(), prop.isNullable());
+    ScalarType<?> scalarType = typeManager.dbArrayType(type, prop.getGenericType(), prop.isNullable());
     if (scalarType == null) {
       throw new RuntimeException("No ScalarType for @DbArray type for " + prop.getFullBeanName());
     }
@@ -204,7 +204,7 @@ public final class DeployUtil {
   private void setDbJsonType(DeployBeanProperty prop, int dbType, int dbLength, MutationDetection mutationDetection) {
     prop.setDbType(dbType);
     prop.setMutationDetection(mutationDetection);
-    ScalarType<?> scalarType = typeManager.getJsonScalarType(prop, dbType, dbLength);
+    ScalarType<?> scalarType = typeManager.dbJsonType(prop, dbType, dbLength);
     if (scalarType == null) {
       throw new RuntimeException("No ScalarType for JSON property " + prop + " dbType:" + dbType);
     }
@@ -248,7 +248,7 @@ public final class DeployUtil {
       // this also sets the lob flag on DeployBeanProperty
       int lobType = isClobType(type) ? dbCLOBType : dbBLOBType;
 
-      scalarType = typeManager.getScalarType(type, lobType);
+      scalarType = typeManager.type(type, lobType);
       if (scalarType == null) {
         // this should never occur actually
         throw new RuntimeException("No ScalarType for LOB type " + type + " dbType:" + lobType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
index efd7c97d2..04f213ef0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaConstructor.java
@@ -21,7 +21,7 @@ final class DtoMetaConstructor {
     this.types = constructor.getParameterTypes();
     this.scalarTypes = new ScalarType[types.length];
     for (int i = 0; i < types.length; i++) {
-      scalarTypes[i] = typeManager.getScalarType(types[i]);
+      scalarTypes[i] = typeManager.type(types[i]);
     }
     this.handle = LOOKUP.findConstructor(someClass, typeFor(types));
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
index b73500434..846c559ed 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java
@@ -25,7 +25,7 @@ final class DtoMetaProperty implements DtoReadSet {
     this.name = name;
     if (writeMethod != null) {
       this.setter = lookupMethodHandle(dtoType, writeMethod);
-      this.scalarType = typeManager.getScalarType(propertyType(writeMethod), propertyClass(writeMethod));
+      this.scalarType = typeManager.type(propertyType(writeMethod), propertyClass(writeMethod));
     } else {
       this.scalarType = null;
       this.setter = null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java
index 19607be79..cd3420773 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonScalar.java
@@ -36,7 +36,7 @@ public final class DJsonScalar {
       gen.writeRaw(']');
 
     } else {
-      ScalarType scalarType = typeManager.getScalarType(value.getClass());
+      ScalarType scalarType = typeManager.type(value.getClass());
       if (scalarType == null) {
         throw new IllegalArgumentException("unhandled type " + value.getClass());
       }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
index e51dee906..008163c30 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java
@@ -38,7 +38,7 @@ public final class Binder {
   public Binder(TypeManager typeManager, SpiLogManager logManager, int asOfBindCount, boolean asOfStandardsBased,
                 DbExpressionHandler dbExpressionHandler, DataTimeZone dataTimeZone, MultiValueBind multiValueBind) {
     this.typeManager = typeManager;
-    this.geoTypeBinder = typeManager.getGeoTypeBinder();
+    this.geoTypeBinder = typeManager.geoTypeBinder();
     this.asOfBindCount = asOfBindCount;
     this.asOfStandardsBased = asOfStandardsBased;
     this.dbExpressionHandler = dbExpressionHandler;
@@ -154,7 +154,7 @@ public final class Binder {
   }
 
   public ScalarType<?> getScalarType(Class<?> clazz) {
-    ScalarType<?> type = typeManager.getScalarType(clazz);
+    ScalarType<?> type = typeManager.type(clazz);
     if (type == null) {
       throw new PersistenceException("No ScalarType registered for " + clazz);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 75b2e5622..29685ea99 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -171,7 +171,7 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   @Override
-  public ScalarType<?> getScalarType(String cast) {
+  public ScalarType<?> type(String cast) {
     return logicalMap.get(cast);
   }
 
@@ -179,27 +179,27 @@ public final class DefaultTypeManager implements TypeManager {
    * Return the ScalarType for the given jdbc type as per java.sql.Types.
    */
   @Override
-  public ScalarType<?> getScalarType(int jdbcType) {
+  public ScalarType<?> type(int jdbcType) {
     return nativeMap.get(jdbcType);
   }
 
   @Override
-  public ScalarType<?> getScalarType(Type propertyType, Class<?> propertyClass) {
+  public ScalarType<?> type(Type propertyType, Class<?> propertyClass) {
     if (propertyType instanceof ParameterizedType) {
       ParameterizedType pt = (ParameterizedType) propertyType;
       Type rawType = pt.getRawType();
       if (List.class == rawType || Set.class == rawType) {
-        return getArrayScalarType((Class<?>) rawType, propertyType, true);
+        return dbArrayType((Class<?>) rawType, propertyType, true);
       }
     }
-    return getScalarType(propertyClass);
+    return type(propertyClass);
   }
 
   /**
    * This can return null if no matching ScalarType is found.
    */
   @Override
-  public ScalarType<?> getScalarType(Class<?> type) {
+  public ScalarType<?> type(Class<?> type) {
     ScalarType<?> found = typeMap.get(type);
     if (found == null) {
       if (type.getName().equals("org.joda.time.LocalTime")) {
@@ -247,37 +247,37 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   @Override
-  public GeoTypeBinder getGeoTypeBinder() {
+  public GeoTypeBinder geoTypeBinder() {
     return geoTypeBinder;
   }
 
   @Override
-  public ScalarType<?> getDbMapScalarType() {
+  public ScalarType<?> dbMapType() {
     return hstoreSupport() ? hstoreType : ScalarTypeJsonMap.typeFor(false, Types.VARCHAR, false);
   }
 
   @Override
-  public ScalarType<?> getArrayScalarType(Class<?> type, Type genericType, boolean nullable) {
-    Type valueType = getValueType(genericType);
+  public ScalarType<?> dbArrayType(Class<?> type, Type genericType, boolean nullable) {
+    Type valueType = valueType(genericType);
     if (type.equals(List.class)) {
-      return getArrayScalarTypeList(valueType, nullable);
+      return dbArrayTypeList(valueType, nullable);
     } else if (type.equals(Set.class)) {
-      return getArrayScalarTypeSet(valueType, nullable);
+      return dbArrayTypeSet(valueType, nullable);
     } else {
       throw new IllegalStateException("@DbArray does not support type " + type);
     }
   }
 
-  private ScalarType<?> getArrayScalarTypeSet(Type valueType, boolean nullable) {
+  private ScalarType<?> dbArrayTypeSet(Type valueType, boolean nullable) {
     if (isEnumType(valueType)) {
-      return arrayTypeSetFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable);
+      return arrayTypeSetFactory.typeForEnum(enumType(asEnumClass(valueType), null), nullable);
     }
     return arrayTypeSetFactory.typeFor(valueType, nullable);
   }
 
-  private ScalarType<?> getArrayScalarTypeList(Type valueType, boolean nullable) {
+  private ScalarType<?> dbArrayTypeList(Type valueType, boolean nullable) {
     if (isEnumType(valueType)) {
-      return arrayTypeListFactory.typeForEnum(createEnumScalarType(asEnumClass(valueType), null), nullable);
+      return arrayTypeListFactory.typeForEnum(enumType(asEnumClass(valueType), null), nullable);
     }
     return arrayTypeListFactory.typeFor(valueType, nullable);
   }
@@ -291,7 +291,7 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   @Override
-  public ScalarType<?> getJsonScalarType(DeployBeanProperty prop, int dbType, int dbLength) {
+  public ScalarType<?> dbJsonType(DeployBeanProperty prop, int dbType, int dbLength) {
     Class<?> type = prop.getPropertyType();
     Type genericType = prop.getGenericType();
     boolean hasJacksonAnnotations = objectMapperPresent && checkJacksonAnnotations(prop);
@@ -300,7 +300,7 @@ public final class DefaultTypeManager implements TypeManager {
       return ScalarTypeJsonString.typeFor(postgres, dbType);
     }
     if (type.equals(List.class)) {
-      DocPropertyType docType = getDocType(genericType);
+      DocPropertyType docType = docType(genericType);
       if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
         return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), jsonManager.keepSource(prop));
       } else {
@@ -308,7 +308,7 @@ public final class DefaultTypeManager implements TypeManager {
       }
     }
     if (type.equals(Set.class)) {
-      DocPropertyType docType = getDocType(genericType);
+      DocPropertyType docType = docType(genericType);
       if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
         return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), jsonManager.keepSource(prop));
       } else {
@@ -339,9 +339,9 @@ public final class DefaultTypeManager implements TypeManager {
     return prop.getMetaAnnotation(com.fasterxml.jackson.annotation.JacksonAnnotation.class) != null;
   }
 
-  private DocPropertyType getDocType(Type genericType) {
+  private DocPropertyType docType(Type genericType) {
     if (genericType instanceof Class<?>) {
-      ScalarType<?> found = getScalarType((Class<?>) genericType);
+      ScalarType<?> found = type((Class<?>) genericType);
       if (found != null) {
         return found.docType();
       }
@@ -357,7 +357,7 @@ public final class DefaultTypeManager implements TypeManager {
     return String.class.equals(typeArg) || Long.class.equals(typeArg);
   }
 
-  private Type getValueType(Type collectionType) {
+  private Type valueType(Type collectionType) {
     return TypeReflectHelper.getValueType(collectionType);
   }
 
@@ -384,7 +384,7 @@ public final class DefaultTypeManager implements TypeManager {
    * different jdbcTypes in a single system.
    */
   @Override
-  public ScalarType<?> getScalarType(Class<?> type, int jdbcType) {
+  public ScalarType<?> type(Class<?> type, int jdbcType) {
     // File is a special Lob so check for that first
     if (File.class.equals(type)) {
       return fileType;
@@ -393,13 +393,13 @@ public final class DefaultTypeManager implements TypeManager {
     // check for Clob, LongVarchar etc ...
     // the reason being that String maps to multiple jdbc types
     // varchar, clob, longVarchar.
-    ScalarType<?> scalarType = getLobTypes(jdbcType);
+    ScalarType<?> scalarType = lobTypes(jdbcType);
     if (scalarType != null) {
       // it is a specific Lob type...
       return scalarType;
     }
 
-    scalarType = getScalarType(type);
+    scalarType = type(type);
     if (scalarType != null) {
       if (jdbcType == 0 || scalarType.jdbcType() == jdbcType) {
         // matching type
@@ -425,8 +425,8 @@ public final class DefaultTypeManager implements TypeManager {
    * types - like String - Varchar, LongVarchar, Clob. For this reason I check
    * for the specific Lob types first before looking for a matching type.
    */
-  private ScalarType<?> getLobTypes(int jdbcType) {
-    return getScalarType(jdbcType);
+  private ScalarType<?> lobTypes(int jdbcType) {
+    return type(jdbcType);
   }
 
   /**
@@ -470,7 +470,7 @@ public final class DefaultTypeManager implements TypeManager {
    * <p>
    * Return null if the EnumValue annotations are not present/used.
    */
-  private ScalarTypeEnum<?> createEnumScalarType2(Class<?> enumType) {
+  private ScalarTypeEnum<?> enumTypeEnumValue(Class<?> enumType) {
     boolean integerType = true;
     Map<String, String> nameValueMap = new LinkedHashMap<>();
     for (Field field : enumType.getDeclaredFields()) {
@@ -499,8 +499,8 @@ public final class DefaultTypeManager implements TypeManager {
    * much shorter codes used in the DB.
    */
   @Override
-  public ScalarType<?> createEnumScalarType(Class<? extends Enum<?>> enumType, EnumType type) {
-    ScalarType<?> scalarType = getScalarType(enumType);
+  public ScalarType<?> enumType(Class<? extends Enum<?>> enumType, EnumType type) {
+    ScalarType<?> scalarType = type(enumType);
     if (scalarType instanceof ScalarTypeWrapper) {
       // no override or further mapping required
       return scalarType;
@@ -512,16 +512,16 @@ public final class DefaultTypeManager implements TypeManager {
       }
       return scalarEnum;
     }
-    scalarEnum = createEnumScalarTypePerExtentions(enumType);
+    scalarEnum = enumTypePerExtensions(enumType);
     if (scalarEnum == null) {
       // use JPA normal Enum type (without mapping)
-      scalarEnum = createEnumScalarTypePerSpec(enumType, type);
+      scalarEnum = enumTypePerSpec(enumType, type);
     }
     add(scalarEnum);
     return scalarEnum;
   }
 
-  private ScalarTypeEnum<?> createEnumScalarTypePerSpec(Class<?> enumType, EnumType type) {
+  private ScalarTypeEnum<?> enumTypePerSpec(Class<?> enumType, EnumType type) {
     if (type == null) {
       if (defaultEnumType == EnumType.ORDINAL) {
         return new ScalarTypeEnumStandard.OrdinalEnum(enumType);
@@ -535,16 +535,16 @@ public final class DefaultTypeManager implements TypeManager {
     }
   }
 
-  private ScalarTypeEnum<?> createEnumScalarTypePerExtentions(Class<? extends Enum<?>> enumType) {
+  private ScalarTypeEnum<?> enumTypePerExtensions(Class<? extends Enum<?>> enumType) {
     for (Method method : enumType.getMethods()) {
       DbEnumValue dbValue = AnnotationUtil.get(method, DbEnumValue.class);
       if (dbValue != null) {
         boolean integerValues = DbEnumType.INTEGER == dbValue.storage();
-        return createEnumScalarTypeDbValue(enumType, method, integerValues, dbValue.length(), dbValue.withConstraint());
+        return enumTypeDbValue(enumType, method, integerValues, dbValue.length(), dbValue.withConstraint());
       }
     }
     // look for EnumValue annotations instead
-    return createEnumScalarType2(enumType);
+    return enumTypeEnumValue(enumType);
   }
 
   /**
@@ -552,7 +552,7 @@ public final class DefaultTypeManager implements TypeManager {
    * <p>
    * Return null if the EnumValue annotations are not present/used.
    */
-  private ScalarTypeEnum<?> createEnumScalarTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType, int length, boolean withConstraint) {
+  private ScalarTypeEnum<?> enumTypeDbValue(Class<? extends Enum<?>> enumType, Method method, boolean integerType, int length, boolean withConstraint) {
     Map<String, String> nameValueMap = new LinkedHashMap<>();
     for (Enum<?> enumConstant : enumType.getEnumConstants()) {
       try {
@@ -634,7 +634,7 @@ public final class DefaultTypeManager implements TypeManager {
         }
         Class<?> logicalType = paramTypes[0];
         Class<?> persistType = paramTypes[1];
-        ScalarType<?> wrappedType = getScalarType(persistType);
+        ScalarType<?> wrappedType = type(persistType);
         if (wrappedType == null) {
           throw new IllegalStateException("Could not find ScalarType for: " + paramTypes[1]);
         }
@@ -658,7 +658,7 @@ public final class DefaultTypeManager implements TypeManager {
         }
         Class<?> logicalType = paramTypes[0];
         Class<?> persistType = paramTypes[1];
-        ScalarType<?> wrappedType = getScalarType(persistType);
+        ScalarType<?> wrappedType = type(persistType);
         if (wrappedType == null) {
           throw new IllegalStateException("Could not find ScalarType for: " + paramTypes[1]);
         }
@@ -674,8 +674,7 @@ public final class DefaultTypeManager implements TypeManager {
 
 
   private void initialiseJavaTimeTypes(DatabaseConfig config) {
-
-    ZoneId zoneId = getZoneId(config);
+    ZoneId zoneId = zoneId(config);
 
     typeMap.put(java.nio.file.Path.class, new ScalarTypePath());
     addType(java.time.Period.class, new ScalarTypePeriod());
@@ -702,7 +701,7 @@ public final class DefaultTypeManager implements TypeManager {
     addType(Duration.class, (durationNanos) ? new ScalarTypeDurationWithNanos() : new ScalarTypeDuration());
   }
 
-  private ZoneId getZoneId(DatabaseConfig config) {
+  private ZoneId zoneId(DatabaseConfig config) {
     final String dataTimeZone = config.getDataTimeZone();
     return (dataTimeZone == null) ? ZoneOffset.systemDefault() : TimeZone.getTimeZone(dataTimeZone).toZoneId();
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java
index 0c9206149..e683b43e6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java
@@ -14,39 +14,38 @@ public interface TypeManager {
   /**
    * Return the scalar type for the given logical type.
    */
-  ScalarType<?> getScalarType(String cast);
+  ScalarType<?> type(String cast);
 
   /**
    * Return the ScalarType for a given jdbc type.
    *
    * @param jdbcType as per java.sql.Types
    */
-  ScalarType<?> getScalarType(int jdbcType);
+  ScalarType<?> type(int jdbcType);
 
   /**
    * Return the ScalarType for a given logical type.
    */
-  ScalarType<?> getScalarType(Class<?> type);
+  ScalarType<?> type(Class<?> type);
 
   /**
    * For java.util.Date and java.util.Calendar additionally pass the jdbc type
    * that you would like the ScalarType to map to. This is because these types
    * can map to different java.sql.Types depending on the property.
    */
-  ScalarType<?> getScalarType(Class<?> type, int jdbcType);
+  ScalarType<?> type(Class<?> type, int jdbcType);
 
   /**
    * Find and return the ScalarType taking into account the property type with generics.
    * <p>
    * For example Array based ScalarType for types like {@code List<String>}.
    */
-  ScalarType<?> getScalarType(Type propertyType, Class<?> type);
+  ScalarType<?> type(Type propertyType, Class<?> type);
 
   /**
-   * Create a ScalarType for an Enum using a mapping (rather than JPA Ordinal
-   * or String which has limitations).
+   * Create a ScalarType for an Enum using a mapping (rather than JPA Ordinal or String which has limitations).
    */
-  ScalarType<?> createEnumScalarType(Class<? extends Enum<?>> enumType, EnumType enumerated);
+  ScalarType<?> enumType(Class<? extends Enum<?>> enumType, EnumType enumerated);
 
   /**
    * Return the ScalarType used to handle JSON content.
@@ -54,20 +53,20 @@ public interface TypeManager {
    * Note that type expected to be JsonNode or Map.
    * </p>
    */
-  ScalarType<?> getJsonScalarType(DeployBeanProperty prop, int dbType, int dbLength);
+  ScalarType<?> dbJsonType(DeployBeanProperty prop, int dbType, int dbLength);
 
   /**
    * Return the ScalarType used to handle DB ARRAY.
    */
-  ScalarType<?> getArrayScalarType(Class<?> type, Type genericType, boolean nullable);
+  ScalarType<?> dbArrayType(Class<?> type, Type genericType, boolean nullable);
 
   /**
    * Return the ScalarType used to handle HSTORE (Map<String,String>).
    */
-  ScalarType<?> getDbMapScalarType();
+  ScalarType<?> dbMapType();
 
   /**
    * Return the Geometry type binder if provided.
    */
-  GeoTypeBinder getGeoTypeBinder();
+  GeoTypeBinder geoTypeBinder();
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
index bf5d7a3df..b3bdc17db 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
@@ -46,14 +46,14 @@ public class DefaultTypeManagerTest {
   public void enumDayMonth_builtIn_overrideAsString() {
     DefaultTypeManager typeManager = create();
 
-    ScalarType<?> type = typeManager.createEnumScalarType(Month.class, null);
+    ScalarType<?> type = typeManager.enumType(Month.class, null);
     assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class).as("built in type");
 
     // mapped explicitly as JPA EnumType.STRING
-    type = typeManager.createEnumScalarType(Month.class, EnumType.STRING);
+    type = typeManager.enumType(Month.class, EnumType.STRING);
     assertThat(type).isInstanceOf(ScalarTypeEnumStandard.StringEnum.class).as("override built in type");
     try {
-      typeManager.createEnumScalarType(Month.class, EnumType.ORDINAL);
+      typeManager.enumType(Month.class, EnumType.ORDINAL);
       assertThat(true).isFalse().as("never get here");
 
     } catch (IllegalStateException e) {
@@ -66,10 +66,10 @@ public class DefaultTypeManagerTest {
     DefaultTypeManager typeManager = create();
 
     // mapped explicitly as JPA EnumType.STRING
-    ScalarType<?> type = typeManager.createEnumScalarType(Month.class, EnumType.ORDINAL);
+    ScalarType<?> type = typeManager.enumType(Month.class, EnumType.ORDINAL);
     assertThat(type).isInstanceOf(ScalarTypeEnumStandard.OrdinalEnum.class).as("override built in type");
     try {
-      typeManager.createEnumScalarType(Month.class, EnumType.STRING);
+      typeManager.enumType(Month.class, EnumType.STRING);
       assertThat(true).isFalse().as("never get here");
     } catch (IllegalStateException e) {
       assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
@@ -80,14 +80,14 @@ public class DefaultTypeManagerTest {
   public void enumDayOfWeek_builtIn_overrideAsString() {
     DefaultTypeManager typeManager = create();
 
-    ScalarType<?> type = typeManager.createEnumScalarType(DayOfWeek.class, null);
+    ScalarType<?> type = typeManager.enumType(DayOfWeek.class, null);
     assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class).as("built in type");
 
     // mapped explicitly as JPA EnumType.STRING
-    type = typeManager.createEnumScalarType(DayOfWeek.class, EnumType.STRING);
+    type = typeManager.enumType(DayOfWeek.class, EnumType.STRING);
     assertThat(type).isInstanceOf(ScalarTypeEnumStandard.StringEnum.class).as("override built in type");
     try {
-      typeManager.createEnumScalarType(DayOfWeek.class, EnumType.ORDINAL);
+      typeManager.enumType(DayOfWeek.class, EnumType.ORDINAL);
       assertThat(true).isFalse().as("never get here");
     } catch (IllegalStateException e) {
       assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
@@ -99,10 +99,10 @@ public class DefaultTypeManagerTest {
     DefaultTypeManager typeManager = create();
 
     // mapped explicitly as JPA EnumType.STRING
-    ScalarType<?> type = typeManager.createEnumScalarType(DayOfWeek.class, EnumType.ORDINAL);
+    ScalarType<?> type = typeManager.enumType(DayOfWeek.class, EnumType.ORDINAL);
     assertThat(type).isInstanceOf(ScalarTypeEnumStandard.OrdinalEnum.class).as("override built in type");
     try {
-      typeManager.createEnumScalarType(DayOfWeek.class, EnumType.STRING);
+      typeManager.enumType(DayOfWeek.class, EnumType.STRING);
       assertThat(true).isFalse().as("never get here");
     } catch (IllegalStateException e) {
       assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
@@ -113,19 +113,19 @@ public class DefaultTypeManagerTest {
   public void createEnumScalarTypePerExtentions() {
     DefaultTypeManager typeManager = create();
 
-    ScalarType<?> type = typeManager.createEnumScalarType(VarcharEnum.class, EnumType.ORDINAL);
+    ScalarType<?> type = typeManager.enumType(VarcharEnum.class, EnumType.ORDINAL);
     assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class);
     // withConstraint false
     assertThat(((ScalarTypeEnumWithMapping) type).getDbCheckConstraintValues()).isNull();
 
-    type = typeManager.createEnumScalarType(IntEnum.class, EnumType.ORDINAL);
+    type = typeManager.enumType(IntEnum.class, EnumType.ORDINAL);
     assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class);
     ScalarTypeEnumWithMapping enumWithMapping = (ScalarTypeEnumWithMapping) type;
     // withConstraint true
     assertThat(enumWithMapping.getDbCheckConstraintValues()).hasSize(3);
     assertThat(enumWithMapping.getDbCheckConstraintValues()).contains("100", "101", "102");
 
-    type = typeManager.createEnumScalarType(Car.Size.class, EnumType.ORDINAL);
+    type = typeManager.enumType(Car.Size.class, EnumType.ORDINAL);
     assertThat(type).isInstanceOf(ScalarTypeEnumWithMapping.class);
     enumWithMapping = (ScalarTypeEnumWithMapping) type;
     // withConstraint true
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
index 342a02b5f..f99991ebd 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
@@ -31,7 +31,7 @@ class TestTypeManager extends BaseTest {
   void testEnumWithSubclasses() throws SQLException {
     DefaultTypeManager typeManager = createTypeManager();
 
-    ScalarType<?> type = typeManager.createEnumScalarType(MyEnum.class, null);
+    ScalarType<?> type = typeManager.enumType(MyEnum.class, null);
 
     DataReader reader = mock(DataReader.class);
     when(reader.getString()).thenReturn("A");
@@ -44,17 +44,17 @@ class TestTypeManager extends BaseTest {
     val = type.read(reader);
     assertThat(val).isEqualTo(MyEnum.Cval);
 
-    ScalarType<?> typeGeneral = typeManager.getScalarType(MyEnum.class);
+    ScalarType<?> typeGeneral = typeManager.type(MyEnum.class);
     assertThat(typeGeneral).isNotNull();
-    ScalarType<?> typeB = typeManager.getScalarType(MyEnum.Bval.getClass());
+    ScalarType<?> typeB = typeManager.type(MyEnum.Bval.getClass());
     assertThat(typeB).isNotNull();
-    ScalarType<?> typeA = typeManager.getScalarType(MyEnum.Aval.getClass());
+    ScalarType<?> typeA = typeManager.type(MyEnum.Aval.getClass());
     assertThat(typeA).isNotNull();
-    ScalarType<?> typeC = typeManager.getScalarType(MyEnum.Cval.getClass());
+    ScalarType<?> typeC = typeManager.type(MyEnum.Cval.getClass());
     assertThat(typeC).isNotNull();
 
     try {
-      typeManager.createEnumScalarType(MyEnum.class, EnumType.STRING);
+      typeManager.enumType(MyEnum.class, EnumType.STRING);
       fail("never get here");
     } catch (IllegalStateException e) {
       assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
@@ -65,7 +65,7 @@ class TestTypeManager extends BaseTest {
   void testEnumWithChar() throws SQLException {
     DefaultTypeManager typeManager = createTypeManager();
 
-    ScalarType<?> dayOfWeekType = typeManager.createEnumScalarType(MyDayOfWeek.class, null);
+    ScalarType<?> dayOfWeekType = typeManager.enumType(MyDayOfWeek.class, null);
     DataReader reader = mock(DataReader.class);
     when(reader.getString()).thenReturn("MONDAY   ");
     Object val = dayOfWeekType.read(reader);
@@ -88,7 +88,7 @@ class TestTypeManager extends BaseTest {
     assertThat(val).isEqualTo(MyDayOfWeek.FRIDAY);
 
     try {
-      typeManager.createEnumScalarType(MyDayOfWeek.class, EnumType.ORDINAL);
+      typeManager.enumType(MyDayOfWeek.class, EnumType.ORDINAL);
       fail("never get here");
     } catch (IllegalStateException e) {
       assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
@@ -99,7 +99,7 @@ class TestTypeManager extends BaseTest {
   void test() {
     DefaultTypeManager typeManager = createTypeManager();
 
-    ScalarType<?> scalarType = typeManager.getScalarType(Money.class);
+    ScalarType<?> scalarType = typeManager.type(Money.class);
     assertEquals(Types.DECIMAL, scalarType.jdbcType());
     assertFalse(scalarType.jdbcNative());
     assertEquals(Money.class, scalarType.type());
@@ -108,15 +108,15 @@ class TestTypeManager extends BaseTest {
   @Test
   void testWithConfig() {
     DefaultTypeManager typeManager1 = createTypeManager();
-    ScalarType<?> type1 = typeManager1.createEnumScalarType(MySex.class, null);
+    ScalarType<?> type1 = typeManager1.enumType(MySex.class, null);
     assertThat(type1).isInstanceOf(ScalarTypeEnumStandard.OrdinalEnum.class);
     //
     DefaultTypeManager typeManager2 = createTypeManagerDefaultEnumTypeString();
-    ScalarType<?> type2 = typeManager2.createEnumScalarType(MySex.class, null);
+    ScalarType<?> type2 = typeManager2.enumType(MySex.class, null);
     assertThat(type2).isInstanceOf(ScalarTypeEnumStandard.StringEnum.class);
     //
     DefaultTypeManager typeManager3 = createTypeManagerDefaultEnumTypeString();
-    ScalarType<?> type3 = typeManager3.createEnumScalarType(MySex.class, EnumType.ORDINAL);
+    ScalarType<?> type3 = typeManager3.enumType(MySex.class, EnumType.ORDINAL);
     assertThat(type3).isInstanceOf(ScalarTypeEnumStandard.OrdinalEnum.class);
   }
 
@@ -144,7 +144,7 @@ class TestTypeManager extends BaseTest {
   @Test
   void testCalendar() {
     DefaultTypeManager typeManager = createTypeManager();
-    ScalarType<?> typeB = typeManager.getScalarType(GregorianCalendar.class);
+    ScalarType<?> typeB = typeManager.type(GregorianCalendar.class);
     assertThat(typeB).isInstanceOf(ScalarTypeCalendar.class);
   }
 

From cba3d24df129bc235bac69c0319720242121fa13 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 7 Sep 2022 22:56:43 +1200
Subject: [PATCH 097/127] Refactor DeployUtil rename methods (change/improve
 method names)

---
 .../server/deploy/BeanDescriptorManager.java     |  2 +-
 .../deploy/parse/AnnotationAssocManys.java       |  6 +++---
 .../server/deploy/parse/AnnotationBase.java      |  4 ++--
 .../server/deploy/parse/AnnotationFields.java    |  6 +++---
 .../server/deploy/parse/DeployUtil.java          | 16 ++++++++--------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index db5430566..5f2792f6c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -145,7 +145,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     this.dbIdentity = config.getDatabasePlatform().dbIdentity();
     this.deplyInherit = config.getDeployInherit();
     this.deployUtil = config.getDeployUtil();
-    this.typeManager = deployUtil.getTypeManager();
+    this.typeManager = deployUtil.typeManager();
     this.beanManagerFactory = new BeanManagerFactory(config.getDatabasePlatform());
     this.beanLifecycleAdapterFactory = new BeanLifecycleAdapterFactory(this.config);
     this.persistControllerManager = new PersistControllerManager(bootupClasses);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 538d7c715..0d29c3ba4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -222,7 +222,7 @@ final class AnnotationAssocManys extends AnnotationAssoc {
         dbKeyColumn = mapKeyColumn.name();
       }
 
-      ScalarType<?> keyScalarType = util.getTypeManager().type(prop.getMapKeyType());
+      ScalarType<?> keyScalarType = util.typeManager().type(prop.getMapKeyType());
 
       DeployBeanProperty keyProp = new DeployBeanProperty(elementDescriptor, elementType, keyScalarType, null);
       setElementProperty(keyProp, "key", dbKeyColumn, sortOrder++);
@@ -234,10 +234,10 @@ final class AnnotationAssocManys extends AnnotationAssoc {
       }
     }
 
-    ScalarType<?> valueScalarType = util.getTypeManager().type(elementType);
+    ScalarType<?> valueScalarType = util.typeManager().type(elementType);
     if (valueScalarType == null && elementType.isEnum()) {
       Class<? extends Enum<?>> enumClass = (Class<? extends Enum<?>>)elementType;
-      valueScalarType = util.getTypeManager().enumType(enumClass, EnumType.STRING);
+      valueScalarType = util.typeManager().enumType(enumClass, EnumType.STRING);
     }
 
     boolean scalar = true;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
index 1d182c6a6..35179b876 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java
@@ -52,9 +52,9 @@ abstract class AnnotationBase {
 
   AnnotationBase(DeployUtil util) {
     this.util = util;
-    this.databasePlatform = util.getDbPlatform();
+    this.databasePlatform = util.dbPlatform();
     this.platform = databasePlatform.platform();
-    this.namingConvention = util.getNamingConvention();
+    this.namingConvention = util.namingConvention();
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 7111dbfac..b2b0a4dd7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -301,7 +301,7 @@ final class AnnotationFields extends AnnotationParser {
 
   private void initEncrypt(DeployBeanProperty prop) {
     if (!prop.isTransient()) {
-      EncryptDeploy encryptDeploy = util.getEncryptDeploy(info.getDescriptor().getBaseTableFull(), prop.getDbColumn());
+      EncryptDeploy encryptDeploy = util.encryptDeploy(info.getDescriptor().getBaseTableFull(), prop.getDbColumn());
       if (encryptDeploy == null || encryptDeploy.getMode() == Mode.MODE_ANNOTATION) {
         Encrypted encrypted = get(prop, Encrypted.class);
         if (encrypted != null) {
@@ -398,7 +398,7 @@ final class AnnotationFields extends AnnotationParser {
       return;
     }
     if (dbEncString) {
-      DbEncrypt dbEncrypt = util.getDbPlatform().dbEncrypt();
+      DbEncrypt dbEncrypt = util.dbPlatform().dbEncrypt();
       if (dbEncrypt != null) {
         // check if we have a DB encryption function for this type
         int jdbcType = prop.getScalarType().jdbcType();
@@ -427,7 +427,7 @@ final class AnnotationFields extends AnnotationParser {
 
   private ScalarTypeBytesBase getDbEncryptType(DeployBeanProperty prop) {
     int dbType = prop.isLob() ? Types.BLOB : Types.VARBINARY;
-    return (ScalarTypeBytesBase) util.getTypeManager().type(dbType);
+    return (ScalarTypeBytesBase) util.typeManager().type(dbType);
   }
 
   private DataEncryptSupport createDataEncryptSupport(DeployBeanProperty prop) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index df0705f65..956de6314 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -60,15 +60,15 @@ public final class DeployUtil {
     this.useValidationNotNull = config.isUseValidationNotNull();
   }
 
-  public TypeManager getTypeManager() {
+  public TypeManager typeManager() {
     return typeManager;
   }
 
-  public DatabasePlatform getDbPlatform() {
+  public DatabasePlatform dbPlatform() {
     return dbPlatform;
   }
 
-  public NamingConvention getNamingConvention() {
+  public NamingConvention namingConvention() {
     return namingConvention;
   }
 
@@ -82,7 +82,7 @@ public final class DeployUtil {
     }
   }
 
-  EncryptDeploy getEncryptDeploy(TableName table, String column) {
+  EncryptDeploy encryptDeploy(TableName table, String column) {
     if (encryptDeployManager == null) {
       return EncryptDeploy.ANNOTATION;
     }
@@ -123,7 +123,7 @@ public final class DeployUtil {
       // this will be an Enum type...
       return;
     }
-    ScalarType<?> scalarType = getScalarType(property);
+    ScalarType<?> scalarType = scalarType(property);
     if (scalarType != null) {
       // set the jdbc type this maps to
       property.setDbType(scalarType.jdbcType());
@@ -132,7 +132,7 @@ public final class DeployUtil {
     }
   }
 
-  private ScalarType<?> getScalarType(DeployBeanProperty property) {
+  private ScalarType<?> scalarType(DeployBeanProperty property) {
     // Note that Temporal types already have dbType
     // set via annotations
     Class<?> propType = property.getPropertyType();
@@ -193,7 +193,7 @@ public final class DeployUtil {
   }
 
   void setDbJsonType(DeployBeanProperty prop, DbJson dbJsonType) {
-    int dbType = getDbJsonStorage(dbJsonType.storage());
+    int dbType = dbJsonStorage(dbJsonType.storage());
     setDbJsonType(prop, dbType, dbJsonType.length(), dbJsonType.mutationDetection());
   }
 
@@ -219,7 +219,7 @@ public final class DeployUtil {
   /**
    * Return the JDBC type for the JSON storage type.
    */
-  private int getDbJsonStorage(DbJsonType dbJsonType) {
+  private int dbJsonStorage(DbJsonType dbJsonType) {
     switch (dbJsonType) {
       case JSONB:
         return DbPlatformType.JSONB;

From 5981d313ae786f00bdfbfa71b4e052b9edf0b030 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Sep 2022 14:50:58 +1200
Subject: [PATCH 098/127] Rename ebean-json-node module to
 ebean-jackson-jsonnode

---
 composites/ebean/pom.xml                                        | 2 +-
 ebean-bom/pom.xml                                               | 2 +-
 {ebean-json-node => ebean-jackson-jsonnode}/pom.xml             | 2 +-
 .../src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java    | 0
 .../java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java     | 0
 .../main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java | 0
 .../io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java   | 0
 .../src/main/java/module-info.java                              | 2 +-
 .../META-INF/services/io.ebean.core.type.ScalarTypeSetFactory   | 0
 ebean-test/pom.xml                                              | 2 +-
 pom.xml                                                         | 2 +-
 11 files changed, 6 insertions(+), 6 deletions(-)
 rename {ebean-json-node => ebean-jackson-jsonnode}/pom.xml (96%)
 rename {ebean-json-node => ebean-jackson-jsonnode}/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java (100%)
 rename {ebean-json-node => ebean-jackson-jsonnode}/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java (100%)
 rename {ebean-json-node => ebean-jackson-jsonnode}/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java (100%)
 rename {ebean-json-node => ebean-jackson-jsonnode}/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java (100%)
 rename {ebean-json-node => ebean-jackson-jsonnode}/src/main/java/module-info.java (87%)
 rename {ebean-json-node => ebean-jackson-jsonnode}/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory (100%)

diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 8c41257dc..d6ef2cb13 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -33,7 +33,7 @@
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-json-node</artifactId>
+      <artifactId>ebean-jackson-jsonnode</artifactId>
       <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 6813c7840..eb1e958e3 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -118,7 +118,7 @@
 
       <dependency>
         <groupId>io.ebean</groupId>
-        <artifactId>ebean-json-node</artifactId>
+        <artifactId>ebean-jackson-jsonnode</artifactId>
         <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
diff --git a/ebean-json-node/pom.xml b/ebean-jackson-jsonnode/pom.xml
similarity index 96%
rename from ebean-json-node/pom.xml
rename to ebean-jackson-jsonnode/pom.xml
index dfefb9b9f..6f84c8d21 100644
--- a/ebean-json-node/pom.xml
+++ b/ebean-jackson-jsonnode/pom.xml
@@ -9,7 +9,7 @@
     <version>13.9.3-SNAPSHOT</version>
   </parent>
 
-  <artifactId>ebean-json-node</artifactId>
+  <artifactId>ebean-jackson-jsonnode</artifactId>
 
   <properties>
     <maven.compiler.source>19</maven.compiler.source>
diff --git a/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java b/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java
similarity index 100%
rename from ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java
rename to ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeSet.java
diff --git a/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java b/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java
similarity index 100%
rename from ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java
rename to ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/JsonNodeTypeFactory.java
diff --git a/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java b/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java
similarity index 100%
rename from ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java
rename to ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNode.java
diff --git a/ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java b/ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java
similarity index 100%
rename from ebean-json-node/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java
rename to ebean-jackson-jsonnode/src/main/java/io/ebean/jackson/jsonnode/ScalarTypeJsonNodePostgres.java
diff --git a/ebean-json-node/src/main/java/module-info.java b/ebean-jackson-jsonnode/src/main/java/module-info.java
similarity index 87%
rename from ebean-json-node/src/main/java/module-info.java
rename to ebean-jackson-jsonnode/src/main/java/module-info.java
index ae48a30fb..84fc02973 100644
--- a/ebean-json-node/src/main/java/module-info.java
+++ b/ebean-jackson-jsonnode/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 import io.ebean.jackson.jsonnode.JsonNodeTypeFactory;
 
-module io.ebean.json.node {
+module io.ebean.jackson.jsonnode {
 
   requires io.ebean.core.type;
   requires com.fasterxml.jackson.core;
diff --git a/ebean-json-node/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory b/ebean-jackson-jsonnode/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory
similarity index 100%
rename from ebean-json-node/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory
rename to ebean-jackson-jsonnode/src/main/resources/META-INF/services/io.ebean.core.type.ScalarTypeSetFactory
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 9e334b365..4a71e45cf 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -111,7 +111,7 @@
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-json-node</artifactId>
+      <artifactId>ebean-jackson-jsonnode</artifactId>
       <version>13.9.3-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index f2c505822..de0c4f3b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
     <module>composites</module>
     <module>ebean-joda-time</module>
     <module>ebean-csv-reader</module>
-    <module>ebean-json-node</module>
+    <module>ebean-jackson-jsonnode</module>
     <!--    <module>ebean-kotlin</module>-->
 
   </modules>

From c53ca6c16e13a0606d9e50fa8cc80a341e418503 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Sep 2022 14:53:33 +1200
Subject: [PATCH 099/127] Rename ebean-json-node module to
 ebean-jackson-jsonnode

---
 ebean-jackson-jsonnode/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ebean-jackson-jsonnode/pom.xml b/ebean-jackson-jsonnode/pom.xml
index 6f84c8d21..a77ddcdcc 100644
--- a/ebean-jackson-jsonnode/pom.xml
+++ b/ebean-jackson-jsonnode/pom.xml
@@ -11,13 +11,6 @@
 
   <artifactId>ebean-jackson-jsonnode</artifactId>
 
-  <properties>
-    <maven.compiler.source>19</maven.compiler.source>
-    <maven.compiler.target>19</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-
   <dependencies>
 
     <dependency>

From d5f753d110b260bdc68568da71b000cd249940c5 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Sep 2022 21:39:00 +1200
Subject: [PATCH 100/127] Extract ebean-jackson-mapper module - initial step

---
 .../io/ebean/core/type/ScalarJsonManager.java | 24 +++++++
 .../io/ebean/core/type/ScalarJsonMapper.java  |  4 ++
 .../io/ebean/core/type/ScalarJsonRequest.java | 67 +++++++++++++++++++
 .../deploy/meta/DeployBeanDescriptor.java     | 11 ---
 .../deploy/meta/DeployBeanProperty.java       | 14 ----
 .../server/type/DefaultTypeManager.java       | 24 +++++--
 .../DeployBeanObtainJackson.java              | 13 ++--
 .../type/ScalarTypeJsonObjectMapper.java      | 52 ++++++++------
 .../server/type/TypeJsonManager.java          | 33 ++++-----
 9 files changed, 163 insertions(+), 79 deletions(-)
 create mode 100644 ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonManager.java
 create mode 100644 ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java
 create mode 100644 ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonRequest.java
 rename ebean-core/src/main/java/io/ebeaninternal/server/{deploy/meta => type}/DeployBeanObtainJackson.java (69%)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonManager.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonManager.java
new file mode 100644
index 000000000..f0e645d1d
--- /dev/null
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonManager.java
@@ -0,0 +1,24 @@
+package io.ebean.core.type;
+
+import io.ebean.annotation.MutationDetection;
+
+/**
+ * Holds the configured mapper and default mutation detection mode to be used.
+ */
+public interface ScalarJsonManager {
+
+  /**
+   * Return the default mutation detection mode.
+   */
+  MutationDetection mutationDetection();
+
+  /**
+   * Return the object mapper supplied in DatabaseConfig.
+   */
+  Object mapper();
+
+  /**
+   * Return the Postgres type given the jdbc type.
+   */
+  String postgresType(int dbType);
+}
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java
new file mode 100644
index 000000000..de38bd942
--- /dev/null
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java
@@ -0,0 +1,4 @@
+package io.ebean.core.type;
+
+public interface ScalarJsonMapper {
+}
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonRequest.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonRequest.java
new file mode 100644
index 000000000..c47681fd1
--- /dev/null
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonRequest.java
@@ -0,0 +1,67 @@
+package io.ebean.core.type;
+
+import io.ebean.annotation.MutationDetection;
+
+/**
+ * A request to create a ScalarType for a bean property (typically annotated with {@code @DbJson}).
+ */
+public final class ScalarJsonRequest {
+
+  private final ScalarJsonManager manager;
+  private final int dbType;
+  private final DocPropertyType docType;
+  private final Class<?> beanType;
+  private final MutationDetection mode;
+  private final String name;
+
+  public ScalarJsonRequest(ScalarJsonManager manager, int dbType, DocPropertyType docType, Class<?> beanType, MutationDetection mode, String name) {
+    this.manager = manager;
+    this.dbType = dbType;
+    this.docType = docType;
+    this.beanType = beanType;
+    this.mode = mode;
+    this.name = name;
+  }
+
+  /**
+   * Return the manager.
+   */
+  public ScalarJsonManager manager() {
+    return manager;
+  }
+
+  /**
+   * Return the jdbc type this property maps to (e.g. JSON, JSONB etc).
+   */
+  public int dbType() {
+    return dbType;
+  }
+
+  /**
+   * Return the document store docType.
+   */
+  public DocPropertyType docType() {
+    return docType;
+  }
+
+  /**
+   * Return the type of the bean that this property belongs to.
+   */
+  public Class<?> beanType() {
+    return beanType;
+  }
+
+  /**
+   * Return the mutation detection mode the property should use.
+   */
+  public MutationDetection mode() {
+    return mode;
+  }
+
+  /**
+   * Return the property name.
+   */
+  public String name() {
+    return name;
+  }
+}
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 49767439f..dfeacbd83 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -152,7 +152,6 @@ public class DeployBeanDescriptor<T> {
   private DocStoreMode docStoreDelete;
   private DeployBeanProperty idProperty;
   private TableJoin primaryKeyJoin;
-  private Object jacksonAnnotatedClass;
 
   /**
    * Construct the BeanDescriptor.
@@ -1130,14 +1129,4 @@ public class DeployBeanDescriptor<T> {
     }
   }
 
-  /**
-   * Returns the jackson annotated class, if jackson is present.
-   */
-  @SuppressWarnings("unchecked")
-  Object /*AnnotatedClass*/ getJacksonAnnotatedClass() {
-    if (jacksonAnnotatedClass == null) {
-      jacksonAnnotatedClass = new DeployBeanObtainJackson(config, beanType).obtain();
-    }
-    return jacksonAnnotatedClass;
-  }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
index 847401b1c..2507387ab 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java
@@ -1042,20 +1042,6 @@ public class DeployBeanProperty {
     this.elementProperty = true;
   }
 
-  /**
-   * Returns the jackson annotated field, if jackson is present.
-   */
-  public Object /*AnnotatedField*/ getJacksonField() {
-    com.fasterxml.jackson.databind.introspect.AnnotatedClass jac =
-      (com.fasterxml.jackson.databind.introspect.AnnotatedClass) getDesc().getJacksonAnnotatedClass();
-    for (com.fasterxml.jackson.databind.introspect.AnnotatedField candidate : jac.fields()) {
-      if (candidate.getName().equals(getName())) {
-        return candidate;
-      }
-    }
-    return null;
-  }
-
   public void initMetaAnnotations(Set<Class<?>> metaAnnotationsFilter) {
     metaAnnotations = AnnotationUtil.metaFindAllFor(field, metaAnnotationsFilter);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 29685ea99..e4df81962 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -65,7 +65,7 @@ public final class DefaultTypeManager implements TypeManager {
   private final Object objectMapper;
   private final boolean objectMapperPresent;
   private final boolean postgres;
-  private final TypeJsonManager jsonManager;
+  private final ScalarJsonManager jsonManager;
   private final boolean offlineMigrationGeneration;
   private final EnumType defaultEnumType;
   private final DatabasePlatform databasePlatform;
@@ -302,7 +302,7 @@ public final class DefaultTypeManager implements TypeManager {
     if (type.equals(List.class)) {
       DocPropertyType docType = docType(genericType);
       if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
-        return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), jsonManager.keepSource(prop));
+        return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource(prop));
       } else {
         return createJsonObjectMapperType(prop, dbType, docType);
       }
@@ -310,14 +310,14 @@ public final class DefaultTypeManager implements TypeManager {
     if (type.equals(Set.class)) {
       DocPropertyType docType = docType(genericType);
       if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
-        return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), jsonManager.keepSource(prop));
+        return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource(prop));
       } else {
         return createJsonObjectMapperType(prop, dbType, docType);
       }
     }
     if (type.equals(Map.class)) {
       if (!hasJacksonAnnotations && isMapValueTypeObject(genericType)) {
-        return ScalarTypeJsonMap.typeFor(postgres, dbType, jsonManager.keepSource(prop));
+        return ScalarTypeJsonMap.typeFor(postgres, dbType, keepSource(prop));
       } else {
         return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
       }
@@ -331,6 +331,13 @@ public final class DefaultTypeManager implements TypeManager {
     return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
   }
 
+  private boolean keepSource(DeployBeanProperty prop) {
+    if (prop.getMutationDetection() == MutationDetection.DEFAULT) {
+      prop.setMutationDetection(jsonManager.mutationDetection());
+    }
+    return prop.getMutationDetection() == MutationDetection.SOURCE;
+  }
+
   /**
    * Returns TRUE, if there is any jackson annotation on that property. All jackson annotations
    * are annotated with the &#64;JacksonAnnotation meta annotation. So detection is easy.
@@ -370,11 +377,14 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private ScalarType<?> createJsonObjectMapperType(DeployBeanProperty prop, int dbType, DocPropertyType docType) {
-    Class<?> type = prop.getPropertyType();
     if (objectMapper == null) {
-      throw new IllegalArgumentException("Type [" + type + "] unsupported for @DbJson mapping - Jackson ObjectMapper not present");
+      throw new IllegalArgumentException("Unsupported @DbJson mapping - Jackson ObjectMapper not present for " + prop);
     }
-    return ScalarTypeJsonObjectMapper.createTypeFor(jsonManager, prop, dbType, docType);
+    if (MutationDetection.DEFAULT == prop.getMutationDetection()) {
+      prop.setMutationDetection(jsonManager.mutationDetection());
+    }
+    var req = new ScalarJsonRequest(jsonManager, dbType, docType, prop.getDesc().getBeanType(), prop.getMutationDetection(), prop.getName());
+    return ScalarTypeJsonObjectMapper.createTypeFor(req);
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java
similarity index 69%
rename from ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java
rename to ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java
index 9bbfb6007..943422aa3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanObtainJackson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java
@@ -1,28 +1,27 @@
-package io.ebeaninternal.server.deploy.meta;
+package io.ebeaninternal.server.type;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
 import com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver;
-import io.ebean.config.DatabaseConfig;
 
 /**
  * Used to obtain the Jackson AnnotatedClass for a given bean type utlimately to obtain field level Jackson annotations.
  */
 final class DeployBeanObtainJackson<T> {
 
-  private final DatabaseConfig config;
+  private final ObjectMapper objectMapper;
   private final Class<T> beanType;
 
-  DeployBeanObtainJackson(DatabaseConfig config, Class<T> beanType) {
-    this.config = config;
+  DeployBeanObtainJackson(ObjectMapper objectMapper, Class<T> beanType) {
+    this.objectMapper = objectMapper;
     this.beanType = beanType;
   }
 
   /**
    * Return the Jackson AnnotatedClass for the given bean type.
    */
-  Object obtain() {
-    ObjectMapper objectMapper = (ObjectMapper) config.getObjectMapper();
+  AnnotatedClass obtain() {
     JavaType javaType = objectMapper.getTypeFactory().constructType(beanType);
     return AnnotatedClassResolver.resolve(objectMapper.getDeserializationConfig(), javaType, objectMapper.getDeserializationConfig());
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 2615e5e28..86f5d9c82 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -6,11 +6,11 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.core.type.*;
 import io.ebean.text.TextException;
-import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
 import javax.persistence.PersistenceException;
 import java.io.DataInput;
@@ -18,30 +18,43 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Supports @DbJson properties using Jackson ObjectMapper.
  */
 final class ScalarTypeJsonObjectMapper {
 
+  static final Map<Class<?>, AnnotatedClass> jacksonClasses = new ConcurrentHashMap<>();
+
   /**
    * Create and return the appropriate ScalarType.
    */
-  static ScalarType<?> createTypeFor(TypeJsonManager jsonManager, DeployBeanProperty prop, int dbType, DocPropertyType docType) {
-    AnnotatedField field = (AnnotatedField) prop.getJacksonField();
-    MutationDetection mode = prop.getMutationDetection();
-    if (mode == MutationDetection.NONE) {
-      return new NoMutationDetection(jsonManager, field, dbType, docType);
-    } else if (mode != MutationDetection.DEFAULT) {
-      return new GenericObject(jsonManager, field, dbType, docType);
+  static ScalarType<?> createTypeFor(ScalarJsonRequest req) {
+    AnnotatedClass annotatedClass = annotatedClass(req);
+    AnnotatedField field = annotatedField(annotatedClass, req);
+    if (req.mode() == MutationDetection.NONE) {
+      return new NoMutationDetection(req.manager(), field, req.dbType(), req.docType());
+    } else {
+      return new GenericObject(req.manager(), field, req.dbType(), req.docType());
     }
-    // using the global default MutationDetection mode (defaults to HASH)
-    final MutationDetection defaultMode = jsonManager.mutationDetection();
-    prop.setMutationDetection(defaultMode);
-    if (MutationDetection.NONE == defaultMode) {
-      return new NoMutationDetection(jsonManager, field, dbType, docType);
+  }
+
+  private static AnnotatedField annotatedField(AnnotatedClass annotatedClass, ScalarJsonRequest req) {
+    for (AnnotatedField field : annotatedClass.fields()) {
+      if (field.getName().equals(req.name())) {
+        return field;
+      }
     }
-    return new GenericObject(jsonManager, field, dbType, docType);
+    throw new IllegalStateException("AnnotatedField not found to match " + req.name());
+  }
+
+  private static AnnotatedClass annotatedClass(ScalarJsonRequest req) {
+    return jacksonClasses.computeIfAbsent(req.beanType(), key -> {
+      ObjectMapper mapper = (ObjectMapper) req.manager().mapper();
+      return new DeployBeanObtainJackson(mapper, req.beanType()).obtain();
+    });
   }
 
   /**
@@ -49,7 +62,7 @@ final class ScalarTypeJsonObjectMapper {
    */
   private static final class NoMutationDetection extends Base<Object> {
 
-    NoMutationDetection(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
+    NoMutationDetection(ScalarJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
       super(Object.class, jsonManager, field, dbType, docType);
     }
   }
@@ -61,7 +74,7 @@ final class ScalarTypeJsonObjectMapper {
 
     private final boolean jsonb;
 
-    GenericObject(TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
+    GenericObject(ScalarJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
       super(Object.class, jsonManager, field, dbType, docType);
       this.jsonb = "jsonb".equals(pgType);
     }
@@ -126,9 +139,9 @@ final class ScalarTypeJsonObjectMapper {
     protected final String pgType;
     private final DocPropertyType docType;
 
-    Base(Class<T> cls, TypeJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
+    Base(Class<T> cls, ScalarJsonManager jsonManager, AnnotatedField field, int dbType, DocPropertyType docType) {
       super(cls, false, dbType);
-      this.objectReader = jsonManager.objectMapper();
+      this.objectReader = (ObjectMapper)jsonManager.mapper();
       this.pgType = jsonManager.postgresType(dbType);
       this.docType = docType;
       final JacksonTypeHelper helper = new JacksonTypeHelper(field, objectReader);
@@ -223,7 +236,8 @@ final class ScalarTypeJsonObjectMapper {
       if (value == null) {
         dataOutput.writeBoolean(false);
       } else {
-        ScalarHelp.writeUTF(dataOutput, format(value));
+        dataOutput.writeBoolean(true);
+        dataOutput.writeUTF(format(value));
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
index 84ceac12b..2b5a61432 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
@@ -1,44 +1,35 @@
 package io.ebeaninternal.server.type;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.ebean.ModifyAwareType;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.core.type.PostgresHelper;
-import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
+import io.ebean.core.type.ScalarJsonManager;
 
-final class TypeJsonManager {
+final class TypeJsonManager implements ScalarJsonManager {
 
   private final boolean postgres;
-  private final ObjectMapper objectMapper;
+  private final Object mapper;
   private final MutationDetection mutationDetection;
 
-  TypeJsonManager(boolean postgres, Object objectMapper, MutationDetection mutationDetection) {
+  TypeJsonManager(boolean postgres, Object mapper, MutationDetection mutationDetection) {
     this.postgres = postgres;
-    this.objectMapper = (ObjectMapper) objectMapper;
+    this.mapper = mapper;
     this.mutationDetection = mutationDetection;
   }
 
-  MutationDetection mutationDetection() {
+  @Override
+  public MutationDetection mutationDetection() {
     return mutationDetection;
   }
 
-  ObjectMapper objectMapper() {
-    return objectMapper;
+  @Override
+  public Object mapper() {
+    return mapper;
   }
 
-  boolean keepSource(DeployBeanProperty prop) {
-    if (prop.getMutationDetection() == MutationDetection.SOURCE) {
-      return true;
-    } else if (prop.getMutationDetection() == MutationDetection.DEFAULT) {
-      prop.setMutationDetection(mutationDetection);
-      return mutationDetection == MutationDetection.SOURCE;
-    } else {
-      return false;
-    }
-  }
-
-  String postgresType(int dbType) {
+  @Override
+  public String postgresType(int dbType) {
     if (postgres) {
       switch (dbType) {
         case DbPlatformType.JSON:

From e74e4ba5328960db3ae7e3f556bc175b02f0041d Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Sep 2022 22:09:10 +1200
Subject: [PATCH 101/127] Extract ebean-jackson-mapper module - rename
 ScalarTypeJsonObjectMapper to ScalarJsonJacksonMapper and move

---
 composites/ebean/pom.xml                      |  6 +++
 ebean-bom/pom.xml                             |  6 +++
 .../io/ebean/core/type/ScalarJsonMapper.java  |  9 ++++
 .../server/type/DefaultTypeManager.java       |  8 +++-
 ebean-core/src/main/java/module-info.java     |  1 +
 ebean-jackson-mapper/pom.xml                  | 46 +++++++++++++++++++
 .../mapper}/DeployBeanObtainJackson.java      |  2 +-
 .../jackson/mapper}/JacksonTypeHelper.java    |  2 +-
 .../io/ebean/jackson/mapper}/JsonTrim.java    |  2 +-
 .../mapper/ScalarJsonJacksonMapper.java       | 13 +++---
 .../src/main/java/module-info.java            |  9 ++++
 .../io.ebean.core.type.ScalarJsonMapper       |  1 +
 .../ebean/jackson/mapper}/JsonTrimTest.java   |  2 +-
 ebean-test/pom.xml                            |  7 +++
 pom.xml                                       |  1 +
 15 files changed, 103 insertions(+), 12 deletions(-)
 create mode 100644 ebean-jackson-mapper/pom.xml
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper}/DeployBeanObtainJackson.java (96%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper}/JacksonTypeHelper.java (97%)
 rename {ebean-core/src/main/java/io/ebeaninternal/server/type => ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper}/JsonTrim.java (95%)
 rename ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java => ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java (94%)
 create mode 100644 ebean-jackson-mapper/src/main/java/module-info.java
 create mode 100644 ebean-jackson-mapper/src/main/resources/META-INF/services/io.ebean.core.type.ScalarJsonMapper
 rename {ebean-core/src/test/java/io/ebeaninternal/server/type => ebean-jackson-mapper/src/test/java/io/ebean/jackson/mapper}/JsonTrimTest.java (98%)

diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index d6ef2cb13..57f45f13b 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -37,6 +37,12 @@
       <version>13.9.3-SNAPSHOT</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-mapper</artifactId>
+      <version>13.9.3-SNAPSHOT</version>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-datasource</artifactId>
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index eb1e958e3..46e47c2c7 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -122,6 +122,12 @@
         <version>13.9.3-SNAPSHOT</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-jackson-mapper</artifactId>
+        <version>13.9.3-SNAPSHOT</version>
+      </dependency>
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java
index de38bd942..2cbd964a4 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java
@@ -1,4 +1,13 @@
 package io.ebean.core.type;
 
+/**
+ * Supports JSON bean properties that use something like Jackson ObjectMapper to convert between
+ * JSON content and the logical bean property value.
+ */
 public interface ScalarJsonMapper {
+
+  /**
+   * Return a ScalarType for the given JSON property.
+   */
+  ScalarType<?> createType(ScalarJsonRequest request);
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index e4df81962..be3a25609 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -72,6 +72,7 @@ public final class DefaultTypeManager implements TypeManager {
 
   private final PlatformArrayTypeFactory arrayTypeListFactory;
   private final PlatformArrayTypeFactory arrayTypeSetFactory;
+  private final ScalarJsonMapper jsonMapper;
   private GeoTypeBinder geoTypeBinder;
 
   /**
@@ -94,6 +95,9 @@ public final class DefaultTypeManager implements TypeManager {
     this.offlineMigrationGeneration = DbOffline.isGenerateMigration();
     this.defaultEnumType = config.getDefaultEnumType();
 
+    ServiceLoader<ScalarJsonMapper> mappers = ServiceLoader.load(ScalarJsonMapper.class);
+    jsonMapper = mappers.findFirst().orElse(null);
+
     initialiseStandard(config);
     initialiseJavaTimeTypes(config);
     loadTypesFromProviders(config, objectMapper);
@@ -377,14 +381,14 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private ScalarType<?> createJsonObjectMapperType(DeployBeanProperty prop, int dbType, DocPropertyType docType) {
-    if (objectMapper == null) {
+    if (jsonMapper == null) {
       throw new IllegalArgumentException("Unsupported @DbJson mapping - Jackson ObjectMapper not present for " + prop);
     }
     if (MutationDetection.DEFAULT == prop.getMutationDetection()) {
       prop.setMutationDetection(jsonManager.mutationDetection());
     }
     var req = new ScalarJsonRequest(jsonManager, dbType, docType, prop.getDesc().getBeanType(), prop.getMutationDetection(), prop.getName());
-    return ScalarTypeJsonObjectMapper.createTypeFor(req);
+    return jsonMapper.createType(req);
   }
 
   /**
diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java
index 58a3438c9..d09920dd5 100644
--- a/ebean-core/src/main/java/module-info.java
+++ b/ebean-core/src/main/java/module-info.java
@@ -9,6 +9,7 @@ module io.ebean.core {
   uses io.ebean.datasource.DataSourceAlertFactory;
   uses io.ebean.core.type.ExtraTypeFactory;
   uses io.ebean.core.type.ScalarTypeSetFactory;
+  uses io.ebean.core.type.ScalarJsonMapper;
   uses io.ebeanservice.docstore.api.DocStoreFactory;
   uses io.ebean.migration.auto.AutoMigrationRunner;
   uses io.avaje.classpath.scanner.ClassPathScannerFactory;
diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml
new file mode 100644
index 000000000..9371f4a86
--- /dev/null
+++ b/ebean-jackson-mapper/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.9.3-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>ebean-jackson-mapper</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core-type</artifactId>
+      <version>13.9.3-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+</project>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java
similarity index 96%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java
rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java
index 943422aa3..747d66394 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DeployBeanObtainJackson.java
+++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.jackson.mapper;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JacksonTypeHelper.java
similarity index 97%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java
rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JacksonTypeHelper.java
index 7d2d5b3e1..11f8cc0a8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/JacksonTypeHelper.java
+++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JacksonTypeHelper.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.jackson.mapper;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JsonTrim.java
similarity index 95%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java
rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JsonTrim.java
index ec0808f14..855978681 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/JsonTrim.java
+++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/JsonTrim.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.jackson.mapper;
 
 /**
  * Helper that removes whitespace from JSON. Used to normalise Postgres JSONB content.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java
similarity index 94%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java
index 86f5d9c82..9193d86d2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.jackson.mapper;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -24,14 +24,15 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * Supports @DbJson properties using Jackson ObjectMapper.
  */
-final class ScalarTypeJsonObjectMapper {
+public final class ScalarJsonJacksonMapper implements ScalarJsonMapper {
 
-  static final Map<Class<?>, AnnotatedClass> jacksonClasses = new ConcurrentHashMap<>();
+  private final Map<Class<?>, AnnotatedClass> jacksonClasses = new ConcurrentHashMap<>();
 
   /**
    * Create and return the appropriate ScalarType.
    */
-  static ScalarType<?> createTypeFor(ScalarJsonRequest req) {
+  @Override
+  public ScalarType<?> createType(ScalarJsonRequest req) {
     AnnotatedClass annotatedClass = annotatedClass(req);
     AnnotatedField field = annotatedField(annotatedClass, req);
     if (req.mode() == MutationDetection.NONE) {
@@ -41,7 +42,7 @@ final class ScalarTypeJsonObjectMapper {
     }
   }
 
-  private static AnnotatedField annotatedField(AnnotatedClass annotatedClass, ScalarJsonRequest req) {
+  private AnnotatedField annotatedField(AnnotatedClass annotatedClass, ScalarJsonRequest req) {
     for (AnnotatedField field : annotatedClass.fields()) {
       if (field.getName().equals(req.name())) {
         return field;
@@ -50,7 +51,7 @@ final class ScalarTypeJsonObjectMapper {
     throw new IllegalStateException("AnnotatedField not found to match " + req.name());
   }
 
-  private static AnnotatedClass annotatedClass(ScalarJsonRequest req) {
+  private AnnotatedClass annotatedClass(ScalarJsonRequest req) {
     return jacksonClasses.computeIfAbsent(req.beanType(), key -> {
       ObjectMapper mapper = (ObjectMapper) req.manager().mapper();
       return new DeployBeanObtainJackson(mapper, req.beanType()).obtain();
diff --git a/ebean-jackson-mapper/src/main/java/module-info.java b/ebean-jackson-mapper/src/main/java/module-info.java
new file mode 100644
index 000000000..f43b84144
--- /dev/null
+++ b/ebean-jackson-mapper/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+import io.ebean.jackson.mapper.ScalarJsonJacksonMapper;
+
+module io.ebean.jackson.mapper {
+  requires io.ebean.core.type;
+  requires com.fasterxml.jackson.core;
+  requires com.fasterxml.jackson.databind;
+
+  provides io.ebean.core.type.ScalarJsonMapper with ScalarJsonJacksonMapper;
+}
diff --git a/ebean-jackson-mapper/src/main/resources/META-INF/services/io.ebean.core.type.ScalarJsonMapper b/ebean-jackson-mapper/src/main/resources/META-INF/services/io.ebean.core.type.ScalarJsonMapper
new file mode 100644
index 000000000..e85a66aaa
--- /dev/null
+++ b/ebean-jackson-mapper/src/main/resources/META-INF/services/io.ebean.core.type.ScalarJsonMapper
@@ -0,0 +1 @@
+io.ebean.jackson.mapper.ScalarJsonJacksonMapper
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java b/ebean-jackson-mapper/src/test/java/io/ebean/jackson/mapper/JsonTrimTest.java
similarity index 98%
rename from ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java
rename to ebean-jackson-mapper/src/test/java/io/ebean/jackson/mapper/JsonTrimTest.java
index 27d1ad8f9..f5b78b147 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/JsonTrimTest.java
+++ b/ebean-jackson-mapper/src/test/java/io/ebean/jackson/mapper/JsonTrimTest.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.jackson.mapper;
 
 
 import org.junit.jupiter.api.Test;
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 4a71e45cf..ea8996a56 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -116,6 +116,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jackson-mapper</artifactId>
+      <version>13.9.3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
diff --git a/pom.xml b/pom.xml
index de0c4f3b7..d1217fb8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@
     <module>ebean-joda-time</module>
     <module>ebean-csv-reader</module>
     <module>ebean-jackson-jsonnode</module>
+    <module>ebean-jackson-mapper</module>
     <!--    <module>ebean-kotlin</module>-->
 
   </modules>

From 7a887d219f13ba145da2aad121da08e7caf81ba1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Sep 2022 22:14:16 +1200
Subject: [PATCH 102/127] Extract ebean-jackson-mapper module - rename
 DeployBeanObtainJackson -> AnnotatedClassUtil and convert to static method

---
 ...eanObtainJackson.java => AnnotatedClassUtil.java} | 12 ++----------
 .../jackson/mapper/ScalarJsonJacksonMapper.java      |  2 +-
 ebean-jackson-mapper/src/main/java/module-info.java  |  1 +
 3 files changed, 4 insertions(+), 11 deletions(-)
 rename ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/{DeployBeanObtainJackson.java => AnnotatedClassUtil.java} (70%)

diff --git a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/AnnotatedClassUtil.java
similarity index 70%
rename from ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java
rename to ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/AnnotatedClassUtil.java
index 747d66394..bd30d88fd 100644
--- a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/DeployBeanObtainJackson.java
+++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/AnnotatedClassUtil.java
@@ -8,20 +8,12 @@ import com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver;
 /**
  * Used to obtain the Jackson AnnotatedClass for a given bean type utlimately to obtain field level Jackson annotations.
  */
-final class DeployBeanObtainJackson<T> {
-
-  private final ObjectMapper objectMapper;
-  private final Class<T> beanType;
-
-  DeployBeanObtainJackson(ObjectMapper objectMapper, Class<T> beanType) {
-    this.objectMapper = objectMapper;
-    this.beanType = beanType;
-  }
+final class AnnotatedClassUtil {
 
   /**
    * Return the Jackson AnnotatedClass for the given bean type.
    */
-  AnnotatedClass obtain() {
+  static AnnotatedClass obtain(ObjectMapper objectMapper, Class<?> beanType) {
     JavaType javaType = objectMapper.getTypeFactory().constructType(beanType);
     return AnnotatedClassResolver.resolve(objectMapper.getDeserializationConfig(), javaType, objectMapper.getDeserializationConfig());
   }
diff --git a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java
index 9193d86d2..a005c5e2d 100644
--- a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java
+++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java
@@ -54,7 +54,7 @@ public final class ScalarJsonJacksonMapper implements ScalarJsonMapper {
   private AnnotatedClass annotatedClass(ScalarJsonRequest req) {
     return jacksonClasses.computeIfAbsent(req.beanType(), key -> {
       ObjectMapper mapper = (ObjectMapper) req.manager().mapper();
-      return new DeployBeanObtainJackson(mapper, req.beanType()).obtain();
+      return AnnotatedClassUtil.obtain(mapper, req.beanType());
     });
   }
 
diff --git a/ebean-jackson-mapper/src/main/java/module-info.java b/ebean-jackson-mapper/src/main/java/module-info.java
index f43b84144..a1fde9779 100644
--- a/ebean-jackson-mapper/src/main/java/module-info.java
+++ b/ebean-jackson-mapper/src/main/java/module-info.java
@@ -1,6 +1,7 @@
 import io.ebean.jackson.mapper.ScalarJsonJacksonMapper;
 
 module io.ebean.jackson.mapper {
+
   requires io.ebean.core.type;
   requires com.fasterxml.jackson.core;
   requires com.fasterxml.jackson.databind;

From 610b3f7dc895cd535fe0a5351e0b2587268ae1e8 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Sep 2022 22:38:10 +1200
Subject: [PATCH 103/127] Extract ebean-jackson-mapper module - Change
 checkJacksonAnnotations() to instead use ScalarJsonMapper.markerAnnotation()

---
 .../io/ebean/core/type/ScalarJsonMapper.java  | 10 ++++++++++
 .../server/type/DefaultTypeManager.java       | 19 ++++++++-----------
 .../mapper/ScalarJsonJacksonMapper.java       |  7 +++++++
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java
index 2cbd964a4..5a027ff96 100644
--- a/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarJsonMapper.java
@@ -1,5 +1,9 @@
 package io.ebean.core.type;
 
+import io.avaje.lang.Nullable;
+
+import java.lang.annotation.Annotation;
+
 /**
  * Supports JSON bean properties that use something like Jackson ObjectMapper to convert between
  * JSON content and the logical bean property value.
@@ -10,4 +14,10 @@ public interface ScalarJsonMapper {
    * Return a ScalarType for the given JSON property.
    */
   ScalarType<?> createType(ScalarJsonRequest request);
+
+  /**
+   * Return a marker annotation to detect when the JSON mapper should be used explicitly.
+   */
+  @Nullable
+  <A extends Annotation> Class<A> markerAnnotation();
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index be3a25609..d122ebd06 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -297,12 +297,17 @@ public final class DefaultTypeManager implements TypeManager {
   @Override
   public ScalarType<?> dbJsonType(DeployBeanProperty prop, int dbType, int dbLength) {
     Class<?> type = prop.getPropertyType();
-    Type genericType = prop.getGenericType();
-    boolean hasJacksonAnnotations = objectMapperPresent && checkJacksonAnnotations(prop);
-
     if (type.equals(String.class)) {
       return ScalarTypeJsonString.typeFor(postgres, dbType);
     }
+    boolean hasJacksonAnnotations = false;
+    if (jsonMapper != null) {
+      var markerAnnotation = jsonMapper.markerAnnotation();
+      if (markerAnnotation != null) {
+        hasJacksonAnnotations = !prop.getMetaAnnotations(markerAnnotation).isEmpty();
+      }
+    }
+    Type genericType = prop.getGenericType();
     if (type.equals(List.class)) {
       DocPropertyType docType = docType(genericType);
       if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
@@ -342,14 +347,6 @@ public final class DefaultTypeManager implements TypeManager {
     return prop.getMutationDetection() == MutationDetection.SOURCE;
   }
 
-  /**
-   * Returns TRUE, if there is any jackson annotation on that property. All jackson annotations
-   * are annotated with the &#64;JacksonAnnotation meta annotation. So detection is easy.
-   */
-  private boolean checkJacksonAnnotations(DeployBeanProperty prop) {
-    return prop.getMetaAnnotation(com.fasterxml.jackson.annotation.JacksonAnnotation.class) != null;
-  }
-
   private DocPropertyType docType(Type genericType) {
     if (genericType instanceof Class<?>) {
       ScalarType<?> found = type((Class<?>) genericType);
diff --git a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java
index a005c5e2d..a4dfbac9a 100644
--- a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java
+++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java
@@ -16,6 +16,7 @@ import javax.persistence.PersistenceException;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Map;
@@ -28,6 +29,12 @@ public final class ScalarJsonJacksonMapper implements ScalarJsonMapper {
 
   private final Map<Class<?>, AnnotatedClass> jacksonClasses = new ConcurrentHashMap<>();
 
+  @SuppressWarnings("unchecked")
+  @Override
+  public <A extends Annotation> Class<A> markerAnnotation() {
+    return (Class<A>)com.fasterxml.jackson.annotation.JacksonAnnotation.class;
+  }
+
   /**
    * Create and return the appropriate ScalarType.
    */

From 318b22448cca8ebb2e87a103079c707448cc193b Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Sep 2022 23:01:05 +1200
Subject: [PATCH 104/127] Extract ebean-jackson-mapper module - refactor
 DefaultTypeManager.dbJsonType()

- When detected markerAnnotation (e.g. Jackson annotation) then go directly to createJsonObjectMapperType()
- Simplify for the simple List, Set and Map of Object cases.
---
 .../server/type/DefaultTypeManager.java       | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index d122ebd06..c60386f30 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -300,36 +300,21 @@ public final class DefaultTypeManager implements TypeManager {
     if (type.equals(String.class)) {
       return ScalarTypeJsonString.typeFor(postgres, dbType);
     }
-    boolean hasJacksonAnnotations = false;
     if (jsonMapper != null) {
       var markerAnnotation = jsonMapper.markerAnnotation();
-      if (markerAnnotation != null) {
-        hasJacksonAnnotations = !prop.getMetaAnnotations(markerAnnotation).isEmpty();
+      if (markerAnnotation != null && !prop.getMetaAnnotations(markerAnnotation).isEmpty()) {
+        return createJsonObjectMapperType(prop, dbType, docPropertyType(prop, type));
       }
     }
     Type genericType = prop.getGenericType();
-    if (type.equals(List.class)) {
-      DocPropertyType docType = docType(genericType);
-      if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
-        return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource(prop));
-      } else {
-        return createJsonObjectMapperType(prop, dbType, docType);
-      }
+    if (type.equals(List.class) && isValueTypeSimple(genericType)) {
+      return ScalarTypeJsonList.typeFor(postgres, dbType, docType(genericType), prop.isNullable(), keepSource(prop));
     }
-    if (type.equals(Set.class)) {
-      DocPropertyType docType = docType(genericType);
-      if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) {
-        return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource(prop));
-      } else {
-        return createJsonObjectMapperType(prop, dbType, docType);
-      }
+    if (type.equals(Set.class) && isValueTypeSimple(genericType)) {
+      return ScalarTypeJsonSet.typeFor(postgres, dbType, docType(genericType), prop.isNullable(), keepSource(prop));
     }
-    if (type.equals(Map.class)) {
-      if (!hasJacksonAnnotations && isMapValueTypeObject(genericType)) {
-        return ScalarTypeJsonMap.typeFor(postgres, dbType, keepSource(prop));
-      } else {
-        return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT);
-      }
+    if (type.equals(Map.class) && isMapValueTypeObject(genericType)) {
+      return ScalarTypeJsonMap.typeFor(postgres, dbType, keepSource(prop));
     }
     if (objectMapperPresent && prop.getMutationDetection() == MutationDetection.DEFAULT) {
       ScalarTypeSet<?> typeSet = typeSets.get(type);
@@ -347,6 +332,10 @@ public final class DefaultTypeManager implements TypeManager {
     return prop.getMutationDetection() == MutationDetection.SOURCE;
   }
 
+  private DocPropertyType docPropertyType(DeployBeanProperty prop, Class<?> type) {
+    return type.equals(List.class) || type.equals(Set.class) ? docType(prop.getGenericType()) : DocPropertyType.OBJECT;
+  }
+
   private DocPropertyType docType(Type genericType) {
     if (genericType instanceof Class<?>) {
       ScalarType<?> found = type((Class<?>) genericType);

From 7f5f0f6b8e8585eb47540559dcbb513ce41ee42e Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 8 Sep 2022 23:05:16 +1200
Subject: [PATCH 105/127] Extract ebean-jackson-mapper module - fix module-info
 with requires com.fasterxml.jackson.annotation;

---
 ebean-jackson-mapper/src/main/java/module-info.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ebean-jackson-mapper/src/main/java/module-info.java b/ebean-jackson-mapper/src/main/java/module-info.java
index a1fde9779..7adf6352a 100644
--- a/ebean-jackson-mapper/src/main/java/module-info.java
+++ b/ebean-jackson-mapper/src/main/java/module-info.java
@@ -3,6 +3,7 @@ import io.ebean.jackson.mapper.ScalarJsonJacksonMapper;
 module io.ebean.jackson.mapper {
 
   requires io.ebean.core.type;
+  requires com.fasterxml.jackson.annotation;
   requires com.fasterxml.jackson.core;
   requires com.fasterxml.jackson.databind;
 

From 14d11b1c705fa4bb5cb7d967171bfa19f262f7a9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sun, 11 Sep 2022 17:12:02 +1200
Subject: [PATCH 106/127] Improve tests only - ExtendedServerTest and
 test-java16

---
 .../ebean/xtest/base/ExtendedServerTest.java  | 12 +++---
 .../org/example/records/CustomAccessors.java  | 22 +++++++++++
 .../example/records/CustomConstructor.java    | 18 +++++++++
 .../org/example/records/CustomEquals.java     | 24 ++++++++++++
 .../org/example/records/CustomToString.java   | 18 +++++++++
 .../records/CourseRecordEntityTest.java       | 13 +++++--
 .../example/records/CustomAccessorsTest.java  | 17 +++++++++
 .../records/CustomConstructorTest.java        | 37 +++++++++++++++++++
 .../org/example/records/CustomEqualsTest.java | 16 ++++++++
 .../example/records/CustomToStringTest.java   | 14 +++++++
 .../example/records/RecordAsEmbeddedTest.java |  2 +
 11 files changed, 184 insertions(+), 9 deletions(-)
 create mode 100644 tests/test-java16/src/main/java/org/example/records/CustomAccessors.java
 create mode 100644 tests/test-java16/src/main/java/org/example/records/CustomConstructor.java
 create mode 100644 tests/test-java16/src/main/java/org/example/records/CustomEquals.java
 create mode 100644 tests/test-java16/src/main/java/org/example/records/CustomToString.java
 create mode 100644 tests/test-java16/src/test/java/org/example/records/CustomAccessorsTest.java
 create mode 100644 tests/test-java16/src/test/java/org/example/records/CustomConstructorTest.java
 create mode 100644 tests/test-java16/src/test/java/org/example/records/CustomEqualsTest.java
 create mode 100644 tests/test-java16/src/test/java/org/example/records/CustomToStringTest.java

diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java
index 602a046c0..c0ccdfb9b 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java
@@ -54,37 +54,37 @@ public class ExtendedServerTest extends BaseTestCase {
   @Test
   public void mockClock() {
 
-    Database server = DB.getDefault();
+    Database database = DB.getDefault();
     final Instant snapshot = Instant.now();
     Instant backedSnapshot = snapshot.minus(1, ChronoUnit.DAYS);
     Clock snapshotClock = Clock.fixed(backedSnapshot, Clock.systemUTC().getZone());
 
-    server.extended().setClock(snapshotClock);
+    database.extended().setClock(snapshotClock);
 
     ResetBasicData.reset();
 
-    int count = server
+    int count = database
       .find(Customer.class)
       .where()
       .gt("cretime", snapshot)
       .findCount();
     assertThat(count).isEqualTo(0);
 
-    int count2 = server
+    int count2 = database
       .find(Customer.class)
       .where()
       .ge("cretime", backedSnapshot)
       .findCount();
     assertThat(count2).isGreaterThan(0);
 
-    int count3 = server
+    int count3 = database
       .find(Customer.class)
       .where()
       .gt("updtime", snapshot)
       .findCount();
     assertThat(count3).isEqualTo(0);
 
-    int count4 = server
+    int count4 = database
       .find(Customer.class)
       .where()
       .ge("updtime", backedSnapshot)
diff --git a/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java b/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java
new file mode 100644
index 000000000..d3436db7b
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java
@@ -0,0 +1,22 @@
+package org.example.records;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public record CustomAccessors(String line1, String line2, String city) {
+
+  @Override
+  public String line1() {
+    return "line1:" + line1;
+  }
+
+  @Override
+  public String line2() {
+    return line2 + "|" + city;
+  }
+
+  @Override
+  public String city() {
+    return city;
+  }
+}
diff --git a/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java b/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java
new file mode 100644
index 000000000..964821c69
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java
@@ -0,0 +1,18 @@
+package org.example.records;
+
+import javax.persistence.Embeddable;
+import java.util.Objects;
+
+@Embeddable
+public record CustomConstructor(String line1, String line2, String city) {
+
+  public CustomConstructor(String line1, String line2, String city) {
+    this.line1 = Objects.requireNonNull(line1);
+    this.line2 = Objects.requireNonNull(line2, "no line2");
+    this.city = city;
+  }
+
+  public CustomConstructor(String line1, String line2) {
+    this(line1, line2, "Auckland");
+  }
+}
diff --git a/tests/test-java16/src/main/java/org/example/records/CustomEquals.java b/tests/test-java16/src/main/java/org/example/records/CustomEquals.java
new file mode 100644
index 000000000..1883a708c
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/CustomEquals.java
@@ -0,0 +1,24 @@
+package org.example.records;
+
+import io.avaje.lang.NonNullApi;
+
+import javax.persistence.Embeddable;
+import java.util.Objects;
+
+@NonNullApi
+@Embeddable
+public record CustomEquals(String line1, String line2, String city) {
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    CustomEquals that = (CustomEquals) o;
+    return line1.equals(that.line1) && line2.equals(that.line2) && city.equals(that.city);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(line1, line2, city);
+  }
+}
diff --git a/tests/test-java16/src/main/java/org/example/records/CustomToString.java b/tests/test-java16/src/main/java/org/example/records/CustomToString.java
new file mode 100644
index 000000000..8712fa38a
--- /dev/null
+++ b/tests/test-java16/src/main/java/org/example/records/CustomToString.java
@@ -0,0 +1,18 @@
+package org.example.records;
+
+import io.avaje.lang.NonNullApi;
+
+import javax.persistence.Embeddable;
+
+@NonNullApi
+@Embeddable
+public record CustomToString(String line1, String line2, String city) {
+
+  @Override
+  public String toString() {
+    return "[line1='" + line1 + '\'' +
+      ", line2='" + line2 + '\'' +
+      ", city='" + city + '\'' +
+      ']';
+  }
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/CourseRecordEntityTest.java b/tests/test-java16/src/test/java/org/example/records/CourseRecordEntityTest.java
index 63e0c7d84..ca0d88005 100644
--- a/tests/test-java16/src/test/java/org/example/records/CourseRecordEntityTest.java
+++ b/tests/test-java16/src/test/java/org/example/records/CourseRecordEntityTest.java
@@ -19,8 +19,11 @@ class CourseRecordEntityTest {
       .findOneOrEmpty();
 
     assertThat(found).isPresent();
-    assertThat(found.get().id()).isEqualTo(42L);
-    assertThat(found.get().notes()).isEqualTo("Record");
+    CourseRecordEntity courseRecord = found.get();
+    assertThat(courseRecord.id()).isEqualTo(42L);
+    assertThat(courseRecord.notes()).isEqualTo("Record");
+    assertThat(courseRecord).isEqualTo(courseRecord);
+    assertThat(courseRecord.toString()).isEqualTo("CourseRecordEntity[id=42, name=SuppliedId, notes=Record]");
   }
 
   @Test
@@ -35,6 +38,10 @@ class CourseRecordEntityTest {
       .findOneOrEmpty();
 
     assertThat(second).isPresent();
-    assertThat(second.get().notes()).isEqualTo("Record with generated id");
+    CourseRecordEntity courseRecord = second.get();
+    assertThat(courseRecord.notes()).isEqualTo("Record with generated id");
+
+    assertThat(courseRecord).isEqualTo(new CourseRecordEntity(1000, "Second", "Record with generated id"));
+    assertThat(courseRecord.toString()).isEqualTo("CourseRecordEntity[id=1000, name=Second, notes=Record with generated id]");
   }
 }
diff --git a/tests/test-java16/src/test/java/org/example/records/CustomAccessorsTest.java b/tests/test-java16/src/test/java/org/example/records/CustomAccessorsTest.java
new file mode 100644
index 000000000..02f4d9cb5
--- /dev/null
+++ b/tests/test-java16/src/test/java/org/example/records/CustomAccessorsTest.java
@@ -0,0 +1,17 @@
+package org.example.records;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CustomAccessorsTest {
+
+  @Test
+  void computationInAccessors() {
+    var one = new CustomAccessors("a", "b", "c");
+    assertThat(one.line1()).isEqualTo("line1:a");
+    assertThat(one.line2()).isEqualTo("b|c");
+    assertThat(one.city()).isEqualTo("c");
+  }
+
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/CustomConstructorTest.java b/tests/test-java16/src/test/java/org/example/records/CustomConstructorTest.java
new file mode 100644
index 000000000..064e753c4
--- /dev/null
+++ b/tests/test-java16/src/test/java/org/example/records/CustomConstructorTest.java
@@ -0,0 +1,37 @@
+package org.example.records;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+class CustomConstructorTest {
+
+  @Test
+  void nullInput() {
+    assertThrows(NullPointerException.class, () -> new CustomConstructor(null, "b", "c"));
+  }
+
+  @Test
+  void nullInputWithMessage() {
+    assertThatThrownBy(() -> {
+      new CustomConstructor("a", null, "c");
+    }).isInstanceOf(NullPointerException.class)
+      .hasMessageContaining("no line2");
+  }
+
+  @Test
+  void alternateConstructor() {
+    var bean = new CustomConstructor("a", "b");
+    assertThat(bean.city()).isEqualTo("Auckland");
+    assertThat(bean.line1()).isEqualTo("a");
+    assertThat(bean.line2()).isEqualTo("b");
+    assertThat(bean).isEqualTo(new CustomConstructor("a", "b", "Auckland"));
+    assertThat(bean).isEqualTo(new CustomConstructor("a", "b"));
+
+    assertThat(bean).isNotEqualTo(new CustomConstructor("a", "b", "Wellington"));
+    assertThat(bean).isNotEqualTo(new CustomConstructor("z", "b", "Auckland"));
+    assertThat(bean).isNotEqualTo(new CustomConstructor("a", "z", "Auckland"));
+  }
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/CustomEqualsTest.java b/tests/test-java16/src/test/java/org/example/records/CustomEqualsTest.java
new file mode 100644
index 000000000..b7f989c9c
--- /dev/null
+++ b/tests/test-java16/src/test/java/org/example/records/CustomEqualsTest.java
@@ -0,0 +1,16 @@
+package org.example.records;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CustomEqualsTest {
+
+  @Test
+  void equals() {
+    var one = new CustomEquals("a", "b", "c");
+    var two = new CustomEquals("a", "b", "c");
+
+    assertThat(one).isEqualTo(two);
+  }
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/CustomToStringTest.java b/tests/test-java16/src/test/java/org/example/records/CustomToStringTest.java
new file mode 100644
index 000000000..bcdf7aae0
--- /dev/null
+++ b/tests/test-java16/src/test/java/org/example/records/CustomToStringTest.java
@@ -0,0 +1,14 @@
+package org.example.records;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class CustomToStringTest {
+
+  @Test
+  void testToString() {
+    assertThat(new CustomToString("a", "b", "c").toString()).isEqualTo("[line1='a', line2='b', city='c']");
+    assertThat(new CustomToString("z", "x", "y").toString()).isEqualTo("[line1='z', line2='x', city='y']");
+  }
+}
diff --git a/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java b/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java
index 90cc1c5e4..5ed9e582d 100644
--- a/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java
+++ b/tests/test-java16/src/test/java/org/example/records/RecordAsEmbeddedTest.java
@@ -24,7 +24,9 @@ public class RecordAsEmbeddedTest {
 
     assert found != null;
 
+    assertThat(found.workAddress()).isEqualTo(new Address("45 work", "workling", "wo"));
     assertThat(found.workAddress().toString()).isEqualTo("Address[line1=45 work, line2=workling, city=wo]");
+    assertThat(found.homeAddress()).isEqualTo(new Address("94 home st", "homeline", "wo"));
     assertThat(found.homeAddress().toString()).isEqualTo("Address[line1=94 home st, line2=homeline, city=wo]");
 
     Contact foundPartial = new QContact()

From f54c212b67d2970203acb559f86187d1b9717e3c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Sep 2022 11:10:10 +1200
Subject: [PATCH 107/127] #2833 - Fix PostgresPlatformProvider plaform sniffing
 query (Postgres vs Cockroach)

---
 .../io/ebean/platform/postgres/PostgresPlatformProvider.java  | 2 ++
 pom.xml                                                       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java
index 554c4aeb5..86c65ab65 100644
--- a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java
+++ b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java
@@ -61,6 +61,8 @@ public class PostgresPlatformProvider implements DatabasePlatformProvider {
             }
           }
         }
+      } finally {
+        connection.rollback();
       }
       if (majorVersion <= 9) {
         return new Postgres9Platform();
diff --git a/pom.xml b/pom.xml
index 15d12f281..7f9ef7b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.9.2</ebean-agent.version>
-    <ebean-maven-plugin.version>13.9.2</ebean-maven-plugin.version>
+    <ebean-agent.version>13.9.3</ebean-agent.version>
+    <ebean-maven-plugin.version>13.9.3</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

From ea8e195183d1ed240f34ada6397678d576325740 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Sep 2022 11:12:45 +1200
Subject: [PATCH 108/127] Update test-java16 to use updated agent

---
 tests/test-java16/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index a49bb8dc4..5a0098403 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -66,7 +66,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.6.5</tile>
+            <tile>io.ebean.tile:enhancement:13.9.3</tile>
           </tiles>
         </configuration>
       </plugin>

From 18765b3ac212d5a1aa1443511197012673dfc00f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Sep 2022 11:18:18 +1200
Subject: [PATCH 109/127] [maven-release-plugin] prepare release
 ebean-parent-13.9.3

---
 composites/ebean-clickhouse/pom.xml | 14 ++++++++-----
 composites/ebean-cockroach/pom.xml  | 14 ++++++++-----
 composites/ebean-db2/pom.xml        | 14 ++++++++-----
 composites/ebean-h2/pom.xml         | 14 ++++++++-----
 composites/ebean-hana/pom.xml       | 14 ++++++++-----
 composites/ebean-mariadb/pom.xml    | 14 ++++++++-----
 composites/ebean-mysql/pom.xml      | 14 ++++++++-----
 composites/ebean-nuodb/pom.xml      | 14 ++++++++-----
 composites/ebean-oracle/pom.xml     | 14 ++++++++-----
 composites/ebean-postgres/pom.xml   | 14 ++++++++-----
 composites/ebean-sqlite/pom.xml     | 14 ++++++++-----
 composites/ebean-sqlserver/pom.xml  | 14 ++++++++-----
 composites/ebean-yugabyte/pom.xml   | 14 ++++++++-----
 composites/ebean/pom.xml            | 16 +++++++++------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 32 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-csv-reader/pom.xml            |  8 ++++----
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 12 +++++------
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 ++++++++++++++++-------------
 platforms/clickhouse/pom.xml        |  8 ++++++--
 platforms/db2/pom.xml               |  8 ++++++--
 platforms/h2/pom.xml                |  8 ++++++--
 platforms/hana/pom.xml              |  8 ++++++--
 platforms/hsqldb/pom.xml            |  8 ++++++--
 platforms/mariadb/pom.xml           | 10 ++++++---
 platforms/mysql/pom.xml             |  8 ++++++--
 platforms/nuodb/pom.xml             |  8 ++++++--
 platforms/oracle/pom.xml            |  8 ++++++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++++++--
 platforms/sqlanywhere/pom.xml       |  8 ++++++--
 platforms/sqlite/pom.xml            |  8 ++++++--
 platforms/sqlserver/pom.xml         |  8 ++++++--
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 47 files changed, 303 insertions(+), 191 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 325a08b36..e3dd99251 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index e54b7fb54..7858025b9 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index b7ca8580b..80f3054ac 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 34ff1b3d1..d5f532d6c 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 17778f995..e58b15861 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 48a633bcf..83f68d6a1 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index a773aea58..a255ff89d 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index e6390806a..1871c98a1 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index d35c38ca6..d9936027d 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 9681d4079..cab645d3f 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index ab98db436..0f8f415da 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 120ad3635..52e45303b 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index f21c70ef0..24cf4dda2 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 9bf3fe041..e8d4a223b 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,19 +16,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -41,14 +41,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index ddad731da..c2720f37c 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 574614a47..dd09f77f8 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index cd8fe3659..31424e3ac 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.3</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index d8d18b0a8..7a516e34b 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,94 +89,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.3</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index f761398ee..926e285f1 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index d897a28f6..f40bc1313 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,14 +15,14 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.3</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -143,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index 1dd91c9b6..dae7cc72e 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 36f5d3340..cbe81f10c 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 546fd122b..b7933d4bf 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 9e965ef28..de8e437e0 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.3</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index 769d89dc6..b2ca9b4fe 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index e561b7b6b..afa05d44f 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 174e0274a..4a08d858a 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index a0f50b261..ab0904b3b 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 4c50ebdc2..9637c5901 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -105,14 +105,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 3ed0a8dca..62a3e6d15 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index b0bd37bb3..ff30af61d 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,68 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 4f0a22382..17cd11446 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 18bc780c6..cd952bbba 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 5e51d404b..32cc1e995 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,4 +34,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 69b408505..d1ff18923 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 3d429da78..3bcfd7ad1 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 0f2efa0f7..756d8de08 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,14 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 5a73ba502..9476c5fe6 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 4f7b459f5..0f381448c 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 804fe28bd..8f504d26b 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 0ddefb398..141b4185c 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index e621f016f..4c5b88606 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 003337cd2..a50720753 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 42bcc1b68..c6817030f 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 7ebf81726..9388474d2 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.3</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.9.3</tag>
+  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 7f9ef7b08..36879573e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.9.3-SNAPSHOT</version>
+  <version>13.9.3</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.9.3</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index a400130dd..5e4d3d93d 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.3</version>
   </parent>
 
   <name>querybean generator</name>

From 993607ef4b85594a71a3d7c8103615601245759c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Sep 2022 11:18:25 +1200
Subject: [PATCH 110/127] [maven-release-plugin] prepare for next development
 iteration

---
 composites/ebean-clickhouse/pom.xml | 14 +++++--------
 composites/ebean-cockroach/pom.xml  | 14 +++++--------
 composites/ebean-db2/pom.xml        | 14 +++++--------
 composites/ebean-h2/pom.xml         | 14 +++++--------
 composites/ebean-hana/pom.xml       | 14 +++++--------
 composites/ebean-mariadb/pom.xml    | 14 +++++--------
 composites/ebean-mysql/pom.xml      | 14 +++++--------
 composites/ebean-nuodb/pom.xml      | 14 +++++--------
 composites/ebean-oracle/pom.xml     | 14 +++++--------
 composites/ebean-postgres/pom.xml   | 14 +++++--------
 composites/ebean-sqlite/pom.xml     | 14 +++++--------
 composites/ebean-sqlserver/pom.xml  | 14 +++++--------
 composites/ebean-yugabyte/pom.xml   | 14 +++++--------
 composites/ebean/pom.xml            | 16 ++++++---------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 ++++----
 ebean-bom/pom.xml                   | 32 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 +++++++--------
 ebean-csv-reader/pom.xml            |  8 ++++----
 ebean-ddl-generator/pom.xml         |  8 ++++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++------
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-postgis/pom.xml               |  8 ++++----
 ebean-querybean/pom.xml             | 10 ++++-----
 ebean-redis/pom.xml                 | 12 +++++------
 ebean-test/pom.xml                  | 12 +++++------
 kotlin-querybean-generator/pom.xml  | 10 ++++-----
 platforms/all/pom.xml               | 32 +++++++++++++----------------
 platforms/clickhouse/pom.xml        |  8 ++------
 platforms/db2/pom.xml               |  8 ++------
 platforms/h2/pom.xml                |  8 ++------
 platforms/hana/pom.xml              |  8 ++------
 platforms/hsqldb/pom.xml            |  8 ++------
 platforms/mariadb/pom.xml           | 10 +++------
 platforms/mysql/pom.xml             |  8 ++------
 platforms/nuodb/pom.xml             |  8 ++------
 platforms/oracle/pom.xml            |  8 ++------
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++------
 platforms/sqlanywhere/pom.xml       |  8 ++------
 platforms/sqlite/pom.xml            |  8 ++------
 platforms/sqlserver/pom.xml         |  8 ++------
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 47 files changed, 191 insertions(+), 303 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index e3dd99251..710a089c3 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 7858025b9..b59b4db03 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 80f3054ac..c9d16d3a0 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index d5f532d6c..9384f375c 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index e58b15861..47e20b851 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 83f68d6a1..0de3b3686 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index a255ff89d..cad1dc4a3 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 1871c98a1..0edd97f44 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index d9936027d..8d0cc9161 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index cab645d3f..88784375b 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 0f8f415da..6d29ace26 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 52e45303b..26ec67fb6 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 24cf4dda2..29afb0130 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index e8d4a223b..d14737272 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,19 +16,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -41,18 +41,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index c2720f37c..665c39528 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index dd09f77f8..cdbff8ef0 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 31424e3ac..49d2d99bf 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 7a516e34b..b6da6d42e 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,94 +89,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.3</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 926e285f1..bb8661018 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index f40bc1313..f26f2503f 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,14 +15,14 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -143,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index dae7cc72e..9cf2cc9e2 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index cbe81f10c..0f0ac9057 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index b7933d4bf..7b5ea4278 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index de8e437e0..7ba250364 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index b2ca9b4fe..8fb4e731c 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index afa05d44f..33ef6d878 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 4a08d858a..bccbbc42b 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index ab0904b3b..fc0791897 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 9637c5901..e407707eb 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -105,14 +105,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 62a3e6d15..283865002 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index ff30af61d..bb772dc27 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,68 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 17cd11446..3d18d32d0 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index cd952bbba..4ead949f7 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 32cc1e995..1b8974243 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,8 +34,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index d1ff18923..087f752be 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 3bcfd7ad1..92aafa464 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 756d8de08..a68a0c3ed 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 9476c5fe6..c59096bd8 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 0f381448c..3bdf5ab03 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 8f504d26b..7625bbc21 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 141b4185c..150ba049f 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 4c5b88606..b7ed11ba7 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index a50720753..fd92922a6 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index c6817030f..292599c52 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 9388474d2..ac73cd497 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.3</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.9.3</tag>
-  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 36879573e..344c1d884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.9.3</version>
+  <version>13.9.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.9.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 5e4d3d93d..a7775f0e3 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 62a055ef1f27a703d472f3fef9954c1074c24abb Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Sep 2022 11:37:52 +1200
Subject: [PATCH 111/127] Bump to 13.9.4-SNAPSHOT after release

---
 ebean-kotlin/pom.xml      | 6 +++---
 tests/test-java16/pom.xml | 6 +++---
 tests/test-kotlin/pom.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index f3bb1a351..22505bb94 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 5a0098403..978887ff5 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.9.3-SNAPSHOT</version>
+              <version>13.9.4-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 717288b85..8c59f9ef2 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From 9d9960ded2297a4c238e6484152a85e02537a217 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Sep 2022 08:41:05 +1200
Subject: [PATCH 112/127] Bump test-java16 to use
 io.ebean.tile:enhancement:13.9.4

Plus add a @Transient field in there for the constructor to deal with
---
 tests/test-java16/pom.xml                                   | 2 +-
 .../src/main/java/org/example/records/Course.java           | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 978887ff5..c247a4eea 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -66,7 +66,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.9.3</tile>
+            <tile>io.ebean.tile:enhancement:13.9.4</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/tests/test-java16/src/main/java/org/example/records/Course.java b/tests/test-java16/src/main/java/org/example/records/Course.java
index 90e725416..e3798c02c 100644
--- a/tests/test-java16/src/main/java/org/example/records/Course.java
+++ b/tests/test-java16/src/main/java/org/example/records/Course.java
@@ -4,6 +4,9 @@ import io.ebean.annotation.Length;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.HashMap;
+import java.util.Map;
 
 @Entity
 @Table(name = "course")
@@ -15,6 +18,9 @@ public class Course extends BaseModel {
   @Length(400)
   String summary;
 
+  @Transient
+  private final Map someCache = new HashMap();
+
   public Course(String name) {
     this.name = name;
   }

From 7affd200926245cac5def30d8d3ef7254712fc49 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Thu, 15 Sep 2022 10:31:58 +1200
Subject: [PATCH 113/127] Bump ebean-agent to 13.9.4

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 344c1d884..422b83f0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.9.3</ebean-agent.version>
-    <ebean-maven-plugin.version>13.9.3</ebean-maven-plugin.version>
+    <ebean-agent.version>13.9.4</ebean-agent.version>
+    <ebean-maven-plugin.version>13.9.4</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

From ea341a556d92cad059b76714e0459de1834084f9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Sep 2022 13:53:45 +1200
Subject: [PATCH 114/127] Bump postgresql to 42.5.0

---
 ebean-core/pom.xml    | 2 +-
 ebean-postgis/pom.xml | 2 +-
 ebean-test/pom.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index f26f2503f..08e75a765 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.4.1</version>
+      <version>42.5.0</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 33ef6d878..6ae191b66 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.4.1</version>
+      <version>42.5.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index e407707eb..b9d1615b0 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -169,7 +169,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.4.1</version>
+      <version>42.5.0</version>
       <exclusions>
         <exclusion>
           <groupId>org.checkerframework</groupId>

From 5a49041a3b7c9ae36ee5424448a472b113460176 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 23 Sep 2022 13:54:17 +1200
Subject: [PATCH 115/127] Tidy test UserInterestLiveKey, final with accessors

---
 .../tests/model/embedded/UserInterestLiveKey.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java
index 52b6583cd..b67046834 100644
--- a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java
+++ b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java
@@ -4,7 +4,7 @@ import javax.persistence.Embeddable;
 import java.util.Objects;
 
 @Embeddable
-public class UserInterestLiveKey {
+public final class UserInterestLiveKey {
 
   private long userId;
   private long liveId;
@@ -14,13 +14,20 @@ public class UserInterestLiveKey {
     this.liveId = liveId;
   }
 
+  public long userId() {
+    return userId;
+  }
+
+  public long liveId() {
+    return liveId;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     UserInterestLiveKey that = (UserInterestLiveKey) o;
-    return userId == that.userId &&
-      liveId == that.liveId;
+    return userId == that.userId && liveId == that.liveId;
   }
 
   @Override

From 8e02dedf9ff9e748fe5b5a82ed62d6ff45623256 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Oct 2022 08:14:12 +1300
Subject: [PATCH 116/127] #2856 - @DbArray - improve bind logging, non-null
 arrays auto bind null to [] so improve bind logging to reflect that

---
 .../java/io/ebeaninternal/server/deploy/BeanProperty.java     | 4 ++++
 .../java/io/ebeaninternal/server/persist/dml/DmlHandler.java  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
index 99765ff5e..8c1b208df 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java
@@ -927,6 +927,10 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return alreadyDirty || value != null && scalarType.isDirty(value);
   }
 
+  public boolean isArrayType() {
+    return scalarType instanceof ScalarTypeArray;
+  }
+
   /**
    * Return the scalarType.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
index c7845c6f8..58ec931fc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java
@@ -217,6 +217,8 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
       }
       if (prop.isLob()) {
         bindLog.append("[LOB]");
+      } else if (value == null && !prop.isNullable() && prop.isArrayType()) {
+        bindLog.append("[]"); // null bound as empty array
       } else {
         String sv = String.valueOf(value);
         if (sv.length() > 50) {

From 227968ef8e87980f16f87406721b160042274266 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Oct 2022 08:16:43 +1300
Subject: [PATCH 117/127] #2857 - @DbArray - slight performance optimisation
 for empty array

---
 .../server/type/ScalarTypeArrayBase.java              |  2 ++
 .../server/type/ScalarTypeArrayList.java              | 10 ++--------
 .../server/type/ScalarTypeArrayListH2.java            |  4 +---
 .../ebeaninternal/server/type/ScalarTypeArraySet.java | 11 ++---------
 .../server/type/ScalarTypeArraySetH2.java             |  4 +---
 5 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
index 87d96187b..1ff82ee3f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayBase.java
@@ -10,6 +10,8 @@ import java.sql.Types;
 
 abstract class ScalarTypeArrayBase<T> extends ScalarTypeJsonCollection<T> {
 
+  static final Object[] EMPTY_ARRAY = new Object[]{};
+
   ScalarTypeArrayBase(Class<T> type, int dbType, DocPropertyType docPropertyType, boolean nullable) {
     super(type, dbType, docPropertyType, nullable);
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
index cce8f185a..84fdab9fe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java
@@ -16,15 +16,9 @@ import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static java.util.Collections.EMPTY_LIST;
-
 /**
  * Type mapped for DB ARRAY type (Postgres only effectively).
  */
@@ -136,7 +130,7 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements ScalarTyp
     if (nullable) {
       binder.setNull(Types.ARRAY);
     } else {
-      binder.setArray(arrayType, toArray(EMPTY_LIST));
+      binder.setArray(arrayType, EMPTY_ARRAY);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
index c0651ded8..a72c5ec6e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
@@ -14,8 +14,6 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static java.util.Collections.EMPTY_LIST;
-
 /**
  * H2 database support for DB ARRAY.
  */
@@ -90,7 +88,7 @@ final class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
     if (nullable) {
       binder.setNull(Types.ARRAY);
     } else {
-      binder.setObject(toArray(EMPTY_LIST));
+      binder.setObject(EMPTY_ARRAY);
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
index 3a9b69849..2929391cb 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java
@@ -15,16 +15,9 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static java.util.Collections.EMPTY_SET;
-
 /**
  * Type mapped for DB ARRAY type (Postgres only effectively).
  */
@@ -125,7 +118,7 @@ class ScalarTypeArraySet extends ScalarTypeArrayBase<Set> implements ScalarTypeA
     if (nullable) {
       binder.setNull(Types.ARRAY);
     } else {
-      binder.setArray(arrayType, toArray(EMPTY_SET));
+      binder.setArray(arrayType, EMPTY_ARRAY);
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
index 1d5c78553..874eda11b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
@@ -13,8 +13,6 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static java.util.Collections.EMPTY_SET;
-
 /**
  * H2 database support for DB ARRAY.
  */
@@ -84,7 +82,7 @@ final class ScalarTypeArraySetH2 extends ScalarTypeArraySet {
     if (nullable) {
       binder.setNull(Types.ARRAY);
     } else {
-      binder.setObject(toArray(EMPTY_SET));
+      binder.setObject(EMPTY_ARRAY);
     }
   }
 }

From 475f9374213d13e4fdab0c52184465b553cc7471 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Oct 2022 11:08:49 +1300
Subject: [PATCH 118/127] #2858 - Example for entity-field-access

---
 ebean-querybean/pom.xml                                     | 2 +-
 .../src/test/java/org/example/domain/Customer.java          | 4 ++--
 ebean-querybean/src/test/java/org/querytest/QOrderTest.java | 5 ++---
 ebean-querybean/src/test/resources/ebean.mf                 | 1 +
 pom.xml                                                     | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index bccbbc42b..4af8ac309 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -107,7 +107,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.6.5</tile>
+            <tile>io.ebean.tile:enhancement:13.10.0</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/ebean-querybean/src/test/java/org/example/domain/Customer.java b/ebean-querybean/src/test/java/org/example/domain/Customer.java
index 453b71818..4f843ffb7 100644
--- a/ebean-querybean/src/test/java/org/example/domain/Customer.java
+++ b/ebean-querybean/src/test/java/org/example/domain/Customer.java
@@ -46,12 +46,12 @@ public class Customer extends BaseModel {
 
   boolean inactive;
 
-  PhoneNumber phoneNumber;
+  public PhoneNumber phoneNumber;
 
   ValidEmail email;
 
   @Column(length = 100)
-  String name;
+  public String name;
 
   Date registered;
 
diff --git a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
index 09ef00aa2..7cc9d3127 100644
--- a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
+++ b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
@@ -215,10 +215,9 @@ public class QOrderTest {
   }
 
   private static void setupData() {
-
     customer = new Customer();
-    customer.setName("Fred");
-    customer.setPhoneNumber(new PhoneNumber("Ph1"));
+    customer.name = "Fred";
+    customer.phoneNumber = new PhoneNumber("Ph1");
     customer.save();
 
     order = new Order();
diff --git a/ebean-querybean/src/test/resources/ebean.mf b/ebean-querybean/src/test/resources/ebean.mf
index 90beca56f..9f7856f61 100644
--- a/ebean-querybean/src/test/resources/ebean.mf
+++ b/ebean-querybean/src/test/resources/ebean.mf
@@ -2,3 +2,4 @@ entity-packages: org.example.domain
 querybean-packages: org.example.domain,org.querytest
 debug: 0
 synthetic: false
+entity-field-access: true
diff --git a/pom.xml b/pom.xml
index 422b83f0c..b00a5d7ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,14 +43,14 @@
     <h2database.version>2.1.214</h2database.version>
     <ebean-persistence-api.version>3.0</ebean-persistence-api.version>
     <ebean-types.version>3.0</ebean-types.version>
-    <ebean-annotation.version>8.2</ebean-annotation.version>
+    <ebean-annotation.version>8.3</ebean-annotation.version>
     <ebean-ddl-runner.version>2.2</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.9.4</ebean-agent.version>
-    <ebean-maven-plugin.version>13.9.4</ebean-maven-plugin.version>
+    <ebean-agent.version>13.10.0</ebean-agent.version>
+    <ebean-maven-plugin.version>13.10.0</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

From 9a25fb584ccab7ce0d55e3eb153f329304a9cefa Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Oct 2022 11:14:12 +1300
Subject: [PATCH 119/127] #2855 - @DbArray not allowing null to be persisted,
 stores empty list instead

Currently, this bug fix needs to be enabled explicitly via ebean.mf with:

allow-nullable-dbarray: true

We will look to enable this bug fix by default shortly noting that some code
will see a behaviour change. We need to publicise it well when we do turn
this on by default.

This bug fix is actually in ebean-agent 13.10.0 and all this change in ebean-core
does is read the new `@DbArray(nullable=false)` attribute [as a new alternative to
using `@NotNull` or `@Column(nullable=false)`]
---
 .../server/deploy/parse/DeployUtil.java       |  5 ++++
 ebean-test/pom.xml                            |  2 +-
 .../org/tests/model/array/EArrayBean.java     |  8 +++----
 .../tests/model/array/TestDbArray_basic.java  | 23 ++++++++++++++++++-
 ebean-test/src/test/resources/ebean.mf        |  1 +
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
index c20c0ad86..031aef1d5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java
@@ -171,6 +171,11 @@ public final class DeployUtil {
    * Set the DbArray type (effectively Postgres only).
    */
   void setDbArray(DeployBeanProperty prop, DbArray dbArray) {
+    if (!dbArray.nullable()) {
+      // Non-nullable ScalarTypeArray's will auto bind null to empty array, we need to
+      // set nullable(false) before the ScalarTypeArray is determined and assigned
+      prop.setNullable(false);
+    }
     Class<?> type = prop.getPropertyType();
     ScalarType<?> scalarType = typeManager.getArrayScalarType(type, prop.getGenericType(), prop.isNullable());
     if (scalarType == null) {
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index b9d1615b0..74cf66328 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -272,7 +272,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.6.5</tile>
+            <tile>io.ebean.tile:enhancement:13.10.0</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
index 2dcd62e76..a9e3f4431 100644
--- a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
+++ b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java
@@ -46,14 +46,14 @@ public class EArrayBean {
   @DbArray
   List<Float> floats;
 
-  @DbArray
-  List<Status> statuses;
+  @DbArray(nullable = false)
+  List<Status> statuses = new ArrayList<>();
 
   @DbArray
   List<VarcharEnum> vcEnums = new ArrayList<>();
 
-  @DbArray
-  List<IntEnum> intEnums = new ArrayList<>();
+  @DbArray @NotNull
+  List<IntEnum> intEnums;
 
   @DbArray
   Set<Status> status2;
diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
index 2f04f31ac..aee5a954f 100644
--- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -28,6 +28,8 @@ class TestDbArray_basic extends BaseTestCase {
     DB.find(EArrayBean.class).delete();
     bean.setName("some stuff");
     assertThat(bean.getStatuses()).as("DbArray is auto initialised").isNotNull();
+    assertThat(bean.getIntEnums()).as("DbArray is auto initialised").isNotNull();
+    assertThat(bean.getUids()).as("DbArray is auto initialised").isNotNull();
 
     List<String> phNumbers = bean.getPhoneNumbers();
     phNumbers.add("4321");
@@ -170,7 +172,26 @@ class TestDbArray_basic extends BaseTestCase {
     bean.setOtherIds(null);
 
     DB.save(bean);
-    DB.delete(bean);
+
+    EArrayBean found = DB.find(EArrayBean.class, bean.getId());
+    assertThat(found.getPhoneNumbers()).isNull();
+    assertThat(found.getStatuses()).isEmpty();
+    assertThat(found.getIntEnums()).isEmpty();
+    assertThat(found.getUids()).isEmpty();
+
+    found.setName("some nulls 2");
+    DB.save(found);
+
+    EArrayBean found2 = DB.find(EArrayBean.class)
+      .where()
+      .eq("id", bean.getId())
+      .isNull("phoneNumbers")
+      .findOne();
+
+    assertThat(found2).isNotNull();
+    assertThat(found2.getPhoneNumbers()).isNull();
+
+    DB.delete(found);
   }
 
   @Test
diff --git a/ebean-test/src/test/resources/ebean.mf b/ebean-test/src/test/resources/ebean.mf
index fc2fd6902..9bb12d1a5 100644
--- a/ebean-test/src/test/resources/ebean.mf
+++ b/ebean-test/src/test/resources/ebean.mf
@@ -4,4 +4,5 @@ entity-packages: org,misc
 transactional-packages: org
 querybean-packages: none
 synthetic: true
+allow-nullable-dbarray: true
 

From 6c354357ff02915b17c682dc90c4c1430472098f Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Oct 2022 12:57:45 +1300
Subject: [PATCH 120/127] Update and fix pom versions after merge of older PR

---
 composites/ebean/pom.xml       | 4 ++--
 ebean-bom/pom.xml              | 4 ++--
 ebean-jackson-jsonnode/pom.xml | 4 ++--
 ebean-jackson-mapper/pom.xml   | 4 ++--
 ebean-test/pom.xml             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index ca1393dc6..af66a0b87 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -34,13 +34,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index cba3f7ed8..79b8d7ec4 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -119,13 +119,13 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.9.3-SNAPSHOT</version>
+        <version>13.9.4-SNAPSHOT</version>
       </dependency>
 
       <dependency>
diff --git a/ebean-jackson-jsonnode/pom.xml b/ebean-jackson-jsonnode/pom.xml
index a77ddcdcc..22f1b751e 100644
--- a/ebean-jackson-jsonnode/pom.xml
+++ b/ebean-jackson-jsonnode/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-jackson-jsonnode</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml
index 9371f4a86..b5dcd8006 100644
--- a/ebean-jackson-mapper/pom.xml
+++ b/ebean-jackson-mapper/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.3-SNAPSHOT</version>
+    <version>13.9.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index e44f0260c..39fbb836e 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -112,14 +112,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.9.3-SNAPSHOT</version>
+      <version>13.9.4-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From 9c64a69b8cbfd5090d37be48b56c645df99a7676 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Oct 2022 13:13:09 +1300
Subject: [PATCH 121/127] Bump to 13.10.0-SNAPSHOT

---
 composites/ebean-clickhouse/pom.xml | 10 ++++----
 composites/ebean-cockroach/pom.xml  | 10 ++++----
 composites/ebean-db2/pom.xml        | 10 ++++----
 composites/ebean-h2/pom.xml         | 10 ++++----
 composites/ebean-hana/pom.xml       | 10 ++++----
 composites/ebean-mariadb/pom.xml    | 10 ++++----
 composites/ebean-mysql/pom.xml      | 10 ++++----
 composites/ebean-nuodb/pom.xml      | 10 ++++----
 composites/ebean-oracle/pom.xml     | 10 ++++----
 composites/ebean-postgres/pom.xml   | 10 ++++----
 composites/ebean-sqlite/pom.xml     | 10 ++++----
 composites/ebean-sqlserver/pom.xml  | 10 ++++----
 composites/ebean-yugabyte/pom.xml   | 10 ++++----
 composites/ebean/pom.xml            | 16 ++++++-------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  6 ++---
 ebean-bom/pom.xml                   | 36 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 14 +++++------
 ebean-csv-reader/pom.xml            |  8 +++----
 ebean-ddl-generator/pom.xml         |  8 +++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 10 ++++----
 ebean-jackson-jsonnode/pom.xml      |  4 ++--
 ebean-jackson-mapper/pom.xml        |  4 ++--
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-kotlin/pom.xml                |  6 ++---
 ebean-postgis/pom.xml               |  8 +++----
 ebean-querybean/pom.xml             | 10 ++++----
 ebean-redis/pom.xml                 | 12 +++++-----
 ebean-test/pom.xml                  | 16 ++++++-------
 kotlin-querybean-generator/pom.xml  | 10 ++++----
 platforms/all/pom.xml               | 28 +++++++++++-----------
 platforms/clickhouse/pom.xml        |  4 ++--
 platforms/db2/pom.xml               |  4 ++--
 platforms/h2/pom.xml                |  4 ++--
 platforms/hana/pom.xml              |  4 ++--
 platforms/hsqldb/pom.xml            |  4 ++--
 platforms/mariadb/pom.xml           |  6 ++---
 platforms/mysql/pom.xml             |  4 ++--
 platforms/nuodb/pom.xml             |  4 ++--
 platforms/oracle/pom.xml            |  4 ++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  4 ++--
 platforms/sqlanywhere/pom.xml       |  4 ++--
 platforms/sqlite/pom.xml            |  4 ++--
 platforms/sqlserver/pom.xml         |  4 ++--
 pom.xml                             |  2 +-
 querybean-generator/pom.xml         |  2 +-
 tests/test-java16/pom.xml           |  6 ++---
 tests/test-kotlin/pom.xml           |  4 ++--
 52 files changed, 205 insertions(+), 205 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 710a089c3..39e279052 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index b59b4db03..beebdca7f 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index c9d16d3a0..1fb06e81b 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 9384f375c..2ff8bb607 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 47e20b851..3f7f4e36b 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 0de3b3686..1bccdab16 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index cad1dc4a3..490eab546 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 0edd97f44..12e750e56 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 8d0cc9161..87a70a850 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 88784375b..fe98b5b70 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 6d29ace26..764903e7a 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 26ec67fb6..a5dfec828 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 29afb0130..68e8c7b6f 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,13 +35,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index af66a0b87..d347d05fa 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,31 +16,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -53,13 +53,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/pom.xml b/composites/pom.xml
index 665c39528..fb8f157c2 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index cdbff8ef0..35f1dda84 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 49d2d99bf..2ad2cb270 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 79b8d7ec4..00ba8d167 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,106 +89,106 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.9.4-SNAPSHOT</version>
+        <version>13.10.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index e27bffb9a..675432e99 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 08e75a765..b48c1fca1 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -143,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index 9cf2cc9e2..6a43ea791 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 0f0ac9057..eb8cb8979 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 7b5ea4278..d0935cb47 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 7ba250364..448a0b1e8 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <scm>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-jackson-jsonnode/pom.xml b/ebean-jackson-jsonnode/pom.xml
index 22f1b751e..5e6ddf525 100644
--- a/ebean-jackson-jsonnode/pom.xml
+++ b/ebean-jackson-jsonnode/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-jackson-jsonnode</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml
index b5dcd8006..dd387292b 100644
--- a/ebean-jackson-mapper/pom.xml
+++ b/ebean-jackson-mapper/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index 8fb4e731c..d1fb5c2d7 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index 22505bb94..408c7c19a 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 6ae191b66..28af54254 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 4af8ac309..9c2c37adc 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index fc0791897..268f70119 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 39fbb836e..f41b02a65 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -105,28 +105,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 283865002..ae90f3ab0 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index bb772dc27..20b0c911a 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,67 +14,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 3d18d32d0..78fbffdf9 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 4ead949f7..927ef3e11 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 1b8974243..70b50dcc6 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 087f752be..0c303983b 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 92aafa464..8879315ae 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index a68a0c3ed..9086757f1 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,13 +14,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index c59096bd8..64ef94a32 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 3bdf5ab03..ff2c20a11 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 7625bbc21..e5aee9e4c 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 150ba049f..8f4cedc0f 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index b7ed11ba7..6b5d15c76 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index fd92922a6..af9798ae5 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 292599c52..4e95a7ad7 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index ac73cd497..21d2cd681 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index f3ceafc4e..a6a9dbf18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.9.4-SNAPSHOT</version>
+  <version>13.10.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index a7775f0e3..898a9cfd9 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.9.4-SNAPSHOT</version>
+    <version>13.10.0-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index c247a4eea..36da1b41f 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.9.4-SNAPSHOT</version>
+              <version>13.10.0-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 8c59f9ef2..30933768d 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.9.4-SNAPSHOT</version>
+      <version>13.10.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From 27504a4dae0b64b55ae055707ec2336856628555 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Oct 2022 13:31:10 +1300
Subject: [PATCH 122/127] [maven-release-plugin] prepare release
 ebean-parent-13.10.0

---
 composites/ebean-clickhouse/pom.xml | 14 +++++++----
 composites/ebean-cockroach/pom.xml  | 14 +++++++----
 composites/ebean-db2/pom.xml        | 14 +++++++----
 composites/ebean-h2/pom.xml         | 14 +++++++----
 composites/ebean-hana/pom.xml       | 14 +++++++----
 composites/ebean-mariadb/pom.xml    | 14 +++++++----
 composites/ebean-mysql/pom.xml      | 14 +++++++----
 composites/ebean-nuodb/pom.xml      | 14 +++++++----
 composites/ebean-oracle/pom.xml     | 14 +++++++----
 composites/ebean-postgres/pom.xml   | 14 +++++++----
 composites/ebean-sqlite/pom.xml     | 14 +++++++----
 composites/ebean-sqlserver/pom.xml  | 14 +++++++----
 composites/ebean-yugabyte/pom.xml   | 14 +++++++----
 composites/ebean/pom.xml            | 20 +++++++++-------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 +++----
 ebean-bom/pom.xml                   | 36 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 ++++++-------
 ebean-csv-reader/pom.xml            |  8 +++----
 ebean-ddl-generator/pom.xml         |  8 +++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++-----
 ebean-jackson-jsonnode/pom.xml      |  8 +++----
 ebean-jackson-mapper/pom.xml        |  8 +++----
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-postgis/pom.xml               |  8 +++----
 ebean-querybean/pom.xml             | 10 ++++----
 ebean-redis/pom.xml                 | 12 +++++-----
 ebean-test/pom.xml                  | 16 ++++++-------
 kotlin-querybean-generator/pom.xml  | 10 ++++----
 platforms/all/pom.xml               | 32 ++++++++++++++-----------
 platforms/clickhouse/pom.xml        |  8 +++++--
 platforms/db2/pom.xml               |  8 +++++--
 platforms/h2/pom.xml                |  8 +++++--
 platforms/hana/pom.xml              |  8 +++++--
 platforms/hsqldb/pom.xml            |  8 +++++--
 platforms/mariadb/pom.xml           | 10 +++++---
 platforms/mysql/pom.xml             |  8 +++++--
 platforms/nuodb/pom.xml             |  8 +++++--
 platforms/oracle/pom.xml            |  8 +++++--
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 +++++--
 platforms/sqlanywhere/pom.xml       |  8 +++++--
 platforms/sqlite/pom.xml            |  8 +++++--
 platforms/sqlserver/pom.xml         |  8 +++++--
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 49 files changed, 315 insertions(+), 207 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 39e279052..f3b439f1b 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index beebdca7f..f0ad5af24 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 1fb06e81b..b8a553872 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 2ff8bb607..60cce77b4 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 3f7f4e36b..6f1f955b1 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 1bccdab16..7cc2cfbf8 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 490eab546..7692033a4 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 12e750e56..567c7962c 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 87a70a850..141cf038a 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index fe98b5b70..765d5d90c 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 764903e7a..aadbc8b6d 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index a5dfec828..87725a760 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 68e8c7b6f..2c925c2bd 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index d347d05fa..1c6ec2993 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,31 +16,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -53,14 +53,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index fb8f157c2..8eb01fd48 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 35f1dda84..8aac59494 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 2ad2cb270..49eb17c2f 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.10.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 00ba8d167..3c55b2a32 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,106 +89,106 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.10.0-SNAPSHOT</version>
+        <version>13.10.0</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 675432e99..b2b62b88f 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index b48c1fca1..08796e355 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,14 +15,14 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.10.0</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -143,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index 6a43ea791..c6690fd7f 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index eb8cb8979..322a67d03 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index d0935cb47..a9debf943 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 448a0b1e8..096f3d176 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.10.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-jackson-jsonnode/pom.xml b/ebean-jackson-jsonnode/pom.xml
index 5e6ddf525..1f1d980c4 100644
--- a/ebean-jackson-jsonnode/pom.xml
+++ b/ebean-jackson-jsonnode/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-jackson-jsonnode</artifactId>
@@ -16,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml
index dd387292b..495005d4c 100644
--- a/ebean-jackson-mapper/pom.xml
+++ b/ebean-jackson-mapper/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index d1fb5c2d7..e5a816f11 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 28af54254..37cb257f5 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 9c2c37adc..1869ecd80 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 268f70119..6294d786f 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index f41b02a65..dfcd9e07d 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -105,28 +105,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index ae90f3ab0..9002ecb84 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 20b0c911a..98e103741 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,68 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 78fbffdf9..49b2f8867 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 927ef3e11..0177115d3 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 70b50dcc6..e05ec34d9 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,4 +34,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 0c303983b..38866a959 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 8879315ae..7845e7490 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 9086757f1..7f15f0d12 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,14 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 64ef94a32..2db7847a7 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index ff2c20a11..f1a69135f 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index e5aee9e4c..cbda85847 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 8f4cedc0f..d5147a24b 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 6b5d15c76..11d857b2b 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index af9798ae5..bd4f671e2 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 4e95a7ad7..03f397950 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 21d2cd681..c5bc9c78e 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.10.0</tag>
+  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index a6a9dbf18..95a1d4a1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.10.0-SNAPSHOT</version>
+  <version>13.10.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.10.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 898a9cfd9..0ef7fc830 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.0</version>
   </parent>
 
   <name>querybean generator</name>

From 3c298a67ff0a14b8a7f696ad765460325d4d5b69 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 14 Oct 2022 13:31:18 +1300
Subject: [PATCH 123/127] [maven-release-plugin] prepare for next development
 iteration

---
 composites/ebean-clickhouse/pom.xml | 14 ++++-------
 composites/ebean-cockroach/pom.xml  | 14 ++++-------
 composites/ebean-db2/pom.xml        | 14 ++++-------
 composites/ebean-h2/pom.xml         | 14 ++++-------
 composites/ebean-hana/pom.xml       | 14 ++++-------
 composites/ebean-mariadb/pom.xml    | 14 ++++-------
 composites/ebean-mysql/pom.xml      | 14 ++++-------
 composites/ebean-nuodb/pom.xml      | 14 ++++-------
 composites/ebean-oracle/pom.xml     | 14 ++++-------
 composites/ebean-postgres/pom.xml   | 14 ++++-------
 composites/ebean-sqlite/pom.xml     | 14 ++++-------
 composites/ebean-sqlserver/pom.xml  | 14 ++++-------
 composites/ebean-yugabyte/pom.xml   | 14 ++++-------
 composites/ebean/pom.xml            | 20 +++++++---------
 composites/pom.xml                  |  2 +-
 ebean-api/pom.xml                   |  2 +-
 ebean-autotune/pom.xml              |  8 +++----
 ebean-bom/pom.xml                   | 36 ++++++++++++++---------------
 ebean-core-type/pom.xml             |  4 ++--
 ebean-core/pom.xml                  | 16 ++++++-------
 ebean-csv-reader/pom.xml            |  8 +++----
 ebean-ddl-generator/pom.xml         |  8 +++----
 ebean-externalmapping-api/pom.xml   |  2 +-
 ebean-externalmapping-xml/pom.xml   | 12 +++++-----
 ebean-jackson-jsonnode/pom.xml      |  4 ++--
 ebean-jackson-mapper/pom.xml        |  4 ++--
 ebean-joda-time/pom.xml             |  4 ++--
 ebean-postgis/pom.xml               |  8 +++----
 ebean-querybean/pom.xml             | 10 ++++----
 ebean-redis/pom.xml                 | 12 +++++-----
 ebean-test/pom.xml                  | 16 ++++++-------
 kotlin-querybean-generator/pom.xml  | 10 ++++----
 platforms/all/pom.xml               | 32 +++++++++++--------------
 platforms/clickhouse/pom.xml        |  8 ++-----
 platforms/db2/pom.xml               |  8 ++-----
 platforms/h2/pom.xml                |  8 ++-----
 platforms/hana/pom.xml              |  8 ++-----
 platforms/hsqldb/pom.xml            |  8 ++-----
 platforms/mariadb/pom.xml           | 10 +++-----
 platforms/mysql/pom.xml             |  8 ++-----
 platforms/nuodb/pom.xml             |  8 ++-----
 platforms/oracle/pom.xml            |  8 ++-----
 platforms/pom.xml                   |  2 +-
 platforms/postgres/pom.xml          |  8 ++-----
 platforms/sqlanywhere/pom.xml       |  8 ++-----
 platforms/sqlite/pom.xml            |  8 ++-----
 platforms/sqlserver/pom.xml         |  8 ++-----
 pom.xml                             |  4 ++--
 querybean-generator/pom.xml         |  2 +-
 49 files changed, 201 insertions(+), 313 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index f3b439f1b..29758dc5e 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index f0ad5af24..cae0bb35a 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index b8a553872..cece1db86 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 60cce77b4..be909354c 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 6f1f955b1..b16776d69 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 7cc2cfbf8..07112691b 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 7692033a4..7fa5080ab 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 567c7962c..01d6fb3ee 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 141cf038a..a6451554f 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 765d5d90c..e65fa5477 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index aadbc8b6d..823d3d387 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 87725a760..a4702098d 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 2c925c2bd..5222eed93 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 1c6ec2993..f524e247b 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,31 +16,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -53,18 +53,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 8eb01fd48..29c05f3ca 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 8aac59494..0770152d5 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 49eb17c2f..90d059712 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 3c55b2a32..618e44ba0 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,106 +89,106 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.10.0</version>
+        <version>13.10.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index b2b62b88f..866d3ec56 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 08796e355..ac73b3c69 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,14 +15,14 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -143,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml
index c6690fd7f..fce50e8e7 100644
--- a/ebean-csv-reader/pom.xml
+++ b/ebean-csv-reader/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 322a67d03..ec4a23456 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index a9debf943..90849e841 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 096f3d176..4ad095b63 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-jackson-jsonnode/pom.xml b/ebean-jackson-jsonnode/pom.xml
index 1f1d980c4..bb9959ba1 100644
--- a/ebean-jackson-jsonnode/pom.xml
+++ b/ebean-jackson-jsonnode/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-jackson-jsonnode</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml
index 495005d4c..24e4f274b 100644
--- a/ebean-jackson-mapper/pom.xml
+++ b/ebean-jackson-mapper/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml
index e5a816f11..f1196b140 100644
--- a/ebean-joda-time/pom.xml
+++ b/ebean-joda-time/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 37cb257f5..4e6abbfad 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 1869ecd80..747018585 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 6294d786f..5fc9f258d 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index dfcd9e07d..86f127f96 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -105,28 +105,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 9002ecb84..550421666 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 98e103741..b656bddd3 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,68 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 49b2f8867..ab5caf43e 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 0177115d3..af0b33ad1 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index e05ec34d9..d43c650cf 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -34,8 +34,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 38866a959..0aa150c5f 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 7845e7490..d5ec6492d 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 7f15f0d12..3cc22ae0a 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 2db7847a7..e1a4975d8 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index f1a69135f..7ef0f2768 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index cbda85847..fdd091771 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index d5147a24b..9dd4e98a1 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 11d857b2b..e2c37fae0 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index bd4f671e2..8ebba4625 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 03f397950..d4fcc8006 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index c5bc9c78e..dd074c9af 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.0</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.10.0</tag>
-  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 95a1d4a1b..14fd35aef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.10.0</version>
+  <version>13.10.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 0ef7fc830..97a4023e5 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From 8f9772e49336c968750a475ff9bd6d91250d98fb Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 17 Oct 2022 10:35:06 +1300
Subject: [PATCH 124/127] Bump to 13.10.1-SNAPSHOT after release

---
 ebean-kotlin/pom.xml      | 6 +++---
 tests/test-java16/pom.xml | 6 +++---
 tests/test-kotlin/pom.xml | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index 408c7c19a..1d6f391b4 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.0-SNAPSHOT</version>
+    <version>13.10.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 36da1b41f..ad13be467 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.10.0-SNAPSHOT</version>
+              <version>13.10.1-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 30933768d..1d6caa205 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.0-SNAPSHOT</version>
+      <version>13.10.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From f24f912693347d41cdfa8cca79fb17fb71df26a1 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Mon, 17 Oct 2022 11:19:34 +1300
Subject: [PATCH 125/127] Fix Postgres/Yugabyte test -
 TestDbArray_basic.asDto_withArray() for nullable DbArray #2855

---
 .../test/java/org/tests/model/array/TestDbArray_basic.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
index aee5a954f..89cd68095 100644
--- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -302,9 +302,12 @@ class TestDbArray_basic extends BaseTestCase {
     List<String> phNumbers = bean.getPhoneNumbers();
     phNumbers.add("4321");
     phNumbers.add("9823");
-    List<BigDecimal> decimals = bean.getDecimals();
+    assertThat(bean.getDecimals()).isNull();
+
+    List<BigDecimal> decimals = new ArrayList<>();
     decimals.add(BigDecimal.valueOf(1.23));
     decimals.add(BigDecimal.valueOf(4.56));
+    bean.setDecimals(decimals);
     DB.save(bean);
     // Data is saved correctly
 

From d710925cc7b2c9ba098caf354a43d72fae70f260 Mon Sep 17 00:00:00 2001
From: Noemi Praml <noemi.praml@foconis.de>
Date: Mon, 17 Oct 2022 15:31:30 +0200
Subject: [PATCH 126/127] possible Fix

---
 .../server/executor/DefaultBackgroundExecutor.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
index d7975e04b..47271bc38 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutor.java
@@ -106,23 +106,23 @@ public final class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
 
   @Override
   public ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, long initialDelay, long delay, TimeUnit unit) {
-    return schedulePool.scheduleWithFixedDelay(wrap(logExceptions(task)), initialDelay, delay, unit);
+    return schedulePool.scheduleWithFixedDelay(logExceptions(task), initialDelay, delay, unit);
   }
 
   @Override
   public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long initialDelay, long delay, TimeUnit unit) {
-    return schedulePool.scheduleAtFixedRate(wrap(logExceptions(task)), initialDelay, delay, unit);
+    return schedulePool.scheduleAtFixedRate(logExceptions(task), initialDelay, delay, unit);
   }
 
   @Override
   public ScheduledFuture<?> schedule(Runnable task, long delay, TimeUnit unit) {
-    return schedulePool.schedule(wrap(logExceptions(task)), delay, unit);
+    return schedulePool.schedule(logExceptions(task), delay, unit);
   }
 
   @Override
   public <V> ScheduledFuture<V> schedule(Callable<V> task, long delay, TimeUnit unit) {
     // Note: No "logExceptions" as we expect Future.get() by the invoker
-    return schedulePool.schedule(wrap(task), delay, unit);
+    return schedulePool.schedule(task, delay, unit);
   }
 
   @Override

From c855df8b8d6f707b11da03de2126abc6e5901581 Mon Sep 17 00:00:00 2001
From: Noemi Praml <noemi.praml@foconis.de>
Date: Tue, 18 Oct 2022 07:59:19 +0200
Subject: [PATCH 127/127] javadoc

---
 .../main/java/io/ebean/config/BackgroundExecutorWrapper.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ebean-api/src/main/java/io/ebean/config/BackgroundExecutorWrapper.java b/ebean-api/src/main/java/io/ebean/config/BackgroundExecutorWrapper.java
index b290e5863..28081c30f 100644
--- a/ebean-api/src/main/java/io/ebean/config/BackgroundExecutorWrapper.java
+++ b/ebean-api/src/main/java/io/ebean/config/BackgroundExecutorWrapper.java
@@ -6,6 +6,10 @@ import java.util.concurrent.Callable;
  * BackgroundExecutorWrapper that can be used to wrap tasks that are sent to background (i.e. another thread).
  * It should copy all necessary thread-local variables. See {@link MdcBackgroundExecutorWrapper} for implementation details.
  *
+ * Note: only tasks that are executed immediately (submit, execute) are wrapped. Periodic or scheduled tasks are not wrapped,
+ * as these may keep copied variables in memory either forever or until the scheduled task is finished.
+ * The caller is responsible to handle these cases.
+ *
  * @author Roland Praml, FOCONIS AG
  */
 public interface BackgroundExecutorWrapper {