diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml
index ddbd3ee11..42904532e 100644
--- a/composites/ebean-clickhouse/pom.xml
+++ b/composites/ebean-clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml
index 5abf59d6a..9db3df9ca 100644
--- a/composites/ebean-cockroach/pom.xml
+++ b/composites/ebean-cockroach/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml
index 680cd3253..b927dfa65 100644
--- a/composites/ebean-db2/pom.xml
+++ b/composites/ebean-db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml
index ce1e41452..b7fb4adf9 100644
--- a/composites/ebean-h2/pom.xml
+++ b/composites/ebean-h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml
index fc879d6e9..fe43ebbbc 100644
--- a/composites/ebean-hana/pom.xml
+++ b/composites/ebean-hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml
index 5cd8a263b..6c95b4bf3 100644
--- a/composites/ebean-mariadb/pom.xml
+++ b/composites/ebean-mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml
index 2b4ba93b3..5b0ef59a0 100644
--- a/composites/ebean-mysql/pom.xml
+++ b/composites/ebean-mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-net-postgis/pom.xml b/composites/ebean-net-postgis/pom.xml
index 4ed0ea445..32a22b3ba 100644
--- a/composites/ebean-net-postgis/pom.xml
+++ b/composites/ebean-net-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-net-postgis-types</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml
index 8540b7dc7..75ea19324 100644
--- a/composites/ebean-nuodb/pom.xml
+++ b/composites/ebean-nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml
index 1d267d745..2ea499eee 100644
--- a/composites/ebean-oracle/pom.xml
+++ b/composites/ebean-oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-pgvector/pom.xml b/composites/ebean-pgvector/pom.xml
index 19b6059fc..115b8778e 100644
--- a/composites/ebean-pgvector/pom.xml
+++ b/composites/ebean-pgvector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-pgvector-types</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
diff --git a/composites/ebean-postgis/pom.xml b/composites/ebean-postgis/pom.xml
index 9826dea1f..1fc50cbea 100644
--- a/composites/ebean-postgis/pom.xml
+++ b/composites/ebean-postgis/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml
index d7ed30727..2fcb4139f 100644
--- a/composites/ebean-postgres/pom.xml
+++ b/composites/ebean-postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml
index 52c79b729..22e9f3fde 100644
--- a/composites/ebean-sqlite/pom.xml
+++ b/composites/ebean-sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml
index 42c199a0b..899f9b4c4 100644
--- a/composites/ebean-sqlserver/pom.xml
+++ b/composites/ebean-sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml
index ce814ec3d..72db5f542 100644
--- a/composites/ebean-yugabyte/pom.xml
+++ b/composites/ebean-yugabyte/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml
index fba680df0..69030c01d 100644
--- a/composites/ebean/pom.xml
+++ b/composites/ebean/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -60,13 +60,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/composites/pom.xml b/composites/pom.xml
index ba2a4f9db..84ca6b42d 100644
--- a/composites/pom.xml
+++ b/composites/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>composites</artifactId>
diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 83d0efe23..37e15f974 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>ebean api</name>
diff --git a/ebean-avajejsonb-mapper/pom.xml b/ebean-avajejsonb-mapper/pom.xml
index 38c32e540..6b1a82480 100644
--- a/ebean-avajejsonb-mapper/pom.xml
+++ b/ebean-avajejsonb-mapper/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -41,14 +41,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/ebean-bench/pom.xml b/ebean-bench/pom.xml
index 3d4a1a87d..da25d7609 100644
--- a/ebean-bench/pom.xml
+++ b/ebean-bench/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>ebean-bench</artifactId>
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 7829f0fdc..62aad3d2f 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,25 +89,25 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
@@ -125,19 +125,19 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-avajejsonb-mapper</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
@@ -161,37 +161,37 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-spring-txn</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <!-- platforms -->
@@ -199,91 +199,91 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-clickhouse</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis-types</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-pgvector</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-pgvector-types</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>18.5.0</version>
+        <version>18.6.0</version>
       </dependency>
 
     </dependencies>
diff --git a/ebean-core-json/pom.xml b/ebean-core-json/pom.xml
index 52fbb93bf..b578493ea 100644
--- a/ebean-core-json/pom.xml
+++ b/ebean-core-json/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.ebean</groupId>
     <artifactId>ebean-parent</artifactId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
   <artifactId>ebean-core-json</artifactId>
   <name>ebean-core-json</name>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml
index 8af043c0b..7285000cc 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 1006800dd..62e7eebf3 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-json</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <!--
@@ -145,21 +145,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
index 619f9f921..2c283a969 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java
@@ -3,8 +3,6 @@ package io.ebeaninternal.server.profile;
 import io.ebean.meta.MetricVisitor;
 import io.ebean.metric.TimedMetric;
 
-import java.util.concurrent.atomic.LongAccumulator;
-
 /**
  * Used to collect timed execution statistics.
  * <p>
@@ -16,12 +14,17 @@ final class DTimedMetric implements TimedMetric {
   private final String name;
   private final ValueAdder count = new ValueAdder();
   private final ValueAdder total = new ValueAdder();
-  private final LongAccumulator max = new LongAccumulator(Math::max, 0);
+  private final ValueMax max;
   private boolean collected;
   private String reportName;
 
   DTimedMetric(String name) {
+    this(name, new ValueMax());
+  }
+
+  DTimedMetric(String name, ValueMax max) {
     this.name = name;
+    this.max = max;
   }
 
   @Override
@@ -31,7 +34,7 @@ final class DTimedMetric implements TimedMetric {
       final long mean = totalMicros / batch;
       count.add(batch);
       total.add(totalMicros);
-      max.accumulate(mean);
+      max.add(mean);
     }
   }
 
@@ -44,7 +47,7 @@ final class DTimedMetric implements TimedMetric {
   public void add(long value) {
     count.add(1);
     total.add(value);
-    max.accumulate(value);
+    max.add(value);
   }
 
   @Override
@@ -76,6 +79,7 @@ final class DTimedMetric implements TimedMetric {
 
   @Override
   public DTimeMetricStats collect(MetricVisitor.Mode mode) {
+    final long maxValue = max.collect();
     final long countSum;
     switch (mode) {
       case RESET:
@@ -93,14 +97,14 @@ final class DTimedMetric implements TimedMetric {
     if (countSum == 0) {
       return null;
     } else {
-      return stats(mode, name, countSum);
+      return stats(mode, name, countSum, maxValue);
     }
   }
 
   /**
    * Return the current statistics resetting the internal values if reset is true.
    */
-  private DTimeMetricStats stats(MetricVisitor.Mode mode, String name, long countSum) {
+  private DTimeMetricStats stats(MetricVisitor.Mode mode, String name, long countSum, long maxValue) {
     try {
       final long totalSum;
       switch (mode) {
@@ -116,7 +120,7 @@ final class DTimedMetric implements TimedMetric {
         default:
           throw new IllegalStateException("Unknown metric collection mode");
       }
-      return new DTimeMetricStats(name, collected, countSum, totalSum, max.getThenReset());
+      return new DTimeMetricStats(name, collected, countSum, totalSum, maxValue);
     } finally {
       collected = true;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/ValueMax.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/ValueMax.java
new file mode 100644
index 000000000..11e3a7702
--- /dev/null
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/ValueMax.java
@@ -0,0 +1,48 @@
+package io.ebeaninternal.server.profile;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.LongAccumulator;
+import java.util.function.LongSupplier;
+
+/**
+ * Accumulates a maximum value and publishes it in rolling 59-second windows.
+ */
+final class ValueMax {
+
+  private static final long WINDOW_NANOS = TimeUnit.SECONDS.toNanos(59);
+
+  private final LongSupplier nanoTime;
+  private final LongAccumulator value;
+  private volatile long published;
+  private long lastResetNanos;
+
+  ValueMax() {
+    this(System::nanoTime);
+  }
+
+  ValueMax(LongSupplier nanoTime) {
+    this.nanoTime = nanoTime;
+    this.value = new LongAccumulator(Math::max, 0);
+    this.lastResetNanos = nanoTime.getAsLong() - 2 * WINDOW_NANOS;
+  }
+
+  void add(long amount) {
+    value.accumulate(amount);
+  }
+
+  synchronized long collect() {
+    long now = nanoTime.getAsLong();
+    if (now - lastResetNanos >= WINDOW_NANOS) {
+      published = value.getThenReset();
+      lastResetNanos = now;
+    }
+    return published;
+  }
+
+  synchronized void reset() {
+    value.reset();
+    published = 0;
+    lastResetNanos = nanoTime.getAsLong() - 2 * WINDOW_NANOS;
+  }
+
+}
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DQueryPlanMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DQueryPlanMetricTest.java
index 5f8651fdb..55298cf00 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DQueryPlanMetricTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DQueryPlanMetricTest.java
@@ -5,19 +5,22 @@ import io.ebean.meta.MetaQueryMetric;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 class DQueryPlanMetricTest {
 
+  private final AtomicLong nanoTime = new AtomicLong();
   Function<String, String> naming = (String name) -> "prefix[" + name.replace('.', '-') + "]";
 
   @Test
   void visit() {
 
     DQueryPlanMeta meta = new DQueryPlanMeta(Object.class, "dto.Object.lab", "lab", null, "sql", "hash");
-    DTimedMetric metric = new DTimedMetric("org.timed.plan");
+    DTimedMetric metric = new DTimedMetric("org.timed.plan", new ValueMax(nanoTime::get));
     DQueryPlanMetric planMetric = new DQueryPlanMetric(meta, metric);
 
     metric.add(560);
@@ -46,10 +49,10 @@ class DQueryPlanMetricTest {
   }
 
   @Test
-  void visitCumulativeResetsMax() {
+  void visitCumulativePublishesSharedMax() {
 
     DQueryPlanMeta meta = new DQueryPlanMeta(Object.class, "dto.Object.lab", "lab", null, "sql", "hash");
-    DTimedMetric metric = new DTimedMetric("org.timed.plan");
+    DTimedMetric metric = new DTimedMetric("org.timed.plan", new ValueMax(nanoTime::get));
     DQueryPlanMetric planMetric = new DQueryPlanMetric(meta, metric);
 
     metric.add(560);
@@ -74,7 +77,7 @@ class DQueryPlanMetricTest {
       assertThat(result.get(0).name()).isEqualTo("prefix[dto-Object-lab]");
       assertThat(result.get(0).count()).isEqualTo(2);
       assertThat(result.get(0).total()).isEqualTo(820);
-      assertThat(result.get(0).max()).isEqualTo(0);
+      assertThat(result.get(0).max()).isEqualTo(560);
     }
 
     metric.add(410);
@@ -87,7 +90,14 @@ class DQueryPlanMetricTest {
       assertThat(result.get(0).name()).isEqualTo("prefix[dto-Object-lab]");
       assertThat(result.get(0).count()).isEqualTo(3);
       assertThat(result.get(0).total()).isEqualTo(1230);
-      assertThat(result.get(0).max()).isEqualTo(410);
+      assertThat(result.get(0).max()).isEqualTo(560);
     }
+
+    nanoTime.addAndGet(TimeUnit.SECONDS.toNanos(59));
+    BasicMetricVisitor visitor = new BasicMetricVisitor("v", naming, false, true, true, true);
+    planMetric.visit(visitor);
+    List<MetaQueryMetric> result = visitor.queryMetrics();
+    assertThat(result).hasSize(1);
+    assertThat(result.get(0).max()).isEqualTo(410);
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
index d6629a0a2..78a484dbd 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java
@@ -5,16 +5,20 @@ import io.ebean.meta.MetaTimedMetric;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class DTimedMetricTest {
 
+  private final AtomicLong nanoTime = new AtomicLong();
+
   @Test
   public void addSinceNanos() throws InterruptedException {
 
-    DTimedMetric metric = new DTimedMetric("addSinceNanos");
+    DTimedMetric metric = new DTimedMetric("addSinceNanos", new ValueMax(nanoTime::get));
 
     long start = System.nanoTime();
     Thread.sleep(11);
@@ -28,6 +32,7 @@ public class DTimedMetricTest {
 
     metric.addSinceNanos(start);
 
+    nanoTime.addAndGet(TimeUnit.SECONDS.toNanos(59));
     stats = metric.collect(true);
     assertThat(stats.count()).isEqualTo(1);
     assertThat(stats.total()).isGreaterThan(10);
@@ -37,7 +42,7 @@ public class DTimedMetricTest {
   @Test
   public void addBatchSince() throws InterruptedException {
 
-    DTimedMetric metric = new DTimedMetric("addSinceNanos");
+    DTimedMetric metric = new DTimedMetric("addSinceNanos", new ValueMax(nanoTime::get));
 
     long start = System.nanoTime();
     Thread.sleep(11);
@@ -52,6 +57,7 @@ public class DTimedMetricTest {
 
     metric.addBatchSince(start, 2);
 
+    nanoTime.addAndGet(TimeUnit.SECONDS.toNanos(59));
     stats = metric.collect(true);
     assertThat(stats.count()).isEqualTo(2);
     assertThat(stats.total()).isGreaterThan(10000);
@@ -92,8 +98,8 @@ public class DTimedMetricTest {
   }
 
   @Test
-  void collectCumulativeResetsMax() {
-    DTimedMetric metric = new DTimedMetric("org.timed");
+  void collectCumulativePublishesSharedMax() {
+    DTimedMetric metric = new DTimedMetric("org.timed", new ValueMax(nanoTime::get));
     metric.add(560);
     metric.add(500);
 
@@ -105,7 +111,7 @@ public class DTimedMetricTest {
     stats = metric.collect(false);
     assertThat(stats.count()).isEqualTo(2);
     assertThat(stats.total()).isEqualTo(1060);
-    assertThat(stats.max()).isEqualTo(0);
+    assertThat(stats.max()).isEqualTo(560);
 
     metric.add(160);
     metric.add(100);
@@ -114,12 +120,16 @@ public class DTimedMetricTest {
     stats = metric.collect(false);
     assertThat(stats.count()).isEqualTo(5);
     assertThat(stats.total()).isEqualTo(1470);
+    assertThat(stats.max()).isEqualTo(560);
+
+    nanoTime.addAndGet(TimeUnit.SECONDS.toNanos(59));
+    stats = metric.collect(false);
     assertThat(stats.max()).isEqualTo(160);
   }
 
   @Test
   void cumulativeAndDeltaAreIndependent() {
-    DTimedMetric metric = new DTimedMetric("org.timed");
+    DTimedMetric metric = new DTimedMetric("org.timed", new ValueMax(nanoTime::get));
     metric.add(560);
     metric.add(500);
 
@@ -132,6 +142,7 @@ public class DTimedMetricTest {
     DTimeMetricStats delta = metric.collect(true);
     assertThat(delta.count()).isEqualTo(3);
     assertThat(delta.total()).isEqualTo(1220);
+    assertThat(delta.max()).isEqualTo(560);
 
     cumulative = metric.collect(false);
     assertThat(cumulative).isNull();
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index e8a1b287c..d2ced101f 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml
index 043a9b3e6..a61885d90 100644
--- a/ebean-jackson-mapper/pom.xml
+++ b/ebean-jackson-mapper/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-net-postgis-types/pom.xml b/ebean-net-postgis-types/pom.xml
index 787c7b6e9..c72ffee61 100644
--- a/ebean-net-postgis-types/pom.xml
+++ b/ebean-net-postgis-types/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>ebean net postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-opentelemetry/pom.xml b/ebean-opentelemetry/pom.xml
index d3af28658..a08d1dfc0 100644
--- a/ebean-opentelemetry/pom.xml
+++ b/ebean-opentelemetry/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>ebean-opentelemetry</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -71,21 +71,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-pgvector-types/pom.xml b/ebean-pgvector-types/pom.xml
index e2d4f151a..26fcf78af 100644
--- a/ebean-pgvector-types/pom.xml
+++ b/ebean-pgvector-types/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>ebean pgvector types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml
index 50228aae6..2c87eee0c 100644
--- a/ebean-postgis-types/pom.xml
+++ b/ebean-postgis-types/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 0b92883d7..d2fc90691 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml
index 0454c9c6e..bf8e40a0d 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -29,35 +29,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-redisson/pom.xml b/ebean-redisson/pom.xml
index 95de61bf7..9440bebf3 100644
--- a/ebean-redisson/pom.xml
+++ b/ebean-redisson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>ebean-redisson</artifactId>
@@ -29,35 +29,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml
index 83b79ba65..177ed36dc 100644
--- a/ebean-spring-txn/pom.xml
+++ b/ebean-spring-txn/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index 0d5618397..382a9f3de 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -33,20 +33,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -149,14 +149,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -240,7 +240,7 @@
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
-      <version>3.0.7</version>
+      <version>3.3.5</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/howto-deploy-to-central.md b/howto-deploy-to-central.md
index 5c9ca327f..80e3739c7 100644
--- a/howto-deploy-to-central.md
+++ b/howto-deploy-to-central.md
@@ -15,8 +15,8 @@ mvn -T 4 clean package
 mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests
 
 ## git commit, git tag, git push --tags
-git commit -am 'Version 18.5.0'
-git tag 18.5.0
+git commit -am 'Version 18.6.0'
+git tag 18.6.0
 git push --tags
 
 ### convert to javax
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 13ef1c2f1..c33552600 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -56,14 +56,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml
index 1b07a4c48..06a9d4416 100644
--- a/platforms/all/pom.xml
+++ b/platforms/all/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,67 +16,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml
index 4226aa976..1a0da3880 100644
--- a/platforms/clickhouse/pom.xml
+++ b/platforms/clickhouse/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml
index ee9f4af21..b20ad202d 100644
--- a/platforms/db2/pom.xml
+++ b/platforms/db2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml
index 96f4edc10..d4cd425dd 100644
--- a/platforms/h2/pom.xml
+++ b/platforms/h2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml
index 1380de206..515e15385 100644
--- a/platforms/hana/pom.xml
+++ b/platforms/hana/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml
index 0b1323af4..89e8bd3cc 100644
--- a/platforms/hsqldb/pom.xml
+++ b/platforms/hsqldb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml
index ac8fbc143..248979232 100644
--- a/platforms/mariadb/pom.xml
+++ b/platforms/mariadb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml
index fd369d0c6..1ac34930b 100644
--- a/platforms/mysql/pom.xml
+++ b/platforms/mysql/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml
index 943921dc9..1d3ae4684 100644
--- a/platforms/nuodb/pom.xml
+++ b/platforms/nuodb/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml
index 82b223768..f2645667f 100644
--- a/platforms/oracle/pom.xml
+++ b/platforms/oracle/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 51526a7cc..323c47350 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>platforms</artifactId>
diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml
index b0e630531..9f8cffb31 100644
--- a/platforms/postgres/pom.xml
+++ b/platforms/postgres/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
diff --git a/platforms/postgres/src/main/resources/META-INF/native-image/io.ebean/ebean-platform-postgres/reflect-config.json b/platforms/postgres/src/main/resources/META-INF/native-image/io.ebean/ebean-platform-postgres/reflect-config.json
new file mode 100644
index 000000000..3d4f2e4e2
--- /dev/null
+++ b/platforms/postgres/src/main/resources/META-INF/native-image/io.ebean/ebean-platform-postgres/reflect-config.json
@@ -0,0 +1,11 @@
+[
+  {"name": "org.postgis.DriverWrapperLW", "allDeclaredConstructors": true},
+  {"name": "org.postgis.DriverWrapper", "allDeclaredConstructors": true},
+  {"name": "org.postgis.DriverWrapper$TypesAdder80", "allDeclaredConstructors": true},
+  {"name": "org.postgis.PGbox2d", "allDeclaredConstructors": true},
+  {"name": "org.postgis.PGbox3d", "allDeclaredConstructors": true},
+  {"name": "org.postgis.PGgeography", "allDeclaredConstructors": true},
+  {"name": "org.postgis.PGgeographyLW", "allDeclaredConstructors": true},
+  {"name": "org.postgis.PGgeometry", "allDeclaredConstructors": true},
+  {"name": "org.postgis.PGgeometryLW", "allDeclaredConstructors": true}
+]
diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml
index a557a4da5..4153b8e0f 100644
--- a/platforms/sqlanywhere/pom.xml
+++ b/platforms/sqlanywhere/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml
index 2b8ac5c91..72a58477a 100644
--- a/platforms/sqlite/pom.xml
+++ b/platforms/sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml
index 81cbe6c73..04ffe434e 100644
--- a/platforms/sqlserver/pom.xml
+++ b/platforms/sqlserver/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 2b3bd507d..cec56f3b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>18.5.0</version>
+  <version>18.6.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index a8e7eb34e..ac94e1b95 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>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <name>querybean generator</name>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoMapperWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoMapperWriter.java
index b3e73ea2d..2422ed465 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoMapperWriter.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoMapperWriter.java
@@ -234,9 +234,11 @@ class DtoMapperWriter {
     Set<String> nestedAssocPaths = new LinkedHashSet<>();
     for (DtoPropertyMeta property : activeProperties) {
       if ((property.kind() == DtoPropertyMeta.Kind.NESTED_ONE || property.kind() == DtoPropertyMeta.Kind.NESTED_MANY)
+        && !property.isUnfetchable()
         && !property.hasComputedSegment()) {
         nestedAssocPaths.add(property.sourcePropertyPath().get(0));
       } else if (property.kind() == DtoPropertyMeta.Kind.SCALAR && property.isListTarget()
+        && !property.isScalarCollection()
         && !property.hasComputedSegment() && property.sourcePropertyPath().size() == 1) {
         // a single-segment SCALAR property whose DTO field is a List with no registered nested
         // DTO mapping of its own (e.g. @DtoConvert reducing a ToMany association) - still fully
@@ -253,7 +255,7 @@ class DtoMapperWriter {
       switch (property.kind()) {
         case NESTED_ONE:
         case NESTED_MANY:
-          if (property.hasComputedSegment()) {
+          if (property.hasComputedSegment() || property.isUnfetchable()) {
             // a single-hop @DtoPath rename traversing a computed/derived getter (no backing
             // field) that happens to target a nested DTO type - just as unfetchable via
             // fetch(path, mapper.fetchGroup()) as the analogous SCALAR case, since "path" here
@@ -267,7 +269,7 @@ class DtoMapperWriter {
             property.sourcePropertyPath().get(0), mapperFieldName(property)));
           break;
         case SCALAR:
-          if (property.hasComputedSegment()) {
+          if (property.hasComputedSegment() || property.isUnfetchable()) {
             // the path traverses a computed/derived getter (no backing field) - its own segments
             // past that point aren't real Ebean fetch paths, so don't add them to pathSelect/
             // rootSelect at all; @DtoPath#requires() (plus the real prefix, if any) already names
@@ -277,7 +279,7 @@ class DtoMapperWriter {
           }
           List<String> path = property.sourcePropertyPath();
           if (path.size() == 1) {
-            if (property.isListTarget()) {
+            if (property.isListTarget() && !property.isScalarCollection()) {
               // a single-segment path whose DTO field type is a List, but with no registered
               // nested DTO mapping of its own (e.g. a @DtoConvert-backed property reducing a
               // ToMany association to a simpler element type) - the source side is still a real
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoMappingReader.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoMappingReader.java
index f6b0a5d20..0c0bcd87c 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoMappingReader.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoMappingReader.java
@@ -819,32 +819,37 @@ class DtoMappingReader {
       // straight into a NullPointerException. Default to the primitive's zero-equivalent value,
       // or fail fast with a clear message instead when @DtoPath(failOnNull = true).
       boolean isListTarget = listElementType(field.asType()) != null;
+      boolean scalarCollection = isListTarget && isScalarCollectionProperty(lastOwnerType, properties.get(properties.size() - 1));
       DtoConverterMeta pathConverter = isListTarget ? converter
         : autoTypeConverter(converter, lastOwnerType != null ? getterReturnTypeMirror(lastOwnerType, lastGetter) : null, field.asType());
       return new DtoPropertyMeta(name, DtoPropertyMeta.Kind.SCALAR, getters, properties, null, pathConverter,
         field.asType().getKind().isPrimitive(), pathPrism.failOnNull(), computedFrom >= 0, requiredFetchPaths,
-        isListTarget, false);
+        isListTarget, scalarCollection, false);
     }
     TypeMirror fieldType = field.asType();
     TypeMirror listElementType = listElementType(fieldType);
+    boolean unfetchable = isUnfetchableProperty(meta.source(), name);
     if (listElementType != null) {
       DtoBeanMeta nested = lookupByTarget(listElementType);
       if (nested != null) {
         rejectConverterOnNested(field, converter, name, meta);
-        return new DtoPropertyMeta(name, DtoPropertyMeta.Kind.NESTED_MANY, List.of(getterName(meta.source(), name)), List.of(name), nested);
+        return new DtoPropertyMeta(name, DtoPropertyMeta.Kind.NESTED_MANY, List.of(getterName(meta.source(), name)), List.of(name), nested,
+          unfetchable, List.of());
       }
     } else {
       DtoBeanMeta nested = lookupByTarget(fieldType);
       if (nested != null) {
         rejectConverterOnNested(field, converter, name, meta);
-        return new DtoPropertyMeta(name, DtoPropertyMeta.Kind.NESTED_ONE, List.of(getterName(meta.source(), name)), List.of(name), nested);
+        return new DtoPropertyMeta(name, DtoPropertyMeta.Kind.NESTED_ONE, List.of(getterName(meta.source(), name)), List.of(name), nested,
+          unfetchable, List.of());
       }
     }
     String getter = getterName(meta.source(), name);
+    boolean scalarCollection = listElementType != null && isScalarCollectionProperty(meta.source(), name);
     DtoConverterMeta scalarConverter = listElementType != null ? converter
       : autoTypeConverter(converter, getterReturnTypeMirror(meta.source(), getter), fieldType);
     return new DtoPropertyMeta(name, DtoPropertyMeta.Kind.SCALAR, List.of(getter), List.of(name), null, scalarConverter,
-      fieldType.getKind().isPrimitive(), listElementType != null);
+      fieldType.getKind().isPrimitive(), false, false, List.of(), listElementType != null, scalarCollection, unfetchable, false);
   }
 
   /**
@@ -1055,7 +1060,35 @@ class DtoMappingReader {
     for (TypeElement current = type; current != null; current = superclassOf(current)) {
       for (VariableElement f : ElementFilter.fieldsIn(current.getEnclosedElements())) {
         if (f.getSimpleName().contentEquals(propertyName)) {
-          return true;
+          return !ctx.isTransientField(f);
+        }
+      }
+    }
+    return false;
+  }
+
+  private boolean isScalarCollectionProperty(TypeElement type, String propertyName) {
+    if (type == null) {
+      return false;
+    }
+    for (TypeElement current = type; current != null; current = superclassOf(current)) {
+      for (VariableElement field : ElementFilter.fieldsIn(current.getEnclosedElements())) {
+        if (field.getSimpleName().contentEquals(propertyName)) {
+          return ctx.isScalarCollectionField(field);
+        }
+      }
+    }
+    return false;
+  }
+
+  private boolean isUnfetchableProperty(TypeElement type, String propertyName) {
+    if (type == null) {
+      return false;
+    }
+    for (TypeElement current = type; current != null; current = superclassOf(current)) {
+      for (VariableElement field : ElementFilter.fieldsIn(current.getEnclosedElements())) {
+        if (field.getSimpleName().contentEquals(propertyName)) {
+          return ctx.isTransientField(field);
         }
       }
     }
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoPropertyMeta.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoPropertyMeta.java
index d3ca8d21c..c04f6bb09 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoPropertyMeta.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/DtoPropertyMeta.java
@@ -30,6 +30,8 @@ class DtoPropertyMeta {
   private final boolean computedSegment;
   private final List<String> requiredFetchPaths;
   private final boolean listTarget;
+  private final boolean scalarCollection;
+  private final boolean unfetchable;
   private final boolean ignored;
 
   DtoPropertyMeta(String dtoFieldName, Kind kind, List<String> sourceGetterPath, List<String> sourcePropertyPath, DtoBeanMeta nested) {
@@ -44,7 +46,7 @@ class DtoPropertyMeta {
    * before ever consulting them.
    */
   static DtoPropertyMeta ignored(String dtoFieldName, boolean listTarget) {
-    return new DtoPropertyMeta(dtoFieldName, Kind.SCALAR, List.of(), List.of(), null, null, false, false, false, List.of(), listTarget, true);
+    return new DtoPropertyMeta(dtoFieldName, Kind.SCALAR, List.of(), List.of(), null, null, false, false, false, List.of(), listTarget, false, false, true);
   }
 
   /**
@@ -90,6 +92,22 @@ class DtoPropertyMeta {
   DtoPropertyMeta(String dtoFieldName, Kind kind, List<String> sourceGetterPath, List<String> sourcePropertyPath,
                   DtoBeanMeta nested, DtoConverterMeta converter, boolean primitiveTarget, boolean failOnNull,
                   boolean computedSegment, List<String> requiredFetchPaths, boolean listTarget, boolean ignored) {
+    this(dtoFieldName, kind, sourceGetterPath, sourcePropertyPath, nested, converter, primitiveTarget, failOnNull,
+      computedSegment, requiredFetchPaths, listTarget, false, ignored);
+  }
+
+  DtoPropertyMeta(String dtoFieldName, Kind kind, List<String> sourceGetterPath, List<String> sourcePropertyPath,
+                  DtoBeanMeta nested, DtoConverterMeta converter, boolean primitiveTarget, boolean failOnNull,
+                  boolean computedSegment, List<String> requiredFetchPaths, boolean listTarget,
+                  boolean scalarCollection, boolean ignored) {
+    this(dtoFieldName, kind, sourceGetterPath, sourcePropertyPath, nested, converter, primitiveTarget, failOnNull,
+      computedSegment, requiredFetchPaths, listTarget, scalarCollection, false, ignored);
+  }
+
+  DtoPropertyMeta(String dtoFieldName, Kind kind, List<String> sourceGetterPath, List<String> sourcePropertyPath,
+                  DtoBeanMeta nested, DtoConverterMeta converter, boolean primitiveTarget, boolean failOnNull,
+                  boolean computedSegment, List<String> requiredFetchPaths, boolean listTarget,
+                  boolean scalarCollection, boolean unfetchable, boolean ignored) {
     this.dtoFieldName = dtoFieldName;
     this.kind = kind;
     this.sourceGetterPath = sourceGetterPath;
@@ -101,6 +119,8 @@ class DtoPropertyMeta {
     this.computedSegment = computedSegment;
     this.requiredFetchPaths = requiredFetchPaths;
     this.listTarget = listTarget;
+    this.scalarCollection = scalarCollection;
+    this.unfetchable = unfetchable;
     this.ignored = ignored;
   }
 
@@ -177,6 +197,18 @@ class DtoPropertyMeta {
     return listTarget || kind == Kind.NESTED_MANY;
   }
 
+  /**
+   * Return true when the source property is a scalar collection such as an Ebean {@code @DbArray},
+   * rather than a to-many association.
+   */
+  boolean isScalarCollection() {
+    return scalarCollection;
+  }
+
+  boolean isUnfetchable() {
+    return unfetchable;
+  }
+
   /**
    * {@code true} when this property is marked {@code @DtoIgnore} - permanently excluded from
    * every mapping (base and every named variant alike), always given its empty default rather
@@ -245,4 +277,3 @@ class DtoPropertyMeta {
     sb.append(')');
   }
 }
-
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index 6f25d3c2a..89df7fa40 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -223,6 +223,15 @@ class ProcessingContext implements Constants {
     );
   }
 
+  boolean isTransientField(Element field) {
+    if (field.getKind() != ElementKind.FIELD) {
+      return false;
+    }
+    VariableElement variable = (VariableElement) field;
+    return variable.getModifiers().contains(Modifier.TRANSIENT)
+      || hasAnnotations(variable, "jakarta.persistence.Transient");
+  }
+
   private static boolean hasAnnotations(Element element, String... annotations) {
     return getAnnotation(element, annotations) != null;
   }
@@ -268,17 +277,21 @@ class ProcessingContext implements Constants {
   /**
    * Return true if it is a DbJson field.
    */
-  private static boolean dbJsonField(Element field) {
+  boolean isDbJsonField(Element field) {
     return hasAnnotations(field, DBJSON, DBJSONB);
   }
 
   /**
    * Return true if it is a DbArray field.
    */
-  private static boolean dbArrayField(Element field) {
+  boolean isDbArrayField(Element field) {
     return hasAnnotations(field, DBARRAY);
   }
 
+  boolean isScalarCollectionField(Element field) {
+    return isDbArrayField(field) || isDbJsonField(field);
+  }
+
   private static boolean dbToMany(Element field) {
     return hasAnnotations(field, ONE_TO_MANY, MANY_TO_MANY);
   }
@@ -417,10 +430,10 @@ class ProcessingContext implements Constants {
     }
 
     boolean toMany = dbToMany(field);
-    if (dbJsonField(field)) {
+    if (isDbJsonField(field)) {
       return propertyTypeMap.getDbJsonType();
     }
-    if (dbArrayField(field)) {
+    if (isDbArrayField(field)) {
       // get generic parameter type
       DeclaredType declaredType = (DeclaredType) field.asType();
       TypeMirror arrayElementType = declaredType.getTypeArguments().get(0);
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
index 213e06ff5..473c7ef13 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
@@ -19,6 +19,8 @@ public class Processor extends AbstractProcessor implements Constants {
   private ProcessingContext processingContext;
   private DtoMappingReader dtoMappingReader;
   private boolean wroteDtoMappers;
+  private SimpleModuleInfoWriter moduleWriter;
+  private boolean initModuleWriter;
 
   private boolean wroteLookup;
 
@@ -59,6 +61,7 @@ public class Processor extends AbstractProcessor implements Constants {
     final int loaded = processingContext.complete();
     dtoMappingReader.collect(roundEnv);
     if (!roundEnv.processingOver()) {
+      initModuleInfoBean();
       writeDtoMappers();
     }
     if (roundEnv.processingOver()) {
@@ -109,24 +112,33 @@ public class Processor extends AbstractProcessor implements Constants {
     }
   }
 
+  private void initModuleInfoBean() {
+    if (initModuleWriter || !processingContext.hasAnyEntitiesOrOther()) {
+      return;
+    }
+    try {
+      moduleWriter = new SimpleModuleInfoWriter(processingContext);
+    } catch (FilerException e) {
+      processingContext.logWarn(null, "FilerException trying to write EntityClassRegister error: " + e);
+    } catch (Throwable e) {
+      processingContext.logError(null, "Failed to initialise EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
+    } finally {
+      initModuleWriter = true;
+    }
+  }
+
   /**
-   * Write the {@code EbeanEntityRegister} at the end of processing - deferred until there is
-   * something to actually register (rather than eagerly reserving/creating the source file up
-   * front), since a compilation unit with no {@code @Entity}/{@code @Embeddable}/{@code @Converter}
-   * /other classes at all - e.g. a test-source-only module that only declares
-   * {@code @DtoMapping} - has nothing meaningful to write and no factory package to derive a
-   * sensible location from.
+   * Write the {@code EbeanEntityRegister} at the end of processing. The source file is reserved
+   * during an earlier round by {@link #initModuleInfoBean()} so javac does not warn that it was
+   * created in the final round.
    */
   private void writeModuleInfoBean() {
-    if (!processingContext.hasAnyEntitiesOrOther()) {
+    if (moduleWriter == null) {
       processingContext.logNote("EbeanEntityRegister skipped - no entities or other classes found");
       return;
     }
     try {
-      SimpleModuleInfoWriter moduleWriter = new SimpleModuleInfoWriter(processingContext);
       moduleWriter.write();
-    } catch (FilerException e) {
-      processingContext.logWarn(null, "FilerException trying to write EntityClassRegister error: " + e);
     } catch (Throwable e) {
       processingContext.logError(null, "Failed to write EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
     }
diff --git a/querybean-generator/src/test/java/io/ebean/querybean/generator/DtoMapperDbArrayTest.java b/querybean-generator/src/test/java/io/ebean/querybean/generator/DtoMapperDbArrayTest.java
new file mode 100644
index 000000000..df753a706
--- /dev/null
+++ b/querybean-generator/src/test/java/io/ebean/querybean/generator/DtoMapperDbArrayTest.java
@@ -0,0 +1,124 @@
+package io.ebean.querybean.generator;
+
+import org.junit.jupiter.api.Test;
+
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class DtoMapperDbArrayTest {
+
+  @Test
+  void dbArrayList_isSelectedAsScalarColumn() throws IOException {
+    Path sourceDir = Files.createTempDirectory("dto-db-array-src");
+    Path outDir = Files.createTempDirectory("dto-db-array-out");
+    Path genSourceDir = Files.createTempDirectory("dto-db-array-gensrc");
+
+    writeSource(sourceDir, "org.tests.dbarray.ProcessLog",
+      "package org.tests.dbarray;\n"
+        + "import io.ebean.annotation.DbArray;\n"
+        + "import io.ebean.annotation.DbJson;\n"
+        + "import io.ebean.annotation.DbJsonB;\n"
+        + "import jakarta.persistence.Transient;\n"
+        + "public class ProcessLog {\n"
+        + "  @DbArray private java.util.List<Long> sourceIds;\n"
+        + "  @DbJson private java.util.List<Long> jsonIds;\n"
+        + "  @DbJsonB private java.util.List<Long> jsonbIds;\n"
+        + "  @Transient private String computed;\n"
+        + "  public java.util.List<Long> sourceIds() { return sourceIds; }\n"
+        + "  public java.util.List<Long> jsonIds() { return jsonIds; }\n"
+        + "  public java.util.List<Long> jsonbIds() { return jsonbIds; }\n"
+        + "  public String computed() { return computed; }\n"
+        + "}\n");
+    writeSource(sourceDir, "org.tests.dbarray.ProcessLogDto",
+      "package org.tests.dbarray;\n"
+        + "public class ProcessLogDto {\n"
+        + "  private final java.util.List<Long> sourceIds;\n"
+        + "  private final java.util.List<Long> jsonIds;\n"
+        + "  private final java.util.List<Long> jsonbIds;\n"
+        + "  private final String computed;\n"
+        + "  public ProcessLogDto(java.util.List<Long> sourceIds, java.util.List<Long> jsonIds,\n"
+        + "      java.util.List<Long> jsonbIds, String computed) {\n"
+        + "    this.sourceIds = sourceIds; this.jsonIds = jsonIds; this.jsonbIds = jsonbIds; this.computed = computed;\n"
+        + "  }\n"
+        + "  public java.util.List<Long> getSourceIds() { return sourceIds; }\n"
+        + "  public java.util.List<Long> getJsonIds() { return jsonIds; }\n"
+        + "  public java.util.List<Long> getJsonbIds() { return jsonbIds; }\n"
+        + "  public String getComputed() { return computed; }\n"
+        + "}\n");
+    writeSource(sourceDir, "org.tests.dbarray.package-info",
+      "@io.ebean.annotation.DtoMapping(source = ProcessLog.class, target = ProcessLogDto.class)\n"
+        + "package org.tests.dbarray;\n");
+    writeSource(sourceDir, "io.ebean.typequery.Generated",
+      "package io.ebean.typequery;\n"
+        + "public @interface Generated { String value(); }\n");
+
+    DiagnosticCollector<JavaFileObject> diagnostics = new DiagnosticCollector<>();
+    JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+    try (StandardJavaFileManager fileManager = compiler.getStandardFileManager(diagnostics, Locale.getDefault(), null)) {
+      List<Path> sourceFiles;
+      try (var walk = Files.walk(sourceDir)) {
+        sourceFiles = walk.filter(path -> path.toString().endsWith(".java")).collect(Collectors.toList());
+      }
+      Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromPaths(sourceFiles);
+      List<String> options = List.of(
+        "-d", outDir.toString(),
+        "-s", genSourceDir.toString(),
+        "-classpath", System.getProperty("java.class.path"),
+        "-processor", Processor.class.getName());
+
+      JavaCompiler.CompilationTask task = compiler.getTask(
+        null, fileManager, diagnostics, options, null, compilationUnits);
+      assertTrue(task.call(), "compilation failed: " + errors(diagnostics));
+
+      Path mapperFile;
+      try (var walk = Files.walk(genSourceDir)) {
+        mapperFile = walk.filter(path -> path.getFileName().toString().equals("ProcessLogDtoMapper.java"))
+          .findFirst()
+          .orElseThrow(() -> new AssertionError("generated mapper source not found"));
+      }
+      String generated = Files.readString(mapperFile);
+      assertTrue(generated.contains("select(\"sourceIds,jsonIds,jsonbIds\")"), generated);
+      assertTrue(generated.contains("source.sourceIds()"), generated);
+      assertTrue(generated.contains("source.jsonIds()"), generated);
+      assertTrue(generated.contains("source.jsonbIds()"), generated);
+      assertTrue(generated.contains("source.computed()"), generated);
+      assertTrue(!generated.contains("fetch(\"sourceIds\")"), generated);
+      assertTrue(!generated.contains("fetch(\"jsonIds\")"), generated);
+      assertTrue(!generated.contains("fetch(\"jsonbIds\")"), generated);
+    }
+  }
+
+  private List<String> errors(DiagnosticCollector<JavaFileObject> diagnostics) {
+    return diagnostics.getDiagnostics().stream()
+      .filter(diagnostic -> diagnostic.getKind() == Diagnostic.Kind.ERROR)
+      .map(diagnostic -> diagnostic.getMessage(Locale.getDefault()))
+      .collect(Collectors.toList());
+  }
+
+  private void writeSource(Path sourceDir, String fqn, String content) {
+    try {
+      Path packageDir = sourceDir.resolve(fqn.substring(0, fqn.lastIndexOf('.')).replace('.', '/'));
+      Files.createDirectories(packageDir);
+      String simpleName = fqn.substring(fqn.lastIndexOf('.') + 1);
+      try (Writer writer = Files.newBufferedWriter(packageDir.resolve(simpleName + ".java"))) {
+        writer.write(content);
+      }
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+}
diff --git a/tests/pom.xml b/tests/pom.xml
index e2fbbc2ec..5714b0bf7 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>tests</artifactId>
diff --git a/tests/test-dto-mapping/pom.xml b/tests/test-dto-mapping/pom.xml
index 46ce88b1f..256478d94 100644
--- a/tests/test-dto-mapping/pom.xml
+++ b/tests/test-dto-mapping/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.4.0</version>
+    <version>18.5.0</version>
   </parent>
 
   <artifactId>test-dto-mapping</artifactId>
diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml
index 3869a4932..391b52c8a 100644
--- a/tests/test-java16/pom.xml
+++ b/tests/test-java16/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.4.0</version>
+    <version>18.5.0</version>
   </parent>
 
   <artifactId>test-java16</artifactId>
diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml
index df4ec158a..57b5f34e3 100644
--- a/tests/test-kotlin/pom.xml
+++ b/tests/test-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>18.5.0</version>
+    <version>18.6.0</version>
   </parent>
 
   <artifactId>test-kotlin</artifactId>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
     </dependency>
 
     <dependency>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>18.5.0</version>
+      <version>18.6.0</version>
       <scope>test</scope>
     </dependency>