#3701 Improve error message when missing dependency ebean-jackson-mapper

composites/ebean-clickhouse/pom.xml

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

composites/ebean-cockroach/pom.xml

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

composites/ebean-db2/pom.xml

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

composites/ebean-h2/pom.xml

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

composites/ebean-hana/pom.xml

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

composites/ebean-mariadb/pom.xml

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

composites/ebean-mysql/pom.xml

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

composites/ebean-net-postgis/pom.xml

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

composites/ebean-nuodb/pom.xml

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

composites/ebean-oracle/pom.xml

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

composites/ebean-pgvector/pom.xml

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

composites/ebean-postgis/pom.xml

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

composites/ebean-postgres/pom.xml

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

composites/ebean-sqlite/pom.xml

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

composites/ebean-sqlserver/pom.xml

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

composites/ebean-yugabyte/pom.xml

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

composites/ebean/pom.xml

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

composites/pom.xml

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

ebean-api/pom.xml

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

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

@@ -234,16 +234,5 @@ public interface DtoQuery<T> extends CancelableQuery {
    * source. We use {@code usingMaster()} to instead ensure that the query is executed
    * against the master data source.
    */
-  default DtoQuery<T> usingMaster() {
-    return usingMaster(true);
-  }
-
-  /**
-   * Ensure the master DataSource is used when useMaster is true. Otherwise, the read only
-   * data source can be used if defined.
-   *
-   * @see #usingMaster()
-   */
-  DtoQuery<T> usingMaster(boolean useMaster);
-
+  DtoQuery<T> usingMaster();
 }

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

@@ -135,17 +135,7 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
    * source. We we use {@code usingMaster()} to instead ensure that the query is executed
    * against the master data source.
    */
-  default SELF usingMaster() {
-    return usingMaster(true);
-  }
-
-  /**
-   * Ensure the master DataSource is used when useMaster is true. Otherwise, the read only
-   * data source can be used if defined.
-   *
-   * @see #usingMaster()
-   */
-  SELF usingMaster(boolean useMaster);
+  SELF usingMaster();
 
   /**
    * Set the base table to use for this query.

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

@@ -63,17 +63,7 @@ public interface SqlQuery extends Serializable, CancelableQuery {
    * source. We use {@code usingMaster()} to instead ensure that the query is executed
    * against the master data source.
    */
-  default SqlQuery usingMaster() {
-    return usingMaster(true);
-  }
-
-  /**
-   * Ensure the master DataSource is used when useMaster is true. Otherwise, the read only
-   * data source can be used if defined.
-   *
-   * @see #usingMaster()
-   */
-  SqlQuery usingMaster(boolean useMaster);
+  SqlQuery usingMaster();
 
   /**
    * Execute the query returning a list.

ebean-bom/pom.xml

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

ebean-core-json/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.ebean</groupId>
     <artifactId>ebean-parent</artifactId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
   <artifactId>ebean-core-json</artifactId>
   <name>ebean-core-json</name>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <!-- Jackson core used internally by Ebean -->

ebean-core-type/pom.xml

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

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-json</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <dependency>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <dependency>
@@ -165,21 +165,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryManyJoin.java

@@ -15,4 +15,8 @@ public interface SpiQueryManyJoin {
    */
   String fetchOrderBy();
 
+  /**
+   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
+   */
+  String idNullOr(String filterManyExpression);
 }

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java

@@ -338,6 +338,11 @@ public interface SpiTransaction extends Transaction {
    */
   boolean isNestedUseSavepoint();
 
+  /**
+   * Return true if explicitly set to skip cache (ignores skipOnWrite).
+   */
+  boolean isSkipCacheExplicit();
+
   /**
    * Fire pre commit processing/listeners.
    */

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java

@@ -169,6 +169,11 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
     transaction.setSkipCache(skipCache);
   }
 
+  @Override
+  public boolean isSkipCacheExplicit() {
+    return transaction.isSkipCacheExplicit();
+  }
+
   @Override
   public boolean isSkipCache() {
     return transaction.isSkipCache();

ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java

@@ -497,6 +497,10 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     return cacheKey != null && query.queryCacheMode().isPut();
   }
 
+  public boolean isBeanCachePutMany() {
+    return !transaction.isSkipCacheExplicit() && query.isBeanCachePut();
+  }
+
   public boolean isBeanCachePut() {
     return !transaction.isSkipCache() && query.isBeanCachePut();
   }

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java

@@ -36,6 +36,11 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     return "prefix:" + prefix + " name:" + name + " dbColumn:" + dbColumn + " ph:" + placeHolder;
   }
 
+  @Override
+  public String idNullOr(String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public boolean isAggregation() {
     return false;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java

@@ -513,6 +513,11 @@ public class BeanProperty implements ElPropertyValue, Property, STreeProperty {
     return owningType.isAssignableFrom(type);
   }
 
+  @Override
+  public String idNullOr(String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public void loadIgnore(DbReadContext ctx) {
     ctx.dataReader().incrementPos(1);

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -634,6 +634,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     return fetchOrderBy;
   }
 
+  @Override
+  public String idNullOr(String filterManyExpression) {
+    return targetIdBinder.idNullOr(name, filterManyExpression);
+  }
+
   /**
    * Return the order by for use when lazy loading the associated collection.
    */

ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java

@@ -154,9 +154,4 @@ public interface DbSqlContext {
    * as it was already added to the query.
    */
   boolean joinAdded();
-
-  /**
-   * Include the filter many predicates if specified into the JOIN clause.
-   */
-  void includeFilterMany();
 }

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java

@@ -27,6 +27,11 @@ public interface IdBinder {
    */
   void initialise();
 
+  /**
+   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
+   */
+  String idNullOr(String name, String filterManyExpression);
+
   String idSelect();
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java

@@ -45,6 +45,20 @@ public final class IdBinderEmbedded implements IdBinder {
     this.idInValueSql = idInExpandedForm ? idInExpanded() : idInCompressed();
   }
 
+  @Override
+  public String idNullOr(String prefix, String filterManyExpression) {
+    StringBuilder sb = new StringBuilder(100);
+    sb.append("((");
+    for (int i = 0; i < props.length; i++) {
+      if (i > 0) {
+        sb.append(" and ");
+      }
+      sb.append("${").append(prefix).append('}').append(props[i].dbColumn()).append(" is null");
+    }
+    sb.append(") or (").append(filterManyExpression).append("))");
+    return sb.toString();
+  }
+
   @Override
   public String idSelect() {
     return embIdProperty.name();

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java

@@ -28,6 +28,11 @@ final class IdBinderEmpty implements IdBinder {
   public void initialise() {
   }
 
+  @Override
+  public String idNullOr(String name, String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public String idSelect() {
     return "";

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java

@@ -261,4 +261,9 @@ public final class IdBinderSimple implements IdBinder {
     final Object value = idProperty.getValue(bean);
     return scalarType.format(value);
   }
+
+  @Override
+  public String idNullOr(String prefix, String filterManyExpression) {
+    return "(${" + prefix + "}" + idProperty.dbColumn() + " is null or (" + filterManyExpression + "))";
+  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java

@@ -286,4 +286,8 @@ public final class ElPropertyChain implements ElPropertyValue {
     }
   }
 
+  @Override
+  public String idNullOr(String filterManyExpression) {
+    throw new UnsupportedOperationException();
+  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java

@@ -715,7 +715,7 @@ final class CQueryBuilder {
       appendHistoryAsOfPredicate();
       appendFindId();
       appendToWhere(predicates.dbWhere());
-      appendToWhere(predicates.dbFilterManyWhere());
+      appendToWhere(predicates.dbFilterMany());
       if (!query.isIncludeSoftDeletes()) {
         appendSoftDelete();
       }

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPredicates.java

@@ -39,7 +39,6 @@ public final class CQueryPredicates {
   private final Object idValue;
   private final BindParams bindParams;
   private DefaultExpressionRequest filterMany;
-  private boolean filterManyJoin;
   /**
    * Bind values from the where expressions.
    */
@@ -107,9 +106,6 @@ public final class CQueryPredicates {
         dataBind.append(", ");
       }
     }
-    if (filterManyJoin) {
-      filterMany.bind(dataBind);
-    }
     if (idValue != null) {
       // this is a find by id type query...
       request.descriptor().bindId(dataBind, idValue);
@@ -123,7 +119,7 @@ public final class CQueryPredicates {
     if (where != null) {
       where.bind(dataBind);
     }
-    if (!filterManyJoin && filterMany != null) {
+    if (filterMany != null) {
       filterMany.bind(dataBind);
     }
     if (having != null) {
@@ -193,10 +189,9 @@ public final class CQueryPredicates {
       if (chunk != null) {
         SpiExpressionList<?> filterManyExpr = chunk.getFilterMany();
         if (filterManyExpr != null) {
-          filterManyJoin = chunk.isFilterManyJoin();
-          filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr);
+          this.filterMany = new DefaultExpressionRequest(request, deployParser, binder, filterManyExpr);
           if (buildSql) {
-            dbFilterMany = filterMany.buildSql();
+            dbFilterMany = manyProperty.idNullOr(filterMany.buildSql());
           }
         }
       }
@@ -344,17 +339,10 @@ public final class CQueryPredicates {
   }
 
   /**
-   * Return a db filter to be included in the WHERE.
+   * Return a db filter for filtering many fetch joins.
    */
-  String dbFilterManyWhere() {
-    return filterManyJoin ? null : dbFilterMany;
-  }
-
-  /**
-   * Return a db filter to be included in the JOIN.
-   */
-  String dbFilterManyJoin() {
-    return filterManyJoin ? dbFilterMany : null;
+  String dbFilterMany() {
+    return dbFilterMany;
   }
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java

@@ -22,7 +22,6 @@ final class DefaultDbSqlContext implements DbSqlContext {
   private final ArrayStack<String> joinStack = new ArrayStack<>();
   private final ArrayStack<String> prefixStack = new ArrayStack<>();
   private final String fromForUpdate;
-  private final String dbFilterManyJoin;
   private boolean useColumnAlias;
   private int columnIndex;
   private int asOfTableCount;
@@ -42,7 +41,7 @@ final class DefaultDbSqlContext implements DbSqlContext {
   private boolean joinSuppressed;
 
   DefaultDbSqlContext(SqlTreeAlias alias, String columnAliasPrefix, CQueryHistorySupport historySupport,
-                      CQueryDraftSupport draftSupport, String fromForUpdate, String dbFilterManyJoin) {
+                      CQueryDraftSupport draftSupport, String fromForUpdate) {
     this.alias = alias;
     this.columnAliasPrefix = columnAliasPrefix;
     this.useColumnAlias = columnAliasPrefix != null;
@@ -50,14 +49,6 @@ final class DefaultDbSqlContext implements DbSqlContext {
     this.historySupport = historySupport;
     this.historyQuery = (historySupport != null);
     this.fromForUpdate = fromForUpdate;
-    this.dbFilterManyJoin = dbFilterManyJoin;
-  }
-
-  @Override
-  public void includeFilterMany() {
-    if (dbFilterManyJoin != null) {
-      sb.append(" and ").append(dbFilterManyJoin);
-    }
   }
 
   @Override

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java

@@ -235,7 +235,7 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
   }
 
   @Override
-  public Query<T> usingMaster(boolean useMaster) {
+  public Query<T> usingMaster() {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java

@@ -129,7 +129,7 @@ public final class DefaultOrmQueryEngine implements OrmQueryEngine {
       result = finder.postProcessMany(request, result);
     }
 
-    if (result != null && request.isBeanCachePut()) {
+    if (result != null && request.isBeanCachePutMany()) {
       // load the individual beans into the bean cache
       request.descriptor().cacheBeanPutAll(result.actualDetails());
     }

ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java

@@ -14,7 +14,6 @@ import io.ebeaninternal.server.core.RelationalQueryRequest;
 import io.ebeaninternal.server.core.RowReader;
 import io.ebeaninternal.server.persist.Binder;
 
-import jakarta.persistence.NonUniqueResultException;
 import jakarta.persistence.PersistenceException;
 
 import java.sql.SQLException;
@@ -116,14 +115,9 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
     try {
       request.executeSql(binder, SpiQuery.Type.BEAN);
       T value = request.mapOne(mapper);
-      if (request.next()) {
-        throw new NonUniqueResultException("Got more than 1 result for findOne");
-      }
       request.logSummary();
       return value;
 
-    } catch (NonUniqueResultException e) {
-      throw e;
     } catch (Exception e) {
       throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
 
@@ -166,17 +160,13 @@ public final class DefaultRelationalQueryEngine implements RelationalQueryEngine
       T value = null;
       if (dataReader.next()) {
         value = scalarType.read(dataReader);
-        if (dataReader.next()) {
-          throw new NonUniqueResultException("Got more than 1 result for findSingleAttribute");
-        }
       }
       request.logSummary();
       return value;
 
-    } catch (NonUniqueResultException e) {
-      throw e;
     } catch (Exception e) {
       throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e);
+
     } finally {
       request.close();
     }

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java

@@ -107,7 +107,7 @@ public final class SqlTreeBuilder {
     CQueryHistorySupport historySupport = builder.historySupport(query);
     CQueryDraftSupport draftSupport = builder.draftSupport(query);
     String colAlias = subQuery || rootNode.isSingleProperty() ? null : columnAliasPrefix;
-    this.ctx = new DefaultDbSqlContext(alias, colAlias, historySupport, draftSupport, fromForUpdate, predicates.dbFilterManyJoin());
+    this.ctx = new DefaultDbSqlContext(alias, colAlias, historySupport, draftSupport, fromForUpdate);
   }
 
   /**
@@ -371,11 +371,10 @@ public final class SqlTreeBuilder {
     IncludesDistiller extraJoinDistill = new IncludesDistiller(desc, selectIncludes, predicateIncludes, manyWhereJoins, temporalMode);
     Collection<SqlTreeNodeExtraJoin> extraJoins = extraJoinDistill.getExtraJoinRootNodes();
     if (!extraJoins.isEmpty()) {
-      // add extra joins required to support predicates and/or order by clause
+      // add extra joins required to support predicates
+      // and/or order by clause
       for (SqlTreeNodeExtraJoin extraJoin : extraJoins) {
-        if (!addToParent(extraJoin, myList)) {
-          myList.add(extraJoin);
-        }
+        myList.add(extraJoin);
         if (extraJoin.isManyJoin()) {
           // as we are now going to join to the many then we need
           // to add the distinct to the sql query to stop duplicate
@@ -386,20 +385,6 @@ public final class SqlTreeBuilder {
     }
   }
 
-  /**
-   * Return true if the extra join was added as a child to one of the nodes.
-   */
-  private boolean addToParent(SqlTreeNodeExtraJoin extraJoin, List<SqlTreeNode> myList) {
-    String parentPath = SplitName.split(extraJoin.prefix())[0];
-    for (SqlTreeNode maybeParent : myList) {
-      if (maybeParent.prefix().equals(parentPath)) {
-        maybeParent.addChild(extraJoin);
-        return true;
-      }
-    }
-    return false;
-  }
-
   /**
    * A subQuery has slightly different rules in that it just generates SQL (into
    * the where clause) and its properties are not required to read the resultSet
@@ -656,7 +641,7 @@ public final class SqlTreeBuilder {
         SqlTreeNodeExtraJoin root = findExtraJoinRoot(includeProp, extraJoin);
         // register the root because these are the only ones we
         // return back.
-        rootRegister.put(root.prefix(), root);
+        rootRegister.put(root.name(), root);
       }
     }
 

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java

@@ -84,12 +84,4 @@ interface SqlTreeNode {
    */
   default void unselectLobsForPlatform() {
   }
-
-  default String prefix() {
-    return ""; // not matched
-  }
-
-  default void addChild(SqlTreeNode extraJoin) {
-    throw new UnsupportedOperationException();
-  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java

@@ -99,16 +99,6 @@ class SqlTreeNodeBean implements SqlTreeNode {
     this.pathMap = createPathMap(prefix, desc);
   }
 
-  @Override
-  public String prefix() {
-    return prefix;
-  }
-
-  @Override
-  public void addChild(SqlTreeNode extraJoin) {
-    children.add(extraJoin);
-  }
-
   @Override
   public SqlTreeLoad createLoad() {
     return new SqlTreeLoadBean(this);

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java

@@ -87,8 +87,7 @@ final class SqlTreeNodeExtraJoin implements SqlTreeNode {
     return manyJoin;
   }
 
-  @Override
-  public String prefix() {
+  public String name() {
     return prefix;
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java

@@ -45,6 +45,5 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean {
   @Override
   public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) {
     super.appendFrom(ctx, joinType.autoToOuter());
-    ctx.includeFilterMany();
   }
 }

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java

@@ -95,8 +95,8 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
   }
 
   @Override
-  public DtoQuery<T> usingMaster(boolean useMaster) {
-    this.useMaster = useMaster;
+  public DtoQuery<T> usingMaster() {
+    this.useMaster = true;
     return this;
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -1475,8 +1475,8 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   }
 
   @Override
-  public Query<T> usingMaster(boolean useMaster) {
-    this.useMaster = useMaster;
+  public Query<T> usingMaster() {
+    this.useMaster = true;
     return this;
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java

@@ -60,8 +60,8 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
   }
 
   @Override
-  public SqlQuery usingMaster(boolean useMaster) {
-    this.useMaster = useMaster;
+  public SqlQuery usingMaster() {
+    this.useMaster = true;
     return this;
   }
 

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java

@@ -171,9 +171,8 @@ public final class OrmQueryProperties implements Serializable {
     if (filterMany == null) {
       FilterExprPath exprPath = new FilterExprPath(path);
       SpiExpressionFactory queryEf = (SpiExpressionFactory) rootQuery.getExpressionFactory();
-      ExpressionFactory filterEf = queryEf.createExpressionFactory();
+      ExpressionFactory filterEf = queryEf.createExpressionFactory();// exprPath);
       filterMany = new FilterExpressionList(exprPath, filterEf, rootQuery);
-      // assuming conditions supported in JOIN, not setting markForQueryJoin = true
     }
     return filterMany;
   }
@@ -188,13 +187,6 @@ public final class OrmQueryProperties implements Serializable {
     return filterMany.trimPath(trimPath);
   }
 
-  /**
-   * Return true if there is a filterMany and it should be included in the JOIN.
-   */
-  public boolean isFilterManyJoin() {
-    return filterMany != null && !markForQueryJoin;
-  }
-
   /**
    * Adjust filterMany expressions for inclusion in main query.
    */

ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java

@@ -150,6 +150,11 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
     return false;
   }
 
+  @Override
+  public boolean isSkipCacheExplicit() {
+    return false;
+  }
+
   @Override
   public void setSkipCache(boolean skipCache) {
   }

ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java

@@ -209,6 +209,11 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     return autoPersistUpdates;
   }
 
+  @Override
+  public final boolean isSkipCacheExplicit() {
+    return (skipCache != null && !skipCache);
+  }
+
   @Override
   public final boolean isSkipCache() {
     if (skipCache != null) return skipCache;

ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java

@@ -235,6 +235,11 @@ final class NoTransaction implements SpiTransaction {
   public void setSkipCache(boolean skipCache) {
   }
 
+  @Override
+  public boolean isSkipCacheExplicit() {
+    return false;
+  }
+
   @Override
   public boolean isSkipCache() {
     return false;

ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java

@@ -55,7 +55,7 @@ class BasicProfileLocationTest {
     DProfileLocation loc = new DTimedProfileLocation("foo", MetricFactory.get().createTimedMetric("junk"));
 
     assertThat(loc.obtain()).isTrue();
-    assertThat(loc.fullLocation()).endsWith("org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:786)");
+    assertThat(loc.fullLocation()).endsWith("org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:728)");
     assertThat(loc.location()).isEqualTo("org.junit.platform.commons.util.ReflectionUtils.invokeMethod");
     assertThat(loc.label()).isEqualTo("ReflectionUtils.invokeMethod");
   }

ebean-ddl-generator/pom.xml

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

ebean-jackson-mapper/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 

ebean-net-postgis-types/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
 
   <name>ebean net postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-pgvector-types/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
 
   <name>ebean pgvector types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-postgis-types/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
 
   <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-querybean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 

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

@@ -739,8 +739,8 @@ public abstract class QueryBean<T, R extends QueryBean<T, R>> implements IQueryB
   }
 
   @Override
-  public R usingMaster(boolean useMaster) {
-    query.usingMaster(useMaster);
+  public final R usingMaster() {
+    query.usingMaster();
     return root;
   }
 

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

@@ -328,7 +328,7 @@ public class QCustomerTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterMany */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and t1.first_name like ? escape'|' and t1.email is not null order by t0.id");
+    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterMany */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name like ? escape'|' and t1.email is not null)) order by t0.id");
   }
 
   @Test
@@ -340,7 +340,7 @@ public class QCustomerTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterManySingle */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and t1.first_name like ? escape'|' order by t0.id");
+    assertThat(q.getGeneratedSql()).isEqualTo("select /* QCustomerTest.filterManySingle */ t0.id, t0.name, t1.id, t1.first_name, t1.last_name from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name like ? escape'|')) order by t0.id");
   }
 
   @Test
@@ -375,7 +375,7 @@ public class QCustomerTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).contains(" from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and t1.first_name like ? and t1.first_name like ? escape'|' order by t0.id");
+    assertThat(q.getGeneratedSql()).contains(" from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name like ? and t1.first_name like ? escape'|')) order by t0.id");
   }
 
   @Test
@@ -389,7 +389,7 @@ public class QCustomerTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).contains(" from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and (t1.first_name like ? escape'|' or t1.last_name like ? escape'|') order by t0.id");
+    assertThat(q.getGeneratedSql()).contains(" from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or ((t1.first_name like ? escape'|' or t1.last_name like ? escape'|'))) order by t0.id");
   }
 
   @Test
@@ -406,7 +406,7 @@ public class QCustomerTest {
       .query();
 
     q.findList();
-    assertThat(q.getGeneratedSql()).contains(" t0.id, t0.name, t1.id, t1.email from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id and t1.first_name like ? escape'|' order by t0.id");
+    assertThat(q.getGeneratedSql()).contains(" t0.id, t0.name, t1.id, t1.email from be_customer t0 left join be_contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name like ? escape'|')) order by t0.id");
   }
 
   @Test
@@ -446,22 +446,6 @@ public class QCustomerTest {
       .findList();
   }
 
-  @Test
-  public void usingMaster_true() {
-    new QCustomer()
-      .registered.isNull()
-      .usingMaster(true)
-      .findList();
-  }
-
-  @Test
-  public void usingMaster_false() {
-    new QCustomer()
-      .registered.isNull()
-      .usingMaster(false)
-      .findList();
-  }
-
   @Test
   public void usingTransaction() {
     try (Transaction transaction = DB.getDefault().createTransaction()) {

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

@@ -22,7 +22,7 @@ class QDataWithFormulaMainTest {
 
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains(" from data_with_formula_main t0 left join data_with_formula t1 on t1.main_id = t0.id and t1.meta_key = ? order by t0.id");
+    assertThat(sql.get(0)).contains(" where ((t1.main_id is null and t1.meta_key is null and t1.value_index is null) or (t1.meta_key = ?)) order by t0.id");
   }
 
   @Test
@@ -36,6 +36,6 @@ class QDataWithFormulaMainTest {
 
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains(" left join data_with_formula t1 on t1.main_id = t0.id and t1.meta_key = ? order by t0.id");
+    assertThat(sql.get(0)).contains(" where ((t1.main_id is null and t1.meta_key is null and t1.value_index is null) or (t1.meta_key = ?)) order by t0.id");
   }
 }

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -29,35 +29,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 

ebean-spring-txn/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
 
   <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
 
   <name>ebean test</name>
@@ -13,7 +13,7 @@
 
   <properties>
     <bytebuddy.version>1.18.1</bytebuddy.version>
-    <assertj.version>3.27.7</assertj.version>
+    <assertj.version>3.27.6</assertj.version>
   </properties>
 
   <dependencies>
@@ -33,20 +33,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <dependency>
@@ -149,14 +149,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -226,7 +226,7 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>11.1.0.jre8-preview</version>
+      <version>10.2.0.jre8</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java

@@ -155,34 +155,6 @@ public class DtoQueryFromOrmTest extends BaseTestCase {
     }
   }
 
-  @Test
-  public void asDto_usingMaster_true() {
-    asDtoUsingMaster(true);
-  }
-
-  @Test
-  public void asDto_usingMaster_false() {
-    asDtoUsingMaster(false);
-  }
-
-  private void asDtoUsingMaster(boolean useMaster) {
-    ResetBasicData.reset();
-    LoggedSql.start();
-
-    DtoQuery<ContactDto> query = DB.find(Contact.class)
-      .select("id, email")
-      .where().isNotNull("email")
-      .asDto(ContactDto.class)
-      .usingMaster(useMaster);
-
-    List<ContactDto> dtos = query.findList();
-
-    assertThat(dtos).isNotEmpty();
-    for (ContactDto dto : dtos) {
-      assertThat(dto.getEmail()).isNotNull();
-    }
-  }
-
   @Test
   public void asDto_withExplicitId() {
 

ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java

@@ -68,15 +68,11 @@ public class TestQueryUsingConnection extends BaseTestCase {
 
       final int otherCount = DB.find(Country.class).findCount();
       final int masterCount = DB.find(Country.class).usingMaster().findCount();
-      final int masterCount2 = DB.find(Country.class).usingMaster(true).findCount();
-      final int masterCount3 = DB.find(Country.class).usingMaster(false).findCount();
 
       transaction.rollback();
 
       assertThat(count).isEqualTo(otherCount + 1);
       assertThat(otherCount).isEqualTo(masterCount);
-      assertThat(otherCount).isEqualTo(masterCount2);
-      assertThat(otherCount).isEqualTo(masterCount3);
     }
   }
 

ebean-test/src/test/java/org/tests/cache/TestBeanCache.java

@@ -124,7 +124,7 @@ public class TestBeanCache extends BaseTestCase {
     ServerCacheStatistics statistics = beanCache.statistics(true);
     assertThat(statistics.getHitCount()).isEqualTo(0);
     assertThat(statistics.getMissCount()).isEqualTo(0);
-    assertThat(statistics.getPutCount()).isEqualTo(0);
+    assertThat(statistics.getPutCount()).isEqualTo(2);
   }
 
   @Test

ebean-test/src/test/java/org/tests/model/basic/Building.java

@@ -1,27 +0,0 @@
-package org.tests.model.basic;
-
-import io.ebean.Model;
-import jakarta.persistence.*;
-
-@Entity
-public class Building extends Model {
-  public static final String CAFE = "cafe";
-  public static final String HOUSE = "house";
-  public static final String STORE = "store";
-
-  @Id
-  public int id;
-  @Column(nullable = false)
-  public String type;
-  @Column(name = "lvl")
-  public int level;
-  public final String name;
-  @ManyToOne(optional = false)
-  public final Clan clan;
-
-  public Building(Clan clan, String type, String name) {
-    this.clan = clan;
-    this.type = type;
-    this.name = name;
-  }
-}

ebean-test/src/test/java/org/tests/model/basic/Clan.java

@@ -1,17 +0,0 @@
-package org.tests.model.basic;
-
-import io.ebean.Model;
-import jakarta.persistence.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity
-public class Clan extends Model {
-
-  @Id
-  public int id;
-
-  @OneToMany(cascade = CascadeType.ALL)
-  public List<Building> buildings = new ArrayList<>();
-}

ebean-test/src/test/java/org/tests/model/basic/ClanQuest.java

@@ -1,18 +0,0 @@
-package org.tests.model.basic;
-
-import io.ebean.Model;
-import jakarta.persistence.*;
-
-@Entity
-public class ClanQuest extends Model {
-
-  @Id
-  public int id;
-
-  @ManyToOne(optional = false)
-  public final Clan clan;
-
-  public ClanQuest(Clan clan) {
-    this.clan = clan;
-  }
-}

ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java

@@ -6,12 +6,13 @@ import io.ebean.ExpressionList;
 import io.ebean.Query;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
-import org.tests.model.basic.*;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.Order;
+import org.tests.model.basic.ResetBasicData;
 
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -174,8 +175,7 @@ public class TestQueryFilterMany extends BaseTestCase {
     assertThat(customers).isNotEmpty();
     List<String> sqlList = LoggedSql.stop();
     assertEquals(1, sqlList.size());
-    assertThat(sqlList.get(0)).contains(" left join o_customer t2 on t2.id = t1.kcustomer_id and t1.status = ? where ");
-    assertThat(sqlList.get(0)).contains(" where lower(t0.name) = ? order by t0.id");
+    assertThat(sqlList.get(0)).contains(" where lower(t0.name) = ? and (t1.id is null or (t1.status = ?)) order by t0.id");
   }
 
   @Test
@@ -211,7 +211,8 @@ public class TestQueryFilterMany extends BaseTestCase {
     assertThat(result).isNotEmpty();
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id and t1.order_date is not null order by t0.id");
+    assertThat(sql.get(0)).contains("from o_customer t0 left join o_order t1");
+    assertThat(sql.get(0)).contains("where (t1.id is null or (t1.order_date is not null)) order by t0.id");
   }
 
   @Test
@@ -230,78 +231,25 @@ public class TestQueryFilterMany extends BaseTestCase {
   }
 
   @Test
-  public void test_filterMany_excludedExplicitly() {
-    Clan clan = new Clan();
-    ClanQuest quest = new ClanQuest(clan);
-    DB.saveAll(clan, quest);
+  public void test_filterMany_with_isNotEmpty() {
 
-    LoggedSql.start();
-
-    // fetch when there are no buildings at all
-    Optional<ClanQuest> result = DB.find(ClanQuest.class)
-      .setId(quest.id)
-      .fetch("clan", "buildings")
-      .filterMany("clan.buildings").eq("type", Building.CAFE)
-      .findOneOrEmpty();
-
-    List<String> sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains(" left join building t2 on t2.clan_id = t1.id and t2.type = ? where t0.id = ? order by t0.id");
-    assertThat(result).isPresent();
-    List<Building> emptyBuildings = result.map(r -> r.clan.buildings).orElseThrow();
-    assertThat(emptyBuildings).isEmpty();
-
-    // add some buildings
-    var b0 = new Building(clan, Building.CAFE, "b0");
-    var b1 = new Building(clan, Building.CAFE, "b1");
-    var b2 = new Building(clan, Building.HOUSE, "b2");
-    DB.saveAll(b0, b1, b2);
-
-    // fetch with some buildings to match the filter many predicate
-    Optional<ClanQuest> resultWithBuildings = DB.find(ClanQuest.class)
-      .setId(quest.id)
-      .fetch("clan", "buildings")
-      .filterMany("clan.buildings").eq("type", Building.CAFE)
-      .findOneOrEmpty();
-
-    List<Building> someBuildings = resultWithBuildings.map(r -> r.clan.buildings).orElseThrow();
-    assertThat(someBuildings).hasSize(2);
-    assertThat(someBuildings.stream().map(b -> b.name).collect(Collectors.toList())).contains("b0", "b1");
-
-    // fetch with no matching buildings
-    Optional<ClanQuest> resultWithNoMatchingBuildings = DB.find(ClanQuest.class)
-      .setId(quest.id)
-      .fetch("clan", "buildings")
-      .filterMany("clan.buildings").eq("type", Building.STORE)
-      .findOneOrEmpty();
-
-    List<Building> noMatchingBuildings = resultWithNoMatchingBuildings.map(r -> r.clan.buildings).orElseThrow();
-    assertThat(noMatchingBuildings).isEmpty();
-  }
-
-  @Test
-  void test_filterMany_with_isNotEmpty() {
     ResetBasicData.reset();
 
     LoggedSql.start();
 
     Query<Customer> query = DB.find(Customer.class)
-      .setUnmodifiable(true)
-      .select("id, status, name")
-      .fetch("orders", "status, orderDate, shipDate")
-      .filterMany("orders").raw("1 = 0")
+      .filterMany("orders").raw("1=0")
       .where().isNotEmpty("orders")
       .query();
 
     List<Customer> list = query.findList();
-
-    List<String> sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains(" from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null and 1 = 0 where exists ");
-    assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t1.id, t1.status, t1.order_date, t1.ship_date from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null and 1 = 0 where exists (select 1 from o_order x where x.kcustomer_id = t0.id and x.order_date is not null) order by t0.id; --bind()");
     for (Customer customer : list) {
       assertThat(customer.getOrders()).isEmpty();
     }
+
+    List<String> sqlList = LoggedSql.stop();
+    assertEquals(1, sqlList.size());
+    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where exists (select 1 from o_order x where x.kcustomer_id = t0.id and x.order_date is not null) and (t1.id is null or (1=0)) order by t0.id");
   }
 
   @Test
@@ -339,10 +287,11 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     List<String> sqlList = LoggedSql.stop();
     assertEquals(1, sqlList.size());
+    assertThat(sqlList.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where (t1.id is null or (t1.status ");
     if (isPostgresCompatible()) {
-      assertThat(sqlList.get(0)).contains("left join o_customer t2 on t2.id = t1.kcustomer_id and t1.status = any(?) order by t0.id");
+      assertThat(sqlList.get(0)).contains("where (t1.id is null or (t1.status = any(?))) order by t0.id");
     } else {
-      assertThat(sqlList.get(0)).contains("left join o_customer t2 on t2.id = t1.kcustomer_id and t1.status in (?) order by t0.id");
+      assertThat(sqlList.get(0)).contains("where (t1.id is null or (t1.status in (?))) order by t0.id");
     }
   }
 
@@ -386,7 +335,7 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     List<String> sql = LoggedSql.stop();
     assertEquals(1, sql.size());
-    assertSql(sql.get(0)).contains(" left join o_customer t2 on t2.id = t1.kcustomer_id and (t1.status = ? or t1.order_date = ?) order by t0.id");
+    assertSql(sql.get(0)).contains(" from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where (t1.id is null or ((t1.status = ? or t1.order_date = ?))) order by t0.id");
   }
 
   @Test
@@ -402,7 +351,7 @@ public class TestQueryFilterMany extends BaseTestCase {
     List<String> sql = LoggedSql.stop();
 
     assertThat(sql.size()).isGreaterThan(1);
-    assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id and t1.first_name is not null order by t0.id; --bind()");
+    assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.id is null or (t1.first_name is not null)) order by t0.id; --bind()");
     platformAssertIn(sql.get(1), " from contact_note t0 where (t0.contact_id)");
     assertSql(sql.get(1)).contains(" and lower(t0.title) like");
   }
@@ -440,26 +389,9 @@ public class TestQueryFilterMany extends BaseTestCase {
 
     assertThat(sql).hasSize(1);
     if (isSqlServer()) {
-      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id and (t1.first_name is not null and lower(t1.email) like ?) order by t0.id; --bind(rob%)");
+      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.id is null or ((t1.first_name is not null and lower(t1.email) like ?))) order by t0.id; --bind(rob%)");
     } else {
-      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id and (t1.first_name is not null and lower(t1.email) like ? escape'|') order by t0.id; --bind(rob%)");
+      assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id where (t1.id is null or ((t1.first_name is not null and lower(t1.email) like ? escape'|'))) order by t0.id; --bind(rob%)");
     }
   }
-
-  @Test
-  void testFilterManyWithNestedPathExpression() {
-    ResetBasicData.reset();
-    LoggedSql.start();
-
-    DB.find(Customer.class)
-      .select("id, name")
-      .fetch("contacts", "firstName, email")
-      .filterMany("contacts").eq("group.name", "DoesNotExist").isNotNull("cretime")
-      .findList();
-
-    List<String> sql = LoggedSql.stop();
-
-    assertThat(sql).hasSize(1);
-    assertSql(sql.get(0)).contains(" from o_customer t0 left join contact t1 on t1.customer_id = t0.id left join contact_group t2 on t2.id = t1.group_id and t2.name = ? and t1.cretime is not null order by t0.id");
-  }
 }

ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java

@@ -20,7 +20,7 @@ class TestQueryFilterManyOnM2M extends BaseTestCase {
 
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains(" left join mrole t1 on t1.role_id = t1z_.mrole_role_id and lower(t1.role_name) like ");
+    assertThat(sql.get(0)).contains("select t0.userid, t0.user_name, t0.user_type_id, t1.role_id, t1.role_name from muser t0 left join mrole_muser t1z_ on t1z_.muser_userid = t0.userid left join mrole t1 on t1.role_id = t1z_.mrole_role_id where (t1.role_id is null or (lower(t1.role_name) like ");
     assertThat(sql.get(0)).contains("order by t0.userid;");
   }
 

ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java

@@ -35,7 +35,7 @@ public class TestQueryFilterManySimple extends BaseTestCase {
     list.get(0).getOrders().size();
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(2);
-    assertThat(sql.get(0)).contains("left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id and t1.status = ? and t1.order_date > ?");
+    assertThat(sql.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id where");
     assertThat(sql.get(0)).contains("order by t0.id");
     if (isPostgresCompatible()) {
       assertThat(sql.get(1)).contains("from contact t0 where (t0.customer_id) = any(?) and t0.first_name is not null;");
@@ -43,19 +43,4 @@ public class TestQueryFilterManySimple extends BaseTestCase {
       assertThat(sql.get(1)).contains("from contact t0 where (t0.customer_id) in (?) and t0.first_name is not null;");
     }
   }
-
-  @Test
-  void testNestedFilterMany() {
-    ResetBasicData.reset();
-
-    LoggedSql.start();
-    DB.find(Customer.class)
-      .fetch("orders")
-      .filterMany("orders").eq("customer.status", Customer.Status.NEW)
-      .findList();
-
-    List<String> sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("from o_customer t0 left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null left join o_customer t2 on t2.id = t1.kcustomer_id and t2.status = ? order by t0.id");
-  }
 }

ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java

@@ -75,18 +75,16 @@ public class TestOrderByWithDistinct extends BaseTestCase {
       assertSql(query).startsWith("select distinct on (t0.id, t2.name, t1.id) t0.id, t0.parent_id, t0.ref_id, t1.id, t1.parent_id, t1.ref_id, t2.name "
         + "from e_basic_tree t0 "
         + "left join e_basic_tree t1 on t1.parent_id = t0.id "
-        + "left join e_basic t2 on t2.id = t1.ref_id "
         + "join e_basic_tree u1 on u1.parent_id = t0.id "
-        + "join e_basic u2 on u2.id = u1.ref_id "
-        + "where u2.status = ? order by t0.id, t2.name");
+        + "join e_basic u2 on u2.id = u1.ref_id left "
+        + "join e_basic t2 on t2.id = t1.ref_id where u2.status = ? order by t0.id, t2.name");
     } else {
       assertSql(query).startsWith("select distinct t0.id, t0.parent_id, t0.ref_id, t1.id, t1.parent_id, t1.ref_id, t2.name "
         + "from e_basic_tree t0 "
         + "left join e_basic_tree t1 on t1.parent_id = t0.id "
-        + "left join e_basic t2 on t2.id = t1.ref_id "
         + "join e_basic_tree u1 on u1.parent_id = t0.id "
-        + "join e_basic u2 on u2.id = u1.ref_id "
-        + "where u2.status = ? order by t0.id, t2.name");
+        + "join e_basic u2 on u2.id = u1.ref_id left "
+        + "join e_basic t2 on t2.id = t1.ref_id where u2.status = ? order by t0.id, t2.name");
     }
   }
 

ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java

@@ -785,10 +785,9 @@ class TestQuerySingleAttribute extends BaseTestCase {
       .query();
 
     List<Order.Status> statusList = query.findSingleAttributeList();
-    String sql = sqlOf(query);
-    assertThat(sql)
+    assertSql(query)
       .contains("select distinct t1.status from o_customer t0 "
-        + "left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null and t1.status is not null")
+        + "left join o_order t1 on t1.kcustomer_id = t0.id and t1.order_date is not null where (t1.id is null or (t1.status is not null))")
       .doesNotContain("order by");
 
     assertThat(statusList).hasSize(4);

ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java

@@ -6,7 +6,6 @@ import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.meta.MetaTimedMetric;
 import io.ebean.test.LoggedSql;
-import jakarta.persistence.NonUniqueResultException;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
@@ -22,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class SqlQueryTests extends BaseTestCase {
@@ -87,19 +85,6 @@ class SqlQueryTests extends BaseTestCase {
     assertThat(val2).isEqualTo(11);
   }
 
-  @Test
-  void findSingleAttribute_whenMultipleRows_expect_NonUniqueResultException() {
-    ResetBasicData.reset();
-    String sql = "select id from o_order order by id desc";
-
-    assertThatThrownBy(() -> {
-      DB.sqlQuery(sql)
-        .mapToScalar(Long.class)
-        .findOne();
-    }).isInstanceOf(NonUniqueResultException.class)
-      .hasMessageContaining("Got more than 1 result for findSingleAttribute");
-  }
-
   @Test
   void findSingleAttributeList_decimal() {
     ResetBasicData.reset();
@@ -280,28 +265,6 @@ class SqlQueryTests extends BaseTestCase {
     assertThat(custDtos).isNotEmpty();
   }
 
-  @Test
-  void queryUsingMaster_true() {
-    queryUsingMasterAsParameter(true);
-  }
-
-  @Test
-  void queryUsingMaster_false() {
-    queryUsingMasterAsParameter(false);
-  }
-
-  void queryUsingMasterAsParameter(boolean useMaster) {
-    ResetBasicData.reset();
-
-    String sql = "select id, name, status from o_customer where name is not null";
-    List<CustDto> custDtos = DB.sqlQuery(sql)
-      .usingMaster(useMaster)
-      .mapTo(CUST_MAPPER)
-      .findList();
-
-    assertThat(custDtos).isNotEmpty();
-  }
-
   @Test
   void queryUsingConnection() throws SQLException {
     ResetBasicData.reset();
@@ -410,18 +373,6 @@ class SqlQueryTests extends BaseTestCase {
     assertThat(rob.name).isEqualTo("Rob");
   }
 
-  @Test
-  void findOne_mapper_when_notUnique() {
-    ResetBasicData.reset();
-
-    String sql = "select id, name, status from o_customer order by name desc";
-    assertThatThrownBy(() -> DB.sqlQuery(sql)
-      .mapTo(CUST_MAPPER)
-      .findOne())
-      .isInstanceOf(NonUniqueResultException.class)
-      .hasMessageContaining("Got more than 1 result for findOne");
-  }
-
   @Test
   void findList_mapper() {
     ResetBasicData.reset();

howto-deploy-to-central.md

@@ -15,8 +15,8 @@ mvn -T 4 clean package
 mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests
 
 ## git commit, git tag, git push --tags
-git commit -am 'Version 16.3.0'
-git tag 16.3.0
+git commit -am 'Version 16.1.1'
+git tag 16.1.1
 git push --tags
 
 ## convert to javax

kotlin-querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -56,14 +56,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -83,7 +83,7 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
-        <version>2.3.10</version>
+        <version>2.2.10</version>
         <executions>
           <execution>
             <id>test-compile</id>

platforms/all/pom.xml

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

platforms/clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</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>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/hsqldb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/pom.xml

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

platforms/postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
     <dependency>

platforms/sqlanywhere/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

platforms/sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.3.0</version>
+    <version>16.1.1</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.3.0</version>
+      <version>16.1.1</version>
     </dependency>
 
   </dependencies>

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>16.3.0</version>
+  <version>16.1.1</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -49,9 +49,9 @@
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
     <ebean-migration.version>14.3.0</ebean-migration.version>
     <ebean-test-containers.version>7.17</ebean-test-containers.version>
-    <ebean-datasource.version>10.3</ebean-datasource.version>
-    <ebean-agent.version>16.3.0</ebean-agent.version>
-    <ebean-maven-plugin.version>16.3.0</ebean-maven-plugin.version>
+    <ebean-datasource.version>10.2</ebean-datasource.version>
+    <ebean-agent.version>16.1.1</ebean-agent.version>
+    <ebean-maven-plugin.version>16.1.1</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 
@@ -60,14 +60,14 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.8</version>
+      <version>1.5</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.31</version>
+      <version>1.5.13</version>
       <scope>test</scope>
     </dependency>