diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 9184d2c08..bb6ec9942 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-<!--  <parent>-->
-<!--    <artifactId>ebean-parent</artifactId>-->
-<!--    <groupId>io.ebean</groupId>-->
-<!--    <version>12.5.2-SNAPSHOT</version>-->
-<!--  </parent>-->
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.5.2-SNAPSHOT</version>
   </parent>
+<!--  <parent>-->
+<!--    <groupId>org.avaje</groupId>-->
+<!--    <artifactId>java8-oss</artifactId>-->
+<!--    <version>2.2</version>-->
+<!--  </parent>-->
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.1</version>
+      <version>12.5.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 472bac9d4..560784894 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-<!--  <parent>-->
-<!--    <artifactId>ebean-parent</artifactId>-->
-<!--    <groupId>io.ebean</groupId>-->
-<!--    <version>12.5.2-SNAPSHOT</version>-->
-<!--  </parent>-->
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.5.2-SNAPSHOT</version>
   </parent>
+<!--  <parent>-->
+<!--    <groupId>org.avaje</groupId>-->
+<!--    <artifactId>java8-oss</artifactId>-->
+<!--    <version>2.2</version>-->
+<!--  </parent>-->
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.5.1</version>
+      <version>12.5.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -52,14 +52,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.1</version>
+      <version>12.5.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.1</version>
+      <version>12.5.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index aa9202d74..7b1b86e2d 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-<!--  <parent>-->
-<!--    <artifactId>ebean-parent</artifactId>-->
-<!--    <groupId>io.ebean</groupId>-->
-<!--    <version>12.5.2-SNAPSHOT</version>-->
-<!--  </parent>-->
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.5.2-SNAPSHOT</version>
   </parent>
+<!--  <parent>-->
+<!--    <groupId>org.avaje</groupId>-->
+<!--    <artifactId>java8-oss</artifactId>-->
+<!--    <version>2.2</version>-->
+<!--  </parent>-->
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.1</version>
+      <version>12.5.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -60,14 +60,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.1</version>
+      <version>12.5.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>12.5.1</version>
+      <version>12.5.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index e6dfe3fde..a28df4732 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-<!--  <parent>-->
-<!--    <artifactId>ebean-parent</artifactId>-->
-<!--    <groupId>io.ebean</groupId>-->
-<!--    <version>12.5.2-SNAPSHOT</version>-->
-<!--  </parent>-->
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.5.2-SNAPSHOT</version>
   </parent>
+<!--  <parent>-->
+<!--    <groupId>org.avaje</groupId>-->
+<!--    <artifactId>java8-oss</artifactId>-->
+<!--    <version>2.2</version>-->
+<!--  </parent>-->
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
@@ -37,14 +37,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.1</version>
+      <version>12.5.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.1</version>
+      <version>12.5.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>