From 3179aa23ea291717c969e4eb2b4ff336008f4007 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Tue, 12 Apr 2022 09:33:40 +0200
Subject: [PATCH 1/6] Sort DeployInheritInfo, so that DDL is deterministic

(cherry picked from commit 6412e060e6370444fad19a4cd573d6e94c488ee9)
---
 .../deploy/parse/DeployInheritInfo.java       | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

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 f82daa987..ef92648fb 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
@@ -7,12 +7,14 @@ import javax.persistence.DiscriminatorType;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 /**
  * Represents a node in the Inheritance tree.
  * Holds information regarding Super Subclass support.
  */
-public final class DeployInheritInfo {
+public final class DeployInheritInfo implements Comparable<DeployInheritInfo> {
 
   /**
    * the default discriminator column according to the JPA 1.0 spec.
@@ -27,7 +29,7 @@ public final class DeployInheritInfo {
   private String columnDefn;
   private final Class<?> type;
   private Class<?> parent;
-  private final ArrayList<DeployInheritInfo> children = new ArrayList<>();
+  private final Set<DeployInheritInfo> children = new TreeSet<>();
 
   /**
    * Create for a given type.
@@ -74,7 +76,7 @@ public final class DeployInheritInfo {
   /**
    * Return the child nodes.
    */
-  public List<DeployInheritInfo> children() {
+  public Set<DeployInheritInfo> children() {
     return children;
   }
 
@@ -251,7 +253,22 @@ public final class DeployInheritInfo {
 
   @Override
   public String toString() {
-    return "InheritInfo[" + type.getName() + "]" + " root[" + parent.getName() + "]" + " disValue[" + discriminatorStringValue + "]";
+    String root = parent == null ? null : parent.getName();
+    String name = type == null ? null : type.getName();
+    return "InheritInfo[" + name + "]" + " root[" + root + "]" + " disValue[" + discriminatorStringValue + "]";
+  }
+
+  @Override
+  public int compareTo(DeployInheritInfo o) {
+    if (o == this || o.discriminatorStringValue == null && discriminatorStringValue == null) {
+      return 0;
+    } else if (o.discriminatorStringValue == null) {
+      return 1;
+    } else if (discriminatorStringValue == null) {
+      return -1;
+    } else {
+      return discriminatorStringValue.compareTo(o.discriminatorStringValue);
+    }
   }
 
 }

From bdc936b63b6fa0bd936249746e6aa8d189ec18ed Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Apr 2022 21:23:05 +1200
Subject: [PATCH 2/6] [maven-release-plugin] prepare release
 ebean-parent-13.3.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  |  8 ++++----
 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, 293 insertions(+), 181 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 168c64b5d..036856cfc 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 0b11f8e63..884b35132 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 5af1fa1ef..05b7a888b 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index e27f722c1..28d8e5813 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 8e18af012..c11348728 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 311af73ee..7319e2caa 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 883e05f73..1dfbd4354 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 565aac29c..3229f4a71 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 159917357..d52cb6469 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 313d9fe07..b5ae0f5db 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index f89ebc5f1..a9b484dfb 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index ddfd35458..d97414c90 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 8b1a9b582..839b610cc 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 48e5146f8..6a55cabf7 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -35,14 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 8cf659c0c..448c66d00 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 280698ef9..7f7433678 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index b19e9e84b..0b77617e7 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.3.0-SNAPSHOT</version>
+    <version>13.3.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.3.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 4e1d40ef0..6c8242839 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,88 +71,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.3.0-SNAPSHOT</version>
+        <version>13.3.0</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index bfc7a9b9a..9adbedd80 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 5b8f5aba8..2b9b1f36c 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.3.0-SNAPSHOT</version>
+    <version>13.3.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.3.0</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index b9931c137..c6f336d0e 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 144f066e7..c1b9acf20 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 1722c1d61..354358216 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.3.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.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index b5c399b83..158c3f683 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index bfdb92ad7..938b726e6 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 32036c8bc..c2f0e6f2b 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 1ca3e3e77..41d0c56ef 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 3d2d7e1fe..a1e4c2c24 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 72f0b03bc..076c02d8b 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,68 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index ca1b257a6..4b462a140 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index c7cbca8d9..67600b112 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 2173463f7..522e347a8 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.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.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 9ac7e0008..67ee3405b 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 122853f1d..1cf24c90f 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index d8862a159..f51ab60de 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,14 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 279524149..fe8fa943c 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 2d51a3517..f668a9537 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index f881969d9..e7c582c12 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 50d668b17..3368f8d73 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 430399682..4eb559092 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 57f14f074..abaa2c9c5 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index b47d4707d..466d80471 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,8 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 1bf51b1ac..c1418508e 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.0</version>
     </dependency>
 
     <dependency>
@@ -25,4 +25,8 @@
     </dependency>
 
   </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.3.0</tag>
+  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index e5ccbe048..3b803d535 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.3.0-SNAPSHOT</version>
+  <version>13.3.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.3.0</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 167a610e3..71b227aa8 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.3.0-SNAPSHOT</version>
+    <version>13.3.0</version>
   </parent>
 
   <name>querybean generator</name>

From 526e476ba1958c0a44a3756848b736287141118c Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Apr 2022 21:23:12 +1200
Subject: [PATCH 3/6] [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  |  8 ++++----
 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, 181 insertions(+), 293 deletions(-)

diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 036856cfc..838cd761d 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 884b35132..ed902d0d8 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 05b7a888b..26e1ca1ab 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 28d8e5813..16a25b8ef 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index c11348728..5a380c065 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 7319e2caa..d83c273cc 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 1dfbd4354..09b6fb24f 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 3229f4a71..ba3e4a9f8 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index d52cb6469..d558a5b0f 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index b5ae0f5db..3f9d4085c 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index a9b484dfb..9cef6eb30 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index d97414c90..8a7e3d710 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 839b610cc..f9a25c775 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 6a55cabf7..93dac2314 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 448c66d00..b5737db90 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 7f7433678..d093864a0 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 0b77617e7..10c89fa2e 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.3.0</version>
+    <version>13.3.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.3.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.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 6c8242839..14d2b6d40 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,88 +71,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.3.0</version>
+        <version>13.3.1-SNAPSHOT</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 9adbedd80..14e9e36d4 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 2b9b1f36c..c5da1233f 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.3.0</version>
+    <version>13.3.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.3.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
@@ -41,19 +41,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -144,21 +144,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index c6f336d0e..16fd9d475 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.3.0</version>
+    <version>13.3.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.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index c1b9acf20..9966cdeaf 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.3.0</version>
+    <version>13.3.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 354358216..442818e3e 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.3.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.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 158c3f683..e0c9962e6 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 938b726e6..a06806e38 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index c2f0e6f2b..d6bc05cdc 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 41d0c56ef..844547ae6 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index a1e4c2c24..d382456d5 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 076c02d8b..48e23547d 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.3.0</version>
+    <version>13.3.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.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 4b462a140..773f7cce2 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 67600b112..1ecc98d2f 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 522e347a8..122dd9e64 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.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.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 67ee3405b..0b6d7e551 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 1cf24c90f..93e1a71c5 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.3.0</version>
+    <version>13.3.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.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index f51ab60de..86e246fee 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index fe8fa943c..92bc56ee9 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index f668a9537..b1fa00633 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index e7c582c12..8e1a9ccc4 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 3368f8d73..35c956ca1 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 4eb559092..8f58bed21 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index abaa2c9c5..a5996b85e 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 466d80471..c1dc81816 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,8 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index c1418508e..a27cfa255 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.0</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -25,8 +25,4 @@
     </dependency>
 
   </dependencies>
-
-  <scm>
-    <tag>ebean-parent-13.3.0</tag>
-  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 3b803d535..ce9260835 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.3.0</version>
+  <version>13.3.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.3.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 71b227aa8..caf1edae6 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.3.0</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
 
   <name>querybean generator</name>

From d348794d920f3b66470bb8323789de71c255054a Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 12 Apr 2022 21:47:00 +1200
Subject: [PATCH 4/6] Bump test modules to 13.3.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 b7fd2e89e..796862cb9 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.0-SNAPSHOT</version>
+    <version>13.3.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index c17b65724..e7c77fd1e 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.3.0-SNAPSHOT</version>
+              <version>13.3.1-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index dbcc41e9e..602b3902f 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -36,14 +36,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.0-SNAPSHOT</version>
+      <version>13.3.1-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

From 8c800e992d27ea7ab6c85d91c6a15297f86f03e8 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Tue, 12 Apr 2022 13:51:25 +0200
Subject: [PATCH 5/6] Fix beanCache order by & clear did not work

(cherry picked from commit 4dee827fda9d401f39beb18838c7fff60e0624ef)
---
 .../ebeaninternal/server/core/OrmQueryRequest.java |  6 +++---
 .../org/tests/query/orderby/TestOrderByClear.java  | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

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 6ff7e5acb..834ec2a04 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
@@ -524,7 +524,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     }
     if (result instanceof BeanList) {
       OrderBy<T> orderBy = query.getOrderBy();
-      if (orderBy != null) {
+      if (orderBy != null && !orderBy.isEmpty()) {
         // in memory sort after merging the cache hits with the DB hits
         beanDescriptor.sort(((BeanList<T>) result).getActualList(), orderBy.toStringFormat());
       }
@@ -543,7 +543,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   @Override
   public List<T> beanCacheHits() {
     OrderBy<T> orderBy = query.getOrderBy();
-    if (orderBy != null) {
+    if (orderBy != null && !orderBy.isEmpty()) {
       beanDescriptor.sort(cacheBeans, orderBy.toStringFormat());
     }
     return cacheBeans;
@@ -552,7 +552,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   @Override
   public <K> Map<K, T> beanCacheHitsAsMap() {
     OrderBy<T> orderBy = query.getOrderBy();
-    if (orderBy != null) {
+    if (orderBy != null && !orderBy.isEmpty()) {
       beanDescriptor.sort(cacheBeans, orderBy.toStringFormat());
     }
     return cacheBeansToMap();
diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java
index c0b7bfd7e..061e0da9f 100644
--- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java
+++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java
@@ -6,6 +6,7 @@ import io.ebean.OrderBy;
 import io.ebean.Query;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
+import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -37,5 +38,18 @@ public class TestOrderByClear extends BaseTestCase {
     assertTrue(sql.contains("order by t0.ship_date"));
 
   }
+  
+  @Test
+  public void testWithCache() {
+    ResetBasicData.reset();
+
+    Query<OrderDetail> query = DB.find(OrderDetail.class).where().idIn(1,2,3).query();
+    query.setUseCache(true);
+    query.findList();
+    query.order().asc("cretime").findList(); // hit cache
+    query.order().clear();
+    query.findList(); // hit cache again
+    
+  }
 
 }

From 0e548ec1c5acf3c707a45864e73e94e24a904d98 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 13 Apr 2022 10:40:55 +1200
Subject: [PATCH 6/6] Tidy test module poms

---
 ebean-kotlin/pom.xml      |  3 +--
 tests/test-java16/pom.xml | 24 ++++++++++++++++--------
 tests/test-kotlin/pom.xml |  5 ++---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index 796862cb9..4b81d57d6 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -2,19 +2,18 @@
 <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.3.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean-kotlin</artifactId>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <ebean-maven-plugin.version>12.14.1</ebean-maven-plugin.version>
     <kotlin.version>1.6.0</kotlin.version>
   </properties>
 
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index e7c77fd1e..234eae4a0 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -1,11 +1,7 @@
 <?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>-->
-<!--    <groupId>org.avaje</groupId>-->
-<!--    <artifactId>java11-oss</artifactId>-->
-<!--    <version>2.3</version>-->
-<!--  </parent>-->
 
   <groupId>io.ebean</groupId>
   <artifactId>test-java16</artifactId>
@@ -13,7 +9,6 @@
 
   <properties>
     <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-    <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
   <dependencies>
@@ -26,7 +21,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.10</version>
+      <version>1.2.11</version>
     </dependency>
 
     <dependency>
@@ -63,6 +58,19 @@
           </annotationProcessorPaths>
         </configuration>
       </plugin>
+
+      <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.3.0</tile>
+          </tiles>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 602b3902f..e31e19939 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>3.4</version>
+    <version>3.7</version>
     <relativePath/>
   </parent>
 
@@ -19,10 +19,9 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
 
-    <ebean-maven-plugin.version>12.14.1</ebean-maven-plugin.version>
+    <ebean-maven-plugin.version>13.3.0</ebean-maven-plugin.version>
     <kotlin.version>1.6.0</kotlin.version>
     <jackson.version>2.12.1</jackson.version>
-    <maven.deploy.skip>true</maven.deploy.skip>
   </properties>
 
   <dependencies>