Fix test test-java16 using maven.compiler.release

Rename TQRootBean to QueryBean

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -60,13 +60,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <artifactId>composites</artifactId>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <name>ebean api</name>

ebean-api/src/main/java/io/ebean/Query.java

@@ -510,14 +510,6 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
    */
   QueryType getQueryType();
 
-  /**
-   * Controls, if paginated queries should always append an 'order by id' statement at the end to
-   * guarantee a deterministic sort result. This may affect performance.
-   * If this is not enabled, and an orderBy is set on the query, it's up to the programmer that
-   * this query provides a deterministic result.
-   */
-  Query<T> orderById(boolean orderById);
-
   /**
    * Set the profile location of this query. This is used to relate query execution metrics
    * back to a location like a specific line of code.

ebean-api/src/main/java/io/ebean/QueryBuilder.java

@@ -466,6 +466,14 @@ public interface QueryBuilder<SELF, T> extends QueryBuilderProjection<SELF, T> {
    */
   SELF setOrderBy(OrderBy<T> orderBy);
 
+  /**
+   * Controls, if paginated queries should always append an 'order by id' statement at the end to
+   * guarantee a deterministic sort result. This may affect performance.
+   * If this is not enabled, and an orderBy is set on the query, it's up to the programmer that
+   * this query provides a deterministic result.
+   */
+  SELF orderById(boolean orderById);
+
   /**
    * Execute the query with the given lock type and WAIT.
    * <p>

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,25 +89,25 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
@@ -125,13 +125,13 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
@@ -155,37 +155,37 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-spring-txn</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <!-- platforms -->
@@ -193,79 +193,79 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-clickhouse</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis-types</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>14.0.2</version>
+        <version>14.1.0</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -159,21 +159,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-ddl-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-jackson-mapper/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 

ebean-postgis-types/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -86,7 +86,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.0.3</tile>
+            <tile>io.ebean.tile:enhancement:14.2.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-querybean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,14 +63,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -100,7 +100,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.0.3</tile>
+            <tile>io.ebean.tile:enhancement:14.2.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-querybean/src/main/java/io/ebean/typequery/IQueryBean.java

@@ -0,0 +1,586 @@
+package io.ebean.typequery;
+
+import io.ebean.*;
+import io.ebean.search.MultiMatch;
+import io.ebean.search.TextCommonTerms;
+import io.ebean.search.TextQueryString;
+import io.ebean.search.TextSimple;
+
+import java.util.Collection;
+
+/**
+ * Query bean for strongly typed query construction and execution.
+ * <p>
+ * For each entity bean querybean-generator generates a query bean that implements QueryBean.
+ *
+ * <h2>Example - usage of QCustomer</h2>
+ * <pre>{@code
+ *
+ *  Date fiveDaysAgo = ...
+ *
+ *  List<Customer> customers =
+ *      new QCustomer()
+ *        .name.ilike("rob")
+ *        .status.equalTo(Customer.Status.GOOD)
+ *        .registered.after(fiveDaysAgo)
+ *        .contacts.email.endsWith("@foo.com")
+ *        .orderBy()
+ *          .name.asc()
+ *          .registered.desc()
+ *        .findList();
+ *
+ * }</pre>
+ * <p>
+ * <h2>Resulting SQL where</h2>
+ * <pre>{@code
+ *
+ *   where lower(t0.name) like ? and t0.status = ? and t0.registered > ? and u1.email like ?
+ *   order by t0.name, t0.registered desc;
+ *
+ *   --bind(rob,GOOD,Mon Jul 27 12:05:37 NZST 2015,%@foo.com)
+ *
+ * }</pre>
+ *
+ * @param <T> the entity bean type (normal entity bean type e.g. Customer)
+ * @param <R> the specific query bean type (e.g. QCustomer)
+ */
+public interface IQueryBean<T, R> extends QueryBuilder<R, T> {
+
+  /**
+   * Return the underlying query.
+   * <p>
+   * Generally it is not expected that you will need to do this but typically use
+   * the find methods available on this 'root query bean' instance like findList().
+   */
+  Query<T> query();
+
+  /**
+   * Return the fetch group.
+   */
+  FetchGroup<T> buildFetchGroup();
+
+  /**
+   * Specify the properties to be loaded on the 'main' root level entity bean.
+   * <p>
+   * The resulting entities with be "partially loaded" aka partial objects.
+   * <p>
+   * Alternatively we can use a {@link #select(FetchGroup)} to specify all properties
+   * to load on all parts of the graph.
+   *
+   * <pre>{@code
+   *
+   *   // alias for the customer properties in select()
+   *   QCustomer cust = QCustomer.alias();
+   *
+   *   // alias for the contact properties in contacts.fetch()
+   *   QContact contact = QContact.alias();
+   *
+   *   List<Customer> customers =
+   *     new QCustomer()
+   *       // specify the parts of the graph we want to load
+   *       .select(cust.id, cust.name)
+   *       .contacts.fetch(contact.firstName, contact.lastName, contact.email)
+   *
+   *       // predicates
+   *       .id.gt(1)
+   *       .findList();
+   *
+   * }</pre>
+   *
+   * @param properties the list of properties to fetch
+   */
+  @SuppressWarnings("unchecked")
+  R select(TQProperty<R, ?>... properties);
+
+  /**
+   * Specify the properties to be loaded on the 'main' root level entity bean
+   * also allowing for functions to be used like {@link StdOperators#max(Query.Property)}.
+   *
+   * @param properties the list of properties to fetch
+   */
+  R select(Query.Property<?>... properties);
+
+  /**
+   * Add an expression to the WHERE or HAVING clause.
+   */
+  R add(Expression expression);
+
+  /**
+   * Add EXISTS sub-query predicate.
+   */
+  R exists(Query<?> subQuery);
+
+  /**
+   * Add NOT EXISTS sub-query predicate.
+   */
+  R notExists(Query<?> subQuery);
+
+  /**
+   * EXISTS using a SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  R exists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Not EXISTS using a SQL SubQuery.
+   *
+   * @param sqlSubQuery The SQL SubQuery
+   * @param bindValues  Optional bind values if the SubQuery uses {@code ? } bind values.
+   */
+  R notExists(String sqlSubQuery, Object... bindValues);
+
+  /**
+   * Set the Id value to query. This is used with findOne().
+   * <p>
+   * You can use this to have further control over the query. For example adding fetch joins.
+   * <p>
+   * <pre>{@code
+   *
+   * Order order =
+   *   new QOrder()
+   *     .setId(1)
+   *     .fetch("details")
+   *     .findOne();
+   *
+   * // the order details were eagerly fetched
+   * List<OrderDetail> details = order.getDetails();
+   *
+   * }</pre>
+   */
+  R setId(Object id);
+
+  /**
+   * Set a list of Id values to match.
+   * <p>
+   * <pre>{@code
+   *
+   * List<Order> orders =
+   *   new QOrder()
+   *     .setIdIn(42, 43, 44)
+   *     .findList();
+   *
+   * }</pre>
+   */
+  R setIdIn(Object... ids);
+
+  /**
+   * Set a collection of Id values to match.
+   * <p>
+   * <pre>{@code
+   *
+   * Collection<?> ids = ...
+   *
+   * List<Order> orders =
+   *   new QOrder()
+   *     .setIdIn(ids)
+   *     .findList();
+   *
+   * }</pre>
+   */
+  R setIdIn(Collection<?> ids);
+
+  /**
+   * Add raw expression with no parameters.
+   * <p>
+   * When properties in the clause are fully qualified as table-column names
+   * then they are not translated. logical property name names (not fully
+   * qualified) will still be translated to their physical name.
+   * <p>
+   * <pre>{@code
+   *
+   *   raw("orderQty < shipQty")
+   *
+   * }</pre>
+   *
+   * <h4>Subquery example:</h4>
+   * <pre>{@code
+   *
+   *   .raw("t0.customer_id in (select customer_id from customer_group where group_id = any(?::uuid[]))", groupIds)
+   *
+   * }</pre>
+   */
+  R raw(String rawExpression);
+
+  /**
+   * Add raw expression with an array of parameters.
+   * <p>
+   * The raw expression should contain the same number of ? as there are
+   * parameters.
+   * <p>
+   * When properties in the clause are fully qualified as table-column names
+   * then they are not translated. logical property name names (not fully
+   * qualified) will still be translated to their physical name.
+   */
+  R raw(String rawExpression, Object... bindValues);
+
+  /**
+   * Only add the raw expression if the values is not null or empty.
+   * <p>
+   * This is a pure convenience expression to make it nicer to deal with the pattern where we use
+   * raw() expression with a subquery and only want to add the subquery predicate when the collection
+   * of values is not empty.
+   *
+   * <h3>Without inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   QCustomer query = new QCustomer() // add some predicates
+   *     .status.equalTo(Status.NEW);
+   *
+   *   // common pattern - we can use rawOrEmpty() instead
+   *   if (orderIds != null && !orderIds.isEmpty()) {
+   *     query.raw("t0.customer_id in (select o.customer_id from orders o where o.id in (?1))", orderIds);
+   *   }
+   *
+   *   query.findList();
+   *
+   * }</pre>
+   *
+   * <h3>Using rawOrEmpty()</h3>
+   * Note that in the example below we use the <code>?1</code> bind parameter to get  "parameter expansion"
+   * for each element in the collection.
+   *
+   * <pre>{@code
+   *
+   *   new QCustomer()
+   *     .status.equalTo(Status.NEW)
+   *     // only add the expression if orderIds is not empty
+   *     .rawOrEmpty("t0.customer_id in (select o.customer_id from orders o where o.id in (?1))", orderIds);
+   *     .findList();
+   *
+   * }</pre>
+   *
+   * <h3>Postgres ANY</h3>
+   * With Postgres we would often use the SQL <code>ANY</code> expression and array parameter binding
+   * rather than <code>IN</code>.
+   *
+   * <pre>{@code
+   *
+   *   new QCustomer()
+   *     .status.equalTo(Status.NEW)
+   *     .rawOrEmpty("t0.customer_id in (select o.customer_id from orders o where o.id = any(?))", orderIds);
+   *     .findList();
+   *
+   * }</pre>
+   * <p>
+   * Note that we need to cast the Postgres array for UUID types like:
+   * </p>
+   * <pre>{@code
+   *
+   *   " ... = any(?::uuid[])"
+   *
+   * }</pre>
+   *
+   * @param raw    The raw expression that is typically a subquery
+   * @param values The values which is typically a list or set of id values.
+   */
+  R rawOrEmpty(String raw, Collection<?> values);
+
+  /**
+   * Add raw expression with a single parameter.
+   * <p>
+   * The raw expression should contain a single ? at the location of the
+   * parameter.
+   * <p>
+   * When properties in the clause are fully qualified as table-column names
+   * then they are not translated. logical property name names (not fully
+   * qualified) will still be translated to their physical name.
+   * <p>
+   * <h4>Example:</h4>
+   * <pre>{@code
+   *
+   *   // use a database function
+   *   raw("add_days(orderDate, 10) < ?", someDate)
+   *
+   * }</pre>
+   *
+   * <h4>Subquery example:</h4>
+   * <pre>{@code
+   *
+   *   .raw("t0.customer_id in (select customer_id from customer_group where group_id = any(?::uuid[]))", groupIds)
+   *
+   * }</pre>
+   */
+  R raw(String rawExpression, Object bindValue);
+
+  /**
+   * In expression using multiple columns.
+   */
+  R inTuples(InTuples inTuples);
+
+  /**
+   * Marker that can be used to indicate that the order by clause is defined after this.
+   * <p>
+   * <h2>Example: order by customer name, order date</h2>
+   * <pre>{@code
+   *   List<Order> orders =
+   *          new QOrder()
+   *            .customer.name.ilike("rob")
+   *            .orderBy()
+   *              .customer.name.asc()
+   *              .orderDate.asc()
+   *            .findList();
+   *
+   * }</pre>
+   */
+  R orderBy();
+
+  /**
+   * @deprecated migrate to {@link #orderBy()}.
+   */
+  @Deprecated(since = "13.19", forRemoval = true)
+  R order();
+
+  /**
+   * @deprecated migrate to {@link #orderBy(String)}
+   */
+  @Deprecated(since = "13.19", forRemoval = true)
+  R order(String orderByClause);
+
+  /**
+   * Begin a list of expressions added by 'OR'.
+   * <p>
+   * Use endOr() or endJunction() to stop added to OR and 'pop' to the parent expression list.
+   * <p>
+   * <h2>Example</h2>
+   * <p>
+   * This example uses an 'OR' expression list with an inner 'AND' expression list.
+   * </p>
+   * <pre>{@code
+   *
+   *    List<Customer> customers =
+   *          new QCustomer()
+   *            .status.equalTo(Customer.Status.GOOD)
+   *            .or()
+   *              .id.greaterThan(1000)
+   *              .and()
+   *                .name.startsWith("super")
+   *                .registered.after(fiveDaysAgo)
+   *              .endAnd()
+   *            .endOr()
+   *            .orderBy().id.desc()
+   *            .findList();
+   *
+   * }</pre>
+   * <h2>Resulting SQL where clause</h2>
+   * <pre>{@code sql
+   *
+   *    where t0.status = ?  and (t0.id > ?  or (t0.name like ?  and t0.registered > ? ) )
+   *    order by t0.id desc;
+   *
+   *    --bind(GOOD,1000,super%,Wed Jul 22 00:00:00 NZST 2015)
+   *
+   * }</pre>
+   */
+  R or();
+
+  /**
+   * Begin a list of expressions added by 'AND'.
+   * <p>
+   * Use endAnd() or endJunction() to stop added to AND and 'pop' to the parent expression list.
+   * <p>
+   * Note that typically the AND expression is only used inside an outer 'OR' expression.
+   * This is because the top level expression list defaults to an 'AND' expression list.
+   *
+   * <h2>Example</h2>
+   * <p>
+   * This example uses an 'OR' expression list with an inner 'AND' expression list.
+   * </p>
+   * <pre>{@code
+   *
+   *    List<Customer> customers =
+   *          new QCustomer()
+   *            .status.equalTo(Customer.Status.GOOD)
+   *            .or() // OUTER 'OR'
+   *              .id.greaterThan(1000)
+   *              .and()  // NESTED 'AND' expression list
+   *                .name.startsWith("super")
+   *                .registered.after(fiveDaysAgo)
+   *                .endAnd()
+   *              .endOr()
+   *            .orderBy().id.desc()
+   *            .findList();
+   *
+   * }</pre>
+   * <h2>Resulting SQL where clause</h2>
+   * <pre>{@code sql
+   *
+   *    where t0.status = ?  and (t0.id > ?  or (t0.name like ?  and t0.registered > ? ) )
+   *    order by t0.id desc;
+   *
+   *    --bind(GOOD,1000,super%,Wed Jul 22 00:00:00 NZST 2015)
+   *
+   * }</pre>
+   */
+  R and();
+
+  /**
+   * Begin a list of expressions added by NOT.
+   * <p>
+   * Use endNot() or endJunction() to stop added to NOT and 'pop' to the parent expression list.
+   */
+  R not();
+
+  /**
+   * Begin a list of expressions added by MUST.
+   * <p>
+   * This automatically makes this query a document store query.
+   * <p>
+   * Use endJunction() to stop added to MUST and 'pop' to the parent expression list.
+   */
+  R must();
+
+  /**
+   * Begin a list of expressions added by MUST NOT.
+   * <p>
+   * This automatically makes this query a document store query.
+   * <p>
+   * Use endJunction() to stop added to MUST NOT and 'pop' to the parent expression list.
+   */
+  R mustNot();
+
+  /**
+   * Begin a list of expressions added by SHOULD.
+   * <p>
+   * This automatically makes this query a document store query.
+   * <p>
+   * Use endJunction() to stop added to SHOULD and 'pop' to the parent expression list.
+   */
+  R should();
+
+  /**
+   * End a list of expressions added by 'OR'.
+   */
+  R endJunction();
+
+  /**
+   * End OR junction - synonym for endJunction().
+   */
+  R endOr();
+
+  /**
+   * End AND junction - synonym for endJunction().
+   */
+  R endAnd();
+
+  /**
+   * End NOT junction - synonym for endJunction().
+   */
+  R endNot();
+
+  /**
+   * Add expression after this to the WHERE expression list.
+   * <p>
+   * For queries against the normal database (not the doc store) this has no effect.
+   * <p>
+   * This is intended for use with Document Store / ElasticSearch where expressions can be put into either
+   * the "query" section or the "filter" section of the query. Full text expressions like MATCH are in the
+   * "query" section but many expression can be in either - expressions after the where() are put into the
+   * "filter" section which means that they don't add to the relevance and are also cache-able.
+   */
+  R where();
+
+  /**
+   * Begin added expressions to the 'Text' expression list.
+   * <p>
+   * This automatically makes the query a document store query.
+   * <p>
+   * For ElasticSearch expressions added to 'text' go into the ElasticSearch 'query context'
+   * and expressions added to 'where' go into the ElasticSearch 'filter context'.
+   */
+  R text();
+
+  /**
+   * Add a Text Multi-match expression (document store only).
+   * <p>
+   * This automatically makes the query a document store query.
+   */
+  R multiMatch(String query, MultiMatch multiMatch);
+
+  /**
+   * Add a Text Multi-match expression (document store only).
+   * <p>
+   * This automatically makes the query a document store query.
+   */
+  R multiMatch(String query, String... properties);
+
+  /**
+   * Add a Text common terms expression (document store only).
+   * <p>
+   * This automatically makes the query a document store query.
+   */
+  R textCommonTerms(String query, TextCommonTerms options);
+
+  /**
+   * Add a Text simple expression (document store only).
+   * <p>
+   * This automatically makes the query a document store query.
+   */
+  R textSimple(String query, TextSimple options);
+
+  /**
+   * Add a Text query string expression (document store only).
+   * <p>
+   * This automatically makes the query a document store query.
+   */
+  R textQueryString(String query, TextQueryString options);
+
+  /**
+   * Return the expression list that has been built for this query.
+   */
+  ExpressionList<T> getExpressionList();
+
+  /**
+   * Start adding expressions to the having clause when using @Aggregation properties.
+   *
+   * <pre>{@code
+   *
+   *   new QMachineUse()
+   *   // where ...
+   *   .date.inRange(fromDate, toDate)
+   *
+   *   .having()
+   *   .sumHours.greaterThan(1)
+   *   .findList()
+   *
+   *   // The sumHours property uses @Aggregation
+   *   // e.g. @Aggregation("sum(hours)")
+   *
+   * }</pre>
+   */
+  R having();
+
+  /**
+   * Return the underlying having clause to typically when using dynamic aggregation formula.
+   * <p>
+   * Note that after this we no longer have the query bean so typically we use this right
+   * at the end of the query.
+   *
+   * <pre>{@code
+   *
+   *  // sum(distanceKms) ... is a "dynamic formula"
+   *  // so we use havingClause() for it like:
+   *
+   *  List<MachineUse> machineUse =
+   *
+   *    new QMachineUse()
+   *      .select("machine, sum(fuelUsed), sum(distanceKms)")
+   *
+   *      // where ...
+   *      .date.greaterThan(LocalDate.now().minusDays(7))
+   *
+   *      .havingClause()
+   *        .gt("sum(distanceKms)", 2)
+   *        .findList();
+   *
+   * }</pre>
+   */
+  ExpressionList<T> havingClause();
+
+  /**
+   * Set the profile location of this query. This is used to relate query execution metrics
+   * back to a location like a specific line of code.
+   */
+  R setProfileLocation(ProfileLocation profileLocation);
+}

ebean-querybean/src/main/java/io/ebean/typequery/TQAssocBean.java

@@ -46,7 +46,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Eagerly fetch this association fetching all the properties.
    */
   public final R fetch() {
-    ((TQRootBean) _root).query().fetch(_name);
+    ((QueryBean) _root).query().fetch(_name);
     return _root;
   }
 
@@ -54,7 +54,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Eagerly fetch this association using a "query join".
    */
   public final R fetchQuery() {
-    ((TQRootBean) _root).query().fetchQuery(_name);
+    ((QueryBean) _root).query().fetchQuery(_name);
     return _root;
   }
 
@@ -63,7 +63,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Cache misses are populated via fetchQuery().
    */
   public final R fetchCache() {
-    ((TQRootBean) _root).query().fetchCache(_name);
+    ((QueryBean) _root).query().fetchCache(_name);
     return _root;
   }
 
@@ -71,7 +71,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Use lazy loading for fetching this association.
    */
   public final R fetchLazy() {
-    ((TQRootBean) _root).query().fetchLazy(_name);
+    ((QueryBean) _root).query().fetchLazy(_name);
     return _root;
   }
 
@@ -79,7 +79,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Eagerly fetch this association with the properties specified.
    */
   public final R fetch(String properties) {
-    ((TQRootBean) _root).query().fetch(_name, properties);
+    ((QueryBean) _root).query().fetch(_name, properties);
     return _root;
   }
 
@@ -87,7 +87,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Eagerly fetch this association using a "query join" with the properties specified.
    */
   public final R fetchQuery(String properties) {
-    ((TQRootBean) _root).query().fetchQuery(_name, properties);
+    ((QueryBean) _root).query().fetchQuery(_name, properties);
     return _root;
   }
 
@@ -96,7 +96,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
    * Cache misses are populated via  fetchQuery().
    */
   public final R fetchCache(String properties) {
-    ((TQRootBean) _root).query().fetchCache(_name, properties);
+    ((QueryBean) _root).query().fetchCache(_name, properties);
     return _root;
   }
 
@@ -177,7 +177,7 @@ public abstract class TQAssocBean<T, R, QB> extends TQAssoc<T, R> {
   }
 
   private SpiQueryFetch spiQuery() {
-    return (SpiQueryFetch) ((TQRootBean) _root).query();
+    return (SpiQueryFetch) ((QueryBean) _root).query();
   }
 
   private Set<String> properties(TQProperty<?, ?>... props) {

ebean-querybean/src/main/java/io/ebean/typequery/TQProperty.java

@@ -41,7 +41,7 @@ public class TQProperty<R, T> implements Query.Property<T> {
    * Internal method to return the underlying expression list.
    */
   protected final ExpressionList<?> expr() {
-    return ((TQRootBean<?, ?>) _root).peekExprList();
+    return ((QueryBean<?, ?>) _root).peekExprList();
   }
 
   /**

ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java

@@ -1,899 +0,0 @@
-package io.ebean.typequery;
-
-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
-import io.ebean.*;
-import io.ebean.search.MultiMatch;
-import io.ebean.search.TextCommonTerms;
-import io.ebean.search.TextQueryString;
-import io.ebean.search.TextSimple;
-import io.ebean.service.SpiFetchGroupQuery;
-import io.ebeaninternal.api.SpiQueryFetch;
-import io.ebeaninternal.server.util.ArrayStack;
-
-import java.sql.Connection;
-import java.sql.Timestamp;
-import java.util.*;
-import java.util.function.BooleanSupplier;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
-
-/**
- * Base root query bean providing common features for all root query beans.
- * <p>
- * For each entity bean querybean-generator generates a query bean that extends TQRootBean.
- *
- * <h2>Example - usage of QCustomer</h2>
- * <pre>{@code
- *
- *  Date fiveDaysAgo = ...
- *
- *  List<Customer> customers =
- *      new QCustomer()
- *        .name.ilike("rob")
- *        .status.equalTo(Customer.Status.GOOD)
- *        .registered.after(fiveDaysAgo)
- *        .contacts.email.endsWith("@foo.com")
- *        .orderBy()
- *          .name.asc()
- *          .registered.desc()
- *        .findList();
- *
- * }</pre>
- * <p>
- * <h2>Resulting SQL where</h2>
- * <p>
- * <pre>{@code
- *
- *   where lower(t0.name) like ?  and t0.status = ?  and t0.registered > ?  and u1.email like ?
- *   order by t0.name, t0.registered desc;
- *
- *   --bind(rob,GOOD,Mon Jul 27 12:05:37 NZST 2015,%@foo.com)
- *
- * }</pre>
- *
- * @param <T> the entity bean type (normal entity bean type e.g. Customer)
- * @param <R> the specific root query bean type (e.g. QCustomer)
- */
-@NonNullApi
-public abstract class TQRootBean<T, R> implements QueryBean<T, R> {
-
-  /**
-   * The underlying query.
-   */
-  private final Query<T> query;
-
-  /**
-   * The root query bean instance. Used to provide fluid query construction.
-   */
-  private final R root;
-
-  /**
-   * The underlying expression lists held as a stack. Pushed and popped based on and/or (conjunction/disjunction).
-   */
-  private ArrayStack<ExpressionList<T>> whereStack;
-
-  /**
-   * Stack of Text expressions ("query" section of ElasticSearch query rather than "filter" section).
-   */
-  private ArrayStack<ExpressionList<T>> textStack;
-
-  /**
-   * When true expressions should be added to the "text" stack - ElasticSearch "query" section
-   * rather than the "where" stack.
-   */
-  private boolean textMode;
-
-  /**
-   * Construct using the type of bean to query on and the default database.
-   */
-  public TQRootBean(Class<T> beanType) {
-    this(beanType, DB.getDefault());
-  }
-
-  /**
-   * Construct using the type of bean to query on and a given database.
-   */
-  public TQRootBean(Class<T> beanType, Database database) {
-    this(database.find(beanType));
-  }
-
-  /**
-   * Construct with a transaction.
-   */
-  protected TQRootBean(Class<T> beanType, Transaction transaction) {
-    this(beanType);
-    query.usingTransaction(transaction);
-  }
-
-  /**
-   * Construct with a database and transaction.
-   */
-  protected TQRootBean(Class<T> beanType, Database database, Transaction transaction) {
-    this(beanType, database);
-    query.usingTransaction(transaction);
-  }
-
-  /**
-   * Construct using a query.
-   */
-  @SuppressWarnings("unchecked")
-  public TQRootBean(Query<T> query) {
-    this.query = query;
-    this.root = (R) this;
-  }
-
-  /**
-   * Construct for using as an 'Alias' to use the properties as known string
-   * values for select() and fetch().
-   */
-  @SuppressWarnings("unchecked")
-  public TQRootBean(boolean aliasDummy) {
-    this.query = null;
-    this.root = (R) this;
-  }
-
-  /** Construct for FilterMany */
-  protected TQRootBean(ExpressionList<T> filter) {
-    this.query = null;
-    this.root = null;
-    this.whereStack = new ArrayStack<>();
-    whereStack.push(filter);
-  }
-
-  @Override
-  public FetchGroup<T> buildFetchGroup() {
-    return ((SpiFetchGroupQuery<T>) query()).buildFetchGroup();
-  }
-
-  @Override
-  public Query<T> query() {
-    return query;
-  }
-
-  @Override
-  public R select(String properties) {
-    query.select(properties);
-    return root;
-  }
-
-  @Override
-  public R select(FetchGroup<T> fetchGroup) {
-    query.select(fetchGroup);
-    return root;
-  }
-
-  @Override
-  @SafeVarargs
-  public final R select(TQProperty<R, ?>... properties) {
-    ((SpiQueryFetch) query).selectProperties(properties(properties));
-    return root;
-  }
-
-  private Set<String> properties(Query.Property<?>[] properties) {
-    Set<String> props = new LinkedHashSet<>();
-    for (Query.Property<?> property : properties) {
-      props.add(property.toString());
-    }
-    return props;
-  }
-
-  @Override
-  public final R select(Query.Property<?>... properties) {
-    ((SpiQueryFetch) query).selectProperties(properties(properties));
-    return root;
-  }
-
-  @Override
-  public final R fetch(String path) {
-    query.fetch(path);
-    return root;
-  }
-
-  @Override
-  public final R fetchQuery(String path) {
-    query.fetchQuery(path);
-    return root;
-  }
-
-  @Override
-  public final R fetchCache(String path) {
-    query.fetchCache(path);
-    return root;
-  }
-
-  @Override
-  public final R fetchQuery(String path, String properties) {
-    query.fetchQuery(path, properties);
-    return root;
-  }
-
-  @Override
-  public final R fetchCache(String path, String properties) {
-    query.fetchCache(path, properties);
-    return root;
-  }
-
-  @Override
-  public final R fetch(String path, String properties) {
-    query.fetch(path, properties);
-    return root;
-  }
-
-  @Override
-  public final R fetch(String path, String properties, FetchConfig fetchConfig) {
-    query.fetch(path, properties, fetchConfig);
-    return root;
-  }
-
-  @Override
-  public final R fetch(String path, FetchConfig fetchConfig) {
-    query.fetch(path, fetchConfig);
-    return root;
-  }
-
-  @Override
-  public R fetchLazy(String path, String fetchProperties) {
-    query.fetchLazy(path, fetchProperties);
-    return root;
-  }
-
-  @Override
-  public R fetchLazy(String path) {
-    query.fetchLazy(path);
-    return root;
-  }
-
-  @Override
-  public final R apply(FetchPath pathProperties) {
-    query.apply(pathProperties);
-    return root;
-  }
-
-  @Override
-  public final R alsoIf(BooleanSupplier predicate, Consumer<R> apply) {
-    if (predicate.getAsBoolean()) {
-      apply.accept(root);
-    }
-    return root;
-  }
-
-  @Override
-  public final R asOf(Timestamp asOf) {
-    query.asOf(asOf);
-    return root;
-  }
-
-  @Override
-  public final R asDraft() {
-    query.asDraft();
-    return root;
-  }
-
-  @Override
-  public final R setIncludeSoftDeletes() {
-    query.setIncludeSoftDeletes();
-    return root;
-  }
-
-  @Override
-  public final R add(Expression expression) {
-    peekExprList().add(expression);
-    return root;
-  }
-
-  @Override
-  public final R alias(String alias) {
-    query.alias(alias);
-    return root;
-  }
-
-  @Override
-  public final R setMaxRows(int maxRows) {
-    query.setMaxRows(maxRows);
-    return root;
-  }
-
-  @Override
-  public final R setFirstRow(int firstRow) {
-    query.setFirstRow(firstRow);
-    return root;
-  }
-
-  @Override
-  public final R setAllowLoadErrors() {
-    query.setAllowLoadErrors();
-    return root;
-  }
-
-  @Override
-  public final R setAutoTune(boolean autoTune) {
-    query.setAutoTune(autoTune);
-    return root;
-  }
-
-  @Override
-  public final R setBufferFetchSizeHint(int fetchSize) {
-    query.setBufferFetchSizeHint(fetchSize);
-    return root;
-  }
-
-  @Override
-  public final R setDistinct(boolean distinct) {
-    query.setDistinct(distinct);
-    return root;
-  }
-
-  @Override
-  public final R setDocIndexName(String indexName) {
-    query.setDocIndexName(indexName);
-    return root;
-  }
-
-  @Override
-  public final R setInheritType(Class<? extends T> type) {
-    query.setInheritType(type);
-    return root;
-  }
-
-  @Override
-  public final R setBaseTable(String baseTable) {
-    query.setBaseTable(baseTable);
-    return root;
-  }
-
-  @Override
-  public final R withLock(Query.LockType lockType) {
-    query.withLock(lockType);
-    return root;
-  }
-
-  @Override
-  public final R withLock(Query.LockType lockType, Query.LockWait lockWait) {
-    query.withLock(lockType, lockWait);
-    return root;
-  }
-
-  @Override
-  public final R exists(Query<?> subQuery) {
-    peekExprList().exists(subQuery);
-    return root;
-  }
-
-  @Override
-  public final R notExists(Query<?> subQuery) {
-    peekExprList().notExists(subQuery);
-    return root;
-  }
-
-  @Override
-  public final R exists(String sqlSubQuery, Object... bindValues) {
-    peekExprList().exists(sqlSubQuery, bindValues);
-    return root;
-  }
-
-  @Override
-  public final R notExists(String sqlSubQuery, Object... bindValues) {
-    peekExprList().notExists(sqlSubQuery, bindValues);
-    return root;
-  }
-
-  @Override
-  public final R forUpdate() {
-    query.forUpdate();
-    return root;
-  }
-
-  @Override
-  public final R forUpdateNoWait() {
-    query.forUpdateNoWait();
-    return root;
-  }
-
-  @Override
-  public final R forUpdateSkipLocked() {
-    query.forUpdateSkipLocked();
-    return root;
-  }
-
-  @Override
-  public final UpdateQuery<T> asUpdate() {
-    return query.asUpdate();
-  }
-
-  @Override
-  public final <D> DtoQuery<D> asDto(Class<D> dtoClass) {
-    return query.asDto(dtoClass);
-  }
-
-  @Override
-  public final R setId(Object id) {
-    query.setId(id);
-    return root;
-  }
-
-  @Override
-  public final R setIdIn(Object... ids) {
-    query.where().idIn(ids);
-    return root;
-  }
-
-  @Override
-  public final R setIdIn(Collection<?> ids) {
-    query.where().idIn(ids);
-    return root;
-  }
-
-  @Override
-  public final R setLabel(String label) {
-    query.setLabel(label);
-    return root;
-  }
-
-  @Override
-  public final R setHint(String hint) {
-    query.setHint(hint);
-    return root;
-  }
-
-  @Override
-  public final R setProfileLocation(ProfileLocation profileLocation) {
-    query.setProfileLocation(profileLocation);
-    return root;
-  }
-
-  @Override
-  public final R setLazyLoadBatchSize(int lazyLoadBatchSize) {
-    query.setLazyLoadBatchSize(lazyLoadBatchSize);
-    return root;
-  }
-
-  @Override
-  public final R setMapKey(String mapKey) {
-    query.setMapKey(mapKey);
-    return root;
-  }
-
-  @Override
-  public final R setPersistenceContextScope(PersistenceContextScope scope) {
-    query.setPersistenceContextScope(scope);
-    return root;
-  }
-
-  @Override
-  public R setCountDistinct(CountDistinctOrder orderBy) {
-    query.setCountDistinct(orderBy);
-    return root;
-  }
-
-  @Override
-  public final R setRawSql(RawSql rawSql) {
-    query.setRawSql(rawSql);
-    return root;
-  }
-
-  @Override
-  public final R setReadOnly(boolean readOnly) {
-    query.setReadOnly(readOnly);
-    return root;
-  }
-
-  @Override
-  public final R setBeanCacheMode(CacheMode beanCacheMode) {
-    query.setBeanCacheMode(beanCacheMode);
-    return root;
-  }
-
-  @Override
-  public final R setUseDocStore(boolean useDocStore) {
-    query.setUseDocStore(useDocStore);
-    return root;
-  }
-
-  @Override
-  public final R setDisableLazyLoading(boolean disableLazyLoading) {
-    query.setDisableLazyLoading(disableLazyLoading);
-    return root;
-  }
-
-  @Override
-  public final R setDisableReadAuditing() {
-    query.setDisableReadAuditing();
-    return root;
-  }
-
-  @Override
-  public final R setUseQueryCache(CacheMode cacheMode) {
-    query.setUseQueryCache(cacheMode);
-    return root;
-  }
-
-  @Override
-  public final R setTimeout(int secs) {
-    query.setTimeout(secs);
-    return root;
-  }
-
-  @Override
-  public final Set<String> validate() {
-    return query.validate();
-  }
-
-  @Override
-  public final R raw(String rawExpression) {
-    peekExprList().raw(rawExpression);
-    return root;
-  }
-
-  @Override
-  public final R raw(String rawExpression, Object... bindValues) {
-    peekExprList().raw(rawExpression, bindValues);
-    return root;
-  }
-
-  @Override
-  public final R rawOrEmpty(String raw, Collection<?> values) {
-    peekExprList().rawOrEmpty(raw, values);
-    return root;
-  }
-
-  @Override
-  public final R raw(String rawExpression, Object bindValue) {
-    peekExprList().raw(rawExpression, bindValue);
-    return root;
-  }
-
-  @Override
-  public final R inTuples(InTuples inTuples) {
-    peekExprList().inTuples(inTuples);
-    return root;
-  }
-
-  @Override
-  public final R orderBy() {
-    // Yes this does not actually do anything! We include it because style wise it makes
-    // the query nicer to read and suggests that order by definitions are added after this
-    return root;
-  }
-
-  @Override
-  @Deprecated(since = "13.19", forRemoval = true)
-  public final R order() {
-    return root;
-  }
-
-  @Override
-  public final R orderBy(String orderByClause) {
-    query.orderBy(orderByClause);
-    return root;
-  }
-
-  @Override
-  public R setOrderBy(OrderBy<T> orderBy) {
-    query.setOrderBy(orderBy);
-    return root;
-  }
-
-  @Override
-  @Deprecated(since = "13.19", forRemoval = true)
-  public final R order(String orderByClause) {
-    return orderBy(orderByClause);
-  }
-
-  @Override
-  public final R or() {
-    pushExprList(peekExprList().or());
-    return root;
-  }
-
-  @Override
-  public final R and() {
-    pushExprList(peekExprList().and());
-    return root;
-  }
-
-  @Override
-  public final R not() {
-    pushExprList(peekExprList().not());
-    return root;
-  }
-
-  @Override
-  public final R must() {
-    pushExprList(peekExprList().must());
-    return root;
-  }
-
-  @Override
-  public final R mustNot() {
-    return pushExprList(peekExprList().mustNot());
-  }
-
-  @Override
-  public final R should() {
-    return pushExprList(peekExprList().should());
-  }
-
-  @Override
-  public final R endJunction() {
-    if (textMode) {
-      textStack.pop();
-    } else {
-      whereStack.pop();
-    }
-    return root;
-  }
-
-  @Override
-  public final R endOr() {
-    return endJunction();
-  }
-
-  @Override
-  public final R endAnd() {
-    return endJunction();
-  }
-
-  @Override
-  public final R endNot() {
-    return endJunction();
-  }
-
-  /**
-   * Push the expression list onto the appropriate stack.
-   */
-  private R pushExprList(ExpressionList<T> list) {
-    if (textMode) {
-      textStack.push(list);
-    } else {
-      whereStack.push(list);
-    }
-    return root;
-  }
-
-  @Override
-  public final R where() {
-    textMode = false;
-    return root;
-  }
-
-  @Override
-  public final R text() {
-    textMode = true;
-    return root;
-  }
-
-  @Override
-  public final R multiMatch(String query, MultiMatch multiMatch) {
-    peekExprList().multiMatch(query, multiMatch);
-    return root;
-  }
-
-  @Override
-  public final R multiMatch(String query, String... properties) {
-    peekExprList().multiMatch(query, properties);
-    return root;
-  }
-
-  @Override
-  public final R textCommonTerms(String query, TextCommonTerms options) {
-    peekExprList().textCommonTerms(query, options);
-    return root;
-  }
-
-  @Override
-  public final R textSimple(String query, TextSimple options) {
-    peekExprList().textSimple(query, options);
-    return root;
-  }
-
-  @Override
-  public final R textQueryString(String query, TextQueryString options) {
-    peekExprList().textQueryString(query, options);
-    return root;
-  }
-
-  @Override
-  public final R usingTransaction(Transaction transaction) {
-    query.usingTransaction(transaction);
-    return root;
-  }
-
-  @Override
-  public final R usingConnection(Connection connection) {
-    query.usingConnection(connection);
-    return root;
-  }
-
-  @Override
-  public R usingDatabase(Database database) {
-    query.usingDatabase(database);
-    return root;
-  }
-
-  @Override
-  public final R usingMaster() {
-    query.usingMaster();
-    return root;
-  }
-
-  @Override
-  public final boolean exists() {
-    return query.exists();
-  }
-
-  @Override
-  @Nullable
-  public final T findOne() {
-    return query.findOne();
-  }
-
-  @Override
-  public final Optional<T> findOneOrEmpty() {
-    return query.findOneOrEmpty();
-  }
-
-  @Override
-  public final List<T> findList() {
-    return query.findList();
-  }
-
-  @Override
-  public final Stream<T> findStream() {
-    return query.findStream();
-  }
-
-  @Override
-  public final Set<T> findSet() {
-    return query.findSet();
-  }
-
-  @Override
-  public final <A> List<A> findIds() {
-    return query.findIds();
-  }
-
-  @Override
-  public final <K> Map<K, T> findMap() {
-    return query.findMap();
-  }
-
-  @Override
-  public final QueryIterator<T> findIterate() {
-    return query.findIterate();
-  }
-
-  @Override
-  public final <A> List<A> findSingleAttributeList() {
-    return query.findSingleAttributeList();
-  }
-
-  @Override
-  public final <A> Set<A> findSingleAttributeSet() {
-    return query.findSingleAttributeSet();
-  }
-
-  @Override
-  @Nullable
-  public final <A> A findSingleAttribute() {
-    return query.findSingleAttribute();
-  }
-
-  @Override
-  public final <A> Optional<A> findSingleAttributeOrEmpty() {
-    return query.findSingleAttributeOrEmpty();
-  }
-
-  @Override
-  public final void findEach(Consumer<T> consumer) {
-    query.findEach(consumer);
-  }
-
-  @Override
-  public final void findEach(int batch, Consumer<List<T>> consumer) {
-    query.findEach(batch, consumer);
-  }
-
-  @Override
-  public final void findEachWhile(Predicate<T> consumer) {
-    query.findEachWhile(consumer);
-  }
-
-  @Override
-  public final List<Version<T>> findVersions() {
-    return query.findVersions();
-  }
-
-  @Override
-  public final List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end) {
-    return query.findVersionsBetween(start, end);
-  }
-
-  @Override
-  public final int findCount() {
-    return query.findCount();
-  }
-
-  @Override
-  public final FutureRowCount<T> findFutureCount() {
-    return query.findFutureCount();
-  }
-
-  @Override
-  public final FutureIds<T> findFutureIds() {
-    return query.findFutureIds();
-  }
-
-  @Override
-  public final FutureList<T> findFutureList() {
-    return query.findFutureList();
-  }
-
-  @Override
-  public final PagedList<T> findPagedList() {
-    return query.findPagedList();
-  }
-
-  @Override
-  public final int delete() {
-    return query.delete();
-  }
-
-  @Override
-  public final String getGeneratedSql() {
-    return query.getGeneratedSql();
-  }
-
-  @Override
-  public final Class<T> getBeanType() {
-    return query.getBeanType();
-  }
-
-  @Override
-  public final ExpressionList<T> getExpressionList() {
-    return query.where();
-  }
-
-  @Override
-  public final R having() {
-    if (whereStack == null) {
-      whereStack = new ArrayStack<>();
-    }
-    // effectively putting having expression list onto stack
-    // such that expression now add to the having clause
-    whereStack.push(query.having());
-    return root;
-  }
-
-  @Override
-  public final ExpressionList<T> havingClause() {
-    return query.having();
-  }
-
-  /**
-   * Return the current expression list that expressions should be added to.
-   */
-  protected final ExpressionList<T> peekExprList() {
-    if (textMode) {
-      // return the current text expression list
-      return _peekText();
-    }
-    if (whereStack == null) {
-      whereStack = new ArrayStack<>();
-      whereStack.push(query.where());
-    }
-    // return the current expression list
-    return whereStack.peek();
-  }
-
-  protected final ExpressionList<T> _peekText() {
-    if (textStack == null) {
-      textStack = new ArrayStack<>();
-      // empty so push on the queries base expression list
-      textStack.push(query.text());
-    }
-    // return the current expression list
-    return textStack.peek();
-  }
-}

ebean-querybean/src/test/java/org/querytest/QOrderTest.java

@@ -79,6 +79,28 @@ class QOrderTest {
     DB.delete(customer);
   }
 
+  @Test
+  void orderById() {
+    Query<Order> query = new QOrder()
+      .select(QOrder.Alias.status)
+      .orderById(true).query();
+
+    query.findList();
+
+    String sql = query.getGeneratedSql();
+    assertThat(sql).contains("select /* QOrderTest.orderById:88 */ t0.id, t0.status from o_order t0 order by t0.id");
+
+    Query<Order> query2 = new QOrder()
+      .select(QOrder.Alias.status)
+      .orderById(true).orderBy().status.asc()
+      .query();
+
+    query2.findList();
+
+    String sql2 = query2.getGeneratedSql();
+    assertThat(sql2).contains("select /* QOrderTest.orderById:98 */ t0.id, t0.status from o_order t0 order by t0.status, t0.id");
+  }
+
   @Test
   void hint() {
     LoggedSql.start();

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,28 +22,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -72,7 +72,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.0.3</tile>
+            <tile>io.ebean.tile:enhancement:14.2.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-spring-txn/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -99,7 +99,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.0.3</tile>
+            <tile>io.ebean.tile:enhancement:14.2.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -12,7 +12,7 @@
   <artifactId>ebean-test</artifactId>
 
   <properties>
-    <bytebuddy.version>1.14.12</bytebuddy.version>
+    <bytebuddy.version>1.14.13</bytebuddy.version>
     <assertj.version>3.25.3</assertj.version>
   </properties>
 
@@ -33,20 +33,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -149,14 +149,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -293,7 +293,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
       <scope>provided</scope>
     </dependency>
 
@@ -309,7 +309,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:13.22.0</tile>
+            <tile>io.ebean.tile:enhancement:14.2.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-test/src/test/java/org/tests/cascade/TestLazyLoadMany.java

@@ -18,6 +18,7 @@ class TestLazyLoadMany extends BaseTestCase {
     }
     return m0;
   }
+
   @Test
   void loadAfterPCCleared() {
 
@@ -31,6 +32,7 @@ class TestLazyLoadMany extends BaseTestCase {
       List<COOne> children = DB.find(COOne.class)
         .setLazyLoadBatchSize(2)
         .where().startsWith("name", "tll-m")
+        .orderBy("name")
         .findList();
 
       assertThat(children).hasSize(3);

ebean-test/src/test/resources/logback-test.xml

@@ -82,9 +82,9 @@
 
 <!--  <logger name="io.ebean.DDL" level="DEBUG"/>-->
 
-  <logger name="io.ebean.SQL" level="TRACE"/>
-  <logger name="io.ebean.TXN" level="TRACE"/>
-  <logger name="io.ebean.SUM" level="TRACE"/>
+<!--  <logger name="io.ebean.SQL" level="TRACE"/>-->
+<!--  <logger name="io.ebean.TXN" level="TRACE"/>-->
+<!--  <logger name="io.ebean.SUM" level="TRACE"/>-->
 
 <!--  <logger name="io.ebean.cache" level="TRACE"/>-->
 <!--  <logger name="io.ebean.cache.REGION" level="TRACE"/>-->

howto-deploy-to-central.md

@@ -15,7 +15,7 @@ mvn -T 4 clean package
 mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests -DskipStagingRepositoryClose=true -DstagingProgressTimeoutMinutes=9
 
 ## git commit, git tag, git push --tags
-git commit -am 'Version 14.0.2'
+git commit -am 'Version 14.1.0'
 git tag 14.0.2
 git push --tags
 

kotlin-querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -56,14 +56,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 

kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java

@@ -337,7 +337,7 @@ class SimpleQueryBeanWriter {
       writer.append(" */").eol();
       writer.append(Constants.AT_GENERATED).eol();
       writer.append(Constants.AT_TYPEQUERYBEAN).eol();
-      writer.append("class Q%s : io.ebean.typequery.TQRootBean<%s, Q%s> {", shortName, beanFullName, shortName).eol();
+      writer.append("class Q%s : io.ebean.typequery.QueryBean<%s, Q%s> {", shortName, beanFullName, shortName).eol();
     }
 
     writer.eol();

platforms/all/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,67 +15,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core

platforms/hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/hsqldb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,13 +15,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <artifactId>platforms</artifactId>

platforms/postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>

platforms/sqlanywhere/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

platforms/sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
   </dependencies>

pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>3.12</version>
+    <version>4.1</version>
   </parent>
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>14.0.2</version>
+  <version>14.1.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -51,10 +51,10 @@
     <ebean-ddl-runner.version>2.3</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
     <ebean-migration.version>14.0.0</ebean-migration.version>
-    <ebean-test-containers.version>7.3</ebean-test-containers.version>
-    <ebean-datasource.version>8.12</ebean-datasource.version>
-    <ebean-agent.version>14.0.3</ebean-agent.version>
-    <ebean-maven-plugin.version>14.0.3</ebean-maven-plugin.version>
+    <ebean-test-containers.version>7.4</ebean-test-containers.version>
+    <ebean-datasource.version>8.14</ebean-datasource.version>
+    <ebean-agent.version>14.2.1</ebean-agent.version>
+    <ebean-maven-plugin.version>14.2.1</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
       <scope>test</scope>
     </dependency>
 

querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <name>querybean generator</name>

querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java

@@ -225,7 +225,7 @@ class SimpleQueryBeanWriter {
       writer.append("public final class Q%s {", shortName).eol();
     } else {
       writer.append(Constants.AT_TYPEQUERYBEAN).eol();
-      writer.append("public final class Q%s extends io.ebean.typequery.TQRootBean<%s,Q%s> {", shortName, beanFullName, shortName).eol();
+      writer.append("public final class Q%s extends io.ebean.typequery.QueryBean<%s,Q%s> {", shortName, beanFullName, shortName).eol();
     }
     writer.eol();
   }

tests/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <artifactId>tests</artifactId>

tests/test-java16/pom.xml

@@ -5,20 +5,20 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <artifactId>test-java16</artifactId>
 
   <properties>
-    <java.release>16</java.release>
+    <maven.compiler.release>17</maven.compiler.release>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-h2</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
@@ -30,14 +30,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -52,7 +52,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:14.0.3</tile>
+            <tile>io.ebean.tile:enhancement:14.2.0</tile>
           </tiles>
         </configuration>
       </plugin>

tests/test-kotlin/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>14.0.2</version>
+    <version>14.1.0</version>
   </parent>
 
   <artifactId>test-kotlin</artifactId>
@@ -40,20 +40,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>14.0.2</version>
+      <version>14.1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -92,7 +92,7 @@
                   <groupId>io.ebean</groupId>
                   <artifactId>kotlin-querybean-generator</artifactId>
 <!--                  <artifactId>querybean-generator</artifactId>-->
-                  <version>14.0.2</version>
+                  <version>14.1.0</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>
             </configuration>