diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index 5a33b052b..ca9cff63f 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index e2264d7f6..b23043bf4 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 2a4846aa2..e574c9eba 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 2822f2337..539938f5b 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 71180901f..809b3a5b9 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 4a2983302..78e48ca8b 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 101e3914c..5d91c1d55 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index d649f1f90..ba8cb5749 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 232125ac5..f28401eaa 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index dfb490f37..dc5c25f73 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 4b97a9e99..865ab6c34 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 4fd2f50fc..66f1e44e5 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 7ecba8168..5fb575a01 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 74e368187..195ea90fb 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 7592fbdee..1a1998ad1 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 2ab104c44..fdc0ace16 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 6d3896d4b..82c44cbe1 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 1f1eef17f..c6ca6d9db 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,94 +71,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-dbmigration-runner</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.3.1-FOC2-SNAPSHOT</version>
+        <version>13.3.1-FOC2</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index ae07663fb..4232048cd 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 4715a2336..e890f60b2 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,7 +15,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 
   <dependencies>
@@ -35,19 +35,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -138,21 +138,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-dbmigration-runner/pom.xml b/ebean-dbmigration-runner/pom.xml
index 6d921950a..452b4b62a 100644
--- a/ebean-dbmigration-runner/pom.xml
+++ b/ebean-dbmigration-runner/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean dbmigration runner</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 8c1756b10..8cc548f78 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,14 +58,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 040b2c868..9be73d865 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 1c0068df5..145cbde07 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</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.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index 7ce57695d..858e2a983 100644
--- a/ebean-kotlin/pom.xml
+++ b/ebean-kotlin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.3.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 9570dbf05..999774f39 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index ef3efe0b2..eb04bd5f4 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index fcf173039..b14802243 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index e44ab8174..77d4d306c 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -106,14 +106,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index bf541cd60..7184c5d11 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 56b363f5ef..24ee3ae28 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index cea474846..ea95dbde1 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index ddc963530..7abe37bfa 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 9677eac35..03b6c569b 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -36,6 +36,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 844e3ea80..8a067307f 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 722a3f7e0..97bc70d1b 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 20a136e65..7cc28bfd7 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 81fe7c72c..7570cb847 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index f745fc22a..79cd10a4e 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index c08967afb..7ec86c521 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 70f32125c..e0cd25475 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index cd99cda93..4206fab28 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index c5b8bc963..d16d84f59 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 728ba7522..d8df71676 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 65135a5dd..7fbc3e645 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index d34542ef5..e01fb0b39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.3.1-FOC2-SNAPSHOT</version>
+  <version>13.3.1-FOC2</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index e48411826..50fdc2168 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.1-FOC2-SNAPSHOT</version>
+    <version>13.3.1-FOC2</version>
   </parent>
 
   <name>querybean generator</name>
diff --git a/release.properties b/release.properties
new file mode 100644
index 000000000..90cbc0464
--- /dev/null
+++ b/release.properties
@@ -0,0 +1,73 @@
+#release configuration
+#Tue Apr 26 14:36:01 CEST 2022
+projectVersionPolicyId=default
+project.scm.io.ebean\:ebean-clickhouse.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-platform-h2.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-redis.empty=true
+scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel}
+project.scm.io.ebean\:ebean-bom.empty=true
+project.scm.io.ebean\:ebean-platform-clickhouse.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-yugabyte.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:tests.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-core.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
+project.scm.io.ebean\:ebean-platform-postgres.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-cockroach.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-platform-sqlite.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-core-type.empty=true
+project.scm.io.ebean\:ebean-autotune.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
+project.scm.io.ebean\:ebean-platform-sqlanywhere.tag=ebean-parent-13.3.1-FOC1
+scm.commentPrefix=[maven-release-plugin] 
+releaseStrategyId=default
+project.scm.io.ebean\:ebean-oracle.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-mysql.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-h2.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:querybean-generator.empty=true
+completedPhase=check-poms
+project.scm.io.ebean\:ebean-dbmigration-runner.empty=true
+project.scm.io.ebean\:ebean-platform-db2.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-platform-mysql.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-db2.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-platform-sqlserver.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-sqlserver.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-externalmapping-xml.tag=ebean-parent-13.3.1-FOC1
+preparationGoals=clean verify
+exec.pomFileName=pom.xml
+project.scm.io.ebean\:ebean-platform-mariadb.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-hana.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-mariadb.tag=ebean-parent-13.3.1-FOC1
+pinExternals=false
+project.scm.io.ebean\:ebean-platform-all.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-api.empty=true
+project.scm.io.ebean\:ebean-postgis.empty=true
+project.scm.io.ebean\:ebean-ddl-generator.empty=true
+project.scm.org.avaje\:test-kotlin.empty=true
+project.scm.io.ebean\:ebean-postgres.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-parent.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-externalmapping-xml.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
+pushChanges=true
+project.scm.io.ebean\:tests.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
+project.scm.io.ebean\:ebean-sqlite.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-autotune.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-querybean.empty=true
+project.scm.io.ebean\:composites.empty=true
+project.scm.io.ebean\:ebean-core.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-test.empty=true
+project.scm.io.ebean\:ebean-kotlin.empty=true
+scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel}
+remoteTagging=true
+project.scm.io.ebean\:platforms.empty=true
+project.scm.io.ebean\:ebean-nuodb.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-parent.developerConnection=scm\:git\:git@github.com\:FOCONIS/ebean.git
+project.scm.io.ebean\:ebean-externalmapping-api.empty=true
+scm.url=scm\:git\:git@github.com\:FOCONIS/ebean.git
+scm.developmentCommitComment=@{prefix} prepare for next development iteration
+project.scm.io.ebean\:ebean-platform-oracle.tag=ebean-parent-13.3.1-FOC1
+scm.tagNameFormat=@{project.artifactId}-@{project.version}
+exec.additionalArguments=-Dgpg.skip -DskipTests
+project.scm.io.ebean\:ebean-platform-hana.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:ebean-platform-nuodb.tag=ebean-parent-13.3.1-FOC1
+project.scm.io.ebean\:kotlin-querybean-generator.empty=true
+project.scm.io.ebean\:ebean-platform-hsqldb.tag=ebean-parent-13.3.1-FOC1
+exec.snapshotReleasePluginAllowed=false
+scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel}
diff --git a/tests/pom.xml b/tests/pom.xml
index 1942c9065..b02cb807f 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>tests</artifactId>
-  <version>1.0</version>
+  <version>13.3.1-FOC2</version>
   <packaging>pom</packaging>
 
   <name>tests</name>
@@ -43,7 +43,7 @@
 
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
   </scm>
 </project>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index 3b7566d59..bc0400e2a 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -5,13 +5,13 @@
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
     <version>3.7</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <name>test-kotlin</name>
   <description>Kotlin specific tests</description>
   <artifactId>test-kotlin</artifactId>
-  <version>1.0</version>
+  <version>13.3.1-FOC2</version>
 
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
@@ -33,14 +33,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.3.1-FOC2-SNAPSHOT</version>
+      <version>13.3.1-FOC2</version>
       <scope>test</scope>
     </dependency>
 
@@ -110,4 +110,8 @@
 
     </plugins>
   </build>
+
+  <scm>
+    <tag>ebean-parent-13.3.1-FOC2</tag>
+  </scm>
 </project>