diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index d80647e08..f12ac176d 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index bb9f470e6..cf3879fc6 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index f3d4875fe..c2e5c15d9 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index 39c75244c..eac598314 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index d5ebe376b..e0578c79a 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index b93366c0a..07e19ac72 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 976b353a3..75d2b143d 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 1a6d18d6d..37e2fb8ec 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 5d5caf261..002d616b5 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index 2f1c146f6..a5efacd22 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index f23980757..8f73bd954 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 5fb6f0f21..5770df657 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index 7e6dcd4db..476e6c9bd 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index b13f50bc9..df27d7949 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/composites/pom.xml b/composites/pom.xml
index 52bb4a1e1..65ddeccb4 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 26b21d7f6..82736232d 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 6badd0cbe..63d26f8d5 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.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.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index ec5cf1c92..749fef661 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean bom</name>
@@ -78,94 +78,94 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-dbmigration-runner</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.7.1-FOC1-SNAPSHOT</version>
+        <version>13.7.1-FOC1</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index b0f5a9dff..a4feb4ea2 100644
--- a/ebean-core-type/pom.xml
+++ b/ebean-core-type/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index ea7e5ee5e..f7ef0e060 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.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.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 
   <dependencies>
@@ -35,19 +35,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -138,21 +138,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-dbmigration-runner/pom.xml b/ebean-dbmigration-runner/pom.xml
index 190309ad8..7733c14e4 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.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean dbmigration runner</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index 29e16bde5..46c722baf 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.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.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -62,14 +62,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index c5138ac1c..e9a027b93 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.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 8a5234553..25e45a96d 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.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:FOCONIS/ebean.git</developerConnection>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.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.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -60,21 +60,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml
index 4850b4c31..02f1f1da2 100644
--- a/ebean-postgis/pom.xml
+++ b/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index ef8710985..2a5cb9bca 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 5d5b3409d..cb1d73342 100644
--- a/ebean-redis/pom.xml
+++ b/ebean-redis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 46c245653..1d93d9181 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>ebean test</name>
@@ -29,20 +29,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -104,14 +104,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-dbmigration-runner</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 9553570e1..9b946f63a 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 2b8afeeb1..3539a222c 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.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.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index ebaabfb11..82081dedb 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index 174ad2139..681c34c30 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index b32e241f7..5541cf02c 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.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.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 324d7bbf6..66c25b067 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 9d5e86eed..f65b74c08 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.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.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index 22c9af17d..ad27760a9 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index 45f2e5fd9..69c720466 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 4cc38e54a..5c813c66a 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 91ca37b1e..88f76c29f 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 250b7d827..bcffbf8ce 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index 8bb086d58..d35a762db 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index 1aa3a24ea..abf712bec 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index e1f90acba..7dab6e426 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 9ef777c37..469a3dec5 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.7.1-FOC1-SNAPSHOT</version>
+      <version>13.7.1-FOC1</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 7a74852bd..1c4d3ea56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.7.1-FOC1-SNAPSHOT</version>
+  <version>13.7.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.6.4-FOC1</tag>
+    <tag>ebean-parent-13.7.1-FOC1</tag>
   </scm>
 
   <licenses>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index fd0a57e45..150f5cc4c 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.7.1-FOC1-SNAPSHOT</version>
+    <version>13.7.1-FOC1</version>
   </parent>
 
   <name>querybean generator</name>