diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index f5ff67268..1febc4243 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -97,7 +97,7 @@
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <version>1.4.199</version>
-      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index db0b846be..3cd71d119 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -13,19 +13,13 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 
-    <!-- Provided scope to compile with java 11 -->
+    <!-- needed for java 11+ -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 48ad18eee..082247771 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -13,8 +13,8 @@
   <packaging>pom</packaging>
 
   <properties>
-    <ebean-agent.version>12.4.3</ebean-agent.version>
-    <ebean-maven-plugin.version>12.4.3</ebean-maven-plugin.version>
+    <ebean-agent.version>12.5.0</ebean-agent.version>
+    <ebean-maven-plugin.version>12.5.0</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
@@ -43,12 +43,36 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-ddlgen</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-externalmapping-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-externalmapping-xml</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index b35ed2e4b..a23e92143 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>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -74,6 +74,12 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <version>4.8-1</version>
+    </dependency>
+
     <!--
     Class retention Nonnull and Nullable annotations
     to assist with IDE auto-completion with Ebean API
@@ -98,7 +104,7 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- provided scope to read validation annotations Size etc -->
+    <!-- validation annotations Size etc -->
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
@@ -106,12 +112,6 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4-runtime</artifactId>
-      <version>4.8-1</version>
-    </dependency>
-
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
diff --git a/ebean-ddlgen/pom.xml b/ebean-ddlgen/pom.xml
index 17011ccea..7c7a5f58b 100644
--- a/ebean-ddlgen/pom.xml
+++ b/ebean-ddlgen/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,19 +14,13 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>12.4.3-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.4.3-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
 
-    <!-- Provided scope to compile with java 11 -->
+    <!-- needed for java 11+ -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index 4b684a675..3918bf5c8 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 854bbe751..61c0e90b4 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -5,19 +5,18 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean-externalmapping-xml</artifactId>
-  <version>12.4.1</version>
 
   <dependencies>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.4.3-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -36,7 +35,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.4.3-SNAPSHOT</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 0d2bab9e2..a9fa733e7 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,14 +14,7 @@
 
   <dependencies>
 
-    <!-- provided scope for now -->
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
+    <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
@@ -29,20 +22,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddlgen</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>querybean-generator</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <!--
     Class retention Nonnull and Nullable annotations
     to assist with IDE auto-completion with Ebean API
@@ -68,6 +47,21 @@
       <optional>true</optional>
     </dependency>
 
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-ddlgen</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>querybean-generator</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.avaje.composite</groupId>
       <artifactId>junit</artifactId>
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 53e13db21..20729cfbd 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -20,13 +20,6 @@
       <scope>provided</scope>
     </dependency>
 
-   <dependency>
-     <groupId>io.ebean</groupId>
-     <artifactId>ebean-api</artifactId>
-     <version>${project.version}</version>
-     <scope>provided</scope>
-   </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
@@ -66,15 +59,15 @@
       <version>1.4.200</version>
     </dependency>
 
-    <dependency>
+   <!-- Test dependencies -->
+
+   <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
       <version>42.2.12</version>
       <scope>test</scope>
     </dependency>
 
-    <!-- Test dependencies -->
-
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 615233146..a45634c30 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index cb317da6b..acadd0bb5 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 3a2bfb23c..ba114499e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>12.4.3-SNAPSHOT</version>
+  <version>12.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <parent>
@@ -50,12 +50,12 @@
     <module>ebean-core</module>
     <module>ebean-ddlgen</module>
     <module>ebean-autotune</module>
+    <module>ebean-externalmapping-api</module>
+    <module>ebean-externalmapping-xml</module>
     <module>ebean-test</module>
     <module>querybean-generator</module>
     <module>kotlin-querybean-generator</module>
     <module>ebean-querybean</module>
-    <module>ebean-externalmapping-api</module>
-    <module>ebean-externalmapping-xml</module>
   </modules>
 
 </project>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index 8d24ec54e..3a402b017 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -5,13 +5,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.4.3-SNAPSHOT</version>
+    <version>12.5.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>querybean-generator</artifactId>
 
-
   <dependencies>
 
     <dependency>
@@ -23,7 +22,6 @@
 
   </dependencies>
 
-
   <build>
     <plugins>
       <plugin>