diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index d2aaa913d..f5e08a474 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 1c6f57eb3..ec511913c 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 47f141bab..7b85a1e39 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index b35b9aaee..6ccf5faca 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index 9811b13c3..1661eb559 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 304722031..c4db7323f 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 62bfbeeac..7dbb4bf7c 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 038f55703..1d81d3ef2 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 45662ccb9..1c93805b2 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index c18ca08e1..b082711e6 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 1022866f1..d9938efb6 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index a9e4312d8..7afbfe7bd 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 3919b7b69..338384c1a 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index 96016a98b..1a42e17c3 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 8396b099e..efd7e9f90 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 5c0f12e7b..a19c8cfce 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 37c56fb84..6868d021e 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</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.5.1-FOC1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 695f3fef2..0b4bfbb7f 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -71,94 +71,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-dbmigration-runner</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.5.1-FOC1-SNAPSHOT</version>
+        <version>13.5.1-FOC1</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 0b7bc93b7..0b5dda36f 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 961ac76e6..65d256b91 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</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.5.1-FOC1</tag>
   </scm>
 
   <dependencies>
@@ -35,19 +35,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -138,21 +138,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-dbmigration-runner/pom.xml b/ebean-dbmigration-runner/pom.xml
index 31df5304b..d152652da 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean dbmigration runner</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 93a6cf281..76deb99a3 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,14 +58,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index ff007f7ca..c18cd29df 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean external mapping api</name>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index acd8102c6..5dd8dbdfa 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</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.5.1-FOC1</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -61,21 +61,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml
index e2b9d69ac..08eaaba62 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 3a4c236c1..6d7a545c8 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index d4fc3650b..6a39928f6 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index a01524fee..a42c684d4 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index f855024ab..1963802b9 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -106,14 +106,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index f45f06418..6d6cab294 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 01c8a22c2..3e9d0e6cd 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 87c821e75..6b52c1b0e 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 126e6a7d6..f912c4097 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index ef3e0535f..caeca4b30 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</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.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 0c4df261b..5ff8cc28a 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 98ed91081..4ab55634d 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 2305d61a9..30dda9c48 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 7399c74af..6b34208cb 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index d0d22f271..aa4078ee3 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 1bbcb27c4..ed9c2d4af 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 7cc22b9f6..8e4aaa230 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 14c853cd2..930e43ace 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 5b1736f4d..10714429c 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index f766100d2..f82c7b48b 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 029f6cbb8..f72f070a5 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
   </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 80cafbcbe..28dbb91f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.5.1-FOC1-SNAPSHOT</version>
+  <version>13.5.1-FOC1</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.5.1-FOC1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 1e6c6fdae..2f873fceb 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.5.1-FOC1-SNAPSHOT</version>
+    <version>13.5.1-FOC1</version>
   </parent>
 
   <name>querybean generator</name>
diff --git a/tests/pom.xml b/tests/pom.xml
index 1942c9065..98b2f2ce2 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.5.1-FOC1</version>
   <packaging>pom</packaging>
 
   <name>tests</name>
@@ -43,7 +43,7 @@
 
 
   <scm>
-    <tag>ebean-parent-13.3.1-FOC1</tag>
+    <tag>ebean-parent-13.5.1-FOC1</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 44bdee3e8..312a0485c 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -11,7 +11,7 @@
   <name>test-kotlin</name>
   <description>Kotlin specific tests</description>
   <artifactId>test-kotlin</artifactId>
-  <version>1.0</version>
+  <version>13.5.1-FOC1</version>
 
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
@@ -33,14 +33,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.5.1-FOC1-SNAPSHOT</version>
+      <version>13.5.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
@@ -110,4 +110,8 @@
 
     </plugins>
   </build>
+
+  <scm>
+    <tag>ebean-parent-13.5.1-FOC1</tag>
+  </scm>
 </project>