#3666 Fix for NPE with filterMany() containing or()

For FilterMany with QueryBeans, it creates a queryBean to build the filterMany predicates with. This query bean needed 2 changes for this fix:

1. Needs to set it's internal "root" such that it supports chaining (required for or() etc)
2. The ExpressionFactory needs to be explicitly passed to the expression list (rather than get it from the query which is actually null in this case).

.github/workflows/build.yml

@@ -40,5 +40,5 @@ jobs:
 #    - name: Maven single test
 #      run: mvn --batch-mode clean verify -Dtest="io.ebeaninternal.server.core.DefaultServer_getReferenceTest" -DfailIfNoTests=false
     - name: Build with Maven
-      run: mvn -T 8 clean test -Pdefault
+      run: mvn -T 8 clean test
 

.github/workflows/jdk-ea.yml

@@ -37,5 +37,5 @@ jobs:
     - name: Maven version
       run: mvn --version
     - name: Build with Maven
-      run: mvn test -Pea
+      run: mvn -T 8 test
 

composites/ebean-clickhouse/pom.xml

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

composites/ebean-cockroach/pom.xml

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

composites/ebean-db2/pom.xml

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

composites/ebean-h2/pom.xml

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

composites/ebean-hana/pom.xml

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

composites/ebean-mariadb/pom.xml

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

composites/ebean-mysql/pom.xml

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

composites/ebean-net-postgis/pom.xml

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

composites/ebean-nuodb/pom.xml

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

composites/ebean-oracle/pom.xml

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

composites/ebean-postgis/pom.xml

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

composites/ebean-postgres/pom.xml

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

composites/ebean-sqlite/pom.xml

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

composites/ebean-sqlserver/pom.xml

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

composites/ebean-yugabyte/pom.xml

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

composites/ebean/pom.xml

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

composites/pom.xml

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

ebean-api/pom.xml

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

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

@@ -1,7 +1,6 @@
 package io.ebean;
 
 import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
 
 /**
  * Object relational query for finding a List, Set, Map or single entity bean.
@@ -311,7 +310,6 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
   /**
    * Return the Id value.
    */
-  @Nullable
   Object getId();
 
   /**
@@ -448,13 +446,11 @@ public interface Query<T> extends CancelableQuery, QueryBuilder<Query<T>, T> {
   /**
    * Return the "for update" wait mode to use.
    */
-  @Nullable
   LockWait getForUpdateLockWait();
 
   /**
    * Return the lock type (strength) to use with "for update".
    */
-  @Nullable
   LockType getForUpdateLockType();
 
   /**

ebean-bom/pom.xml

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

ebean-core-json/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.ebean</groupId>
     <artifactId>ebean-parent</artifactId>
-    <version>16.1.0</version>
+    <version>16.0.0</version>
   </parent>
   <artifactId>ebean-core-json</artifactId>
   <name>ebean-core-json</name>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</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.1.0</version>
+    <version>16.0.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
 
     <dependency>

ebean-core/pom.xml

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

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

@@ -65,12 +65,12 @@ public interface SpiTransaction extends Transaction {
    * <p>
    * This is to handle bi-directional relationships where both sides Cascade.
    */
-  void registerDeleteBean(Class<?> type, Object id);
+  void registerDeleteBean(Integer hash);
 
   /**
    * Return true if this is a bean that has already been saved/deleted.
    */
-  boolean isRegisteredDeleteBean(Class<?> type, Object id);
+  boolean isRegisteredDeleteBean(Integer hash);
 
   /**
    * Unregister the persisted beans. Expected after persisting top level beans

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

@@ -195,13 +195,13 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void registerDeleteBean(Class<?> type, Object id) {
-    transaction.registerDeleteBean(type, id);
+  public void registerDeleteBean(Integer hash) {
+    transaction.registerDeleteBean(hash);
   }
 
   @Override
-  public boolean isRegisteredDeleteBean(Class<?> type, Object id) {
-    return transaction.isRegisteredDeleteBean(type, id);
+  public boolean isRegisteredDeleteBean(Integer hash) {
+    return transaction.isRegisteredDeleteBean(hash);
   }
 
   @Override

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

@@ -54,6 +54,10 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * The unique id used for logging summary.
    */
   private Object idValue;
+  /**
+   * Hash value used to handle cascade delete both ways in a relationship.
+   */
+  private Integer beanHash;
   private boolean statelessUpdate;
   private boolean notifyCache;
   /**
@@ -281,9 +285,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   private void onFailedUpdateUndoGeneratedProperties() {
     for (BeanProperty prop : beanDescriptor.propertiesGenUpdate()) {
       Object oldVal = intercept.origValue(prop.propertyIndex());
-      if (oldVal != null) {
-        prop.setValue(entityBean, oldVal);
-      }
+      prop.setValue(entityBean, oldVal);
     }
   }
 
@@ -551,17 +553,34 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     }
   }
 
+  /**
+   * The hash used to register the bean with the transaction.
+   * <p>
+   * Takes into account the class type and id value.
+   */
+  private Integer beanHash() {
+    if (beanHash == null) {
+      Object id = beanDescriptor.getId(entityBean);
+      int hc = 92821 * bean.getClass().getName().hashCode();
+      if (id != null) {
+        hc += id.hashCode();
+      }
+      beanHash = hc;
+    }
+    return beanHash;
+  }
+
   public void registerDeleteBean() {
-    final Object id = beanDescriptor.id(entityBean);
-    transaction.registerDeleteBean(beanDescriptor.type(), id);
+    Integer hash = beanHash();
+    transaction.registerDeleteBean(hash);
   }
 
   public boolean isRegisteredForDeleteBean() {
     if (transaction == null) {
       return false;
     } else {
-      final Object id = beanDescriptor.id(entityBean);
-      return transaction.isRegisteredDeleteBean(beanDescriptor.type(), id);
+      Integer hash = beanHash();
+      return transaction.isRegisteredDeleteBean(hash);
     }
   }
 
@@ -790,9 +809,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
   public void checkRowCount(int rowCount) {
     if (rowCount != 1 && rowCount != Statement.SUCCESS_NO_INFO) {
       if (ConcurrencyMode.VERSION == concurrencyMode) {
-        if (type == Type.UPDATE) {
-          onFailedUpdateUndoGeneratedProperties();
-        }
+        onFailedUpdateUndoGeneratedProperties();
         throw new OptimisticLockException("Data has changed. updated row count " + rowCount, null, bean);
       } else if (rowCount == 0 && type == Type.UPDATE) {
         throw new EntityNotFoundException("No rows updated");

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

@@ -436,15 +436,14 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
     }
     TableJoinColumn[] cols = join.columns();
     if (!idProp.isEmbedded()) {
-      // simple single scalar id, match on the foreign column, allow extra TableJoinColumn for #3664
-      String matchColumn = idProp.dbColumn();
-      for (TableJoinColumn col : cols) {
-        if (matchColumn.equals(col.getForeignDbColumn())) {
-          return createImportedScalar(owner, col, new BeanProperty[]{idProp}, others);
-        }
+      // simple single scalar id
+      if (cols.length != 1) {
+        CoreLog.log.log(ERROR, "No Imported Id column for {0} in table {1}", idProp, join.getTable());
+        return null;
+      } else {
+        BeanProperty[] idProps = {idProp};
+        return createImportedScalar(owner, cols[0], idProps, others);
       }
-      CoreLog.log.log(ERROR, "No Imported Id column for {0} in table {1}", idProp, join.getTable());
-      return null;
     } else {
       // embedded id
       BeanPropertyAssocOne<?> embProp = (BeanPropertyAssocOne<?>) idProp;

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

@@ -128,6 +128,16 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
           throw new PersistenceException("Cannot find imported id for " + fullName() + " from " + targetDescriptor
           + ". If using native-image, possibly missing reflect-config for the Id property.");
         }
+        if (importedId.isScalar()) {
+          // limit JoinColumn mapping to the @Id / primary key
+          TableJoinColumn[] columns = tableJoin.columns();
+          String foreignJoinColumn = columns[0].getForeignDbColumn();
+          String foreignIdColumn = targetDescriptor.idProperty().dbColumn();
+          if (!foreignJoinColumn.equalsIgnoreCase(foreignIdColumn)) {
+            throw new PersistenceException("Mapping limitation - @JoinColumn on " + fullName() + " needs to map to a primary key as per Issue #529 "
+              + " - joining to " + foreignJoinColumn + " and not " + foreignIdColumn);
+          }
+        }
       } else {
         exportedProperties = createExported();
         String delStmt = "delete from " + targetDescriptor.baseTable() + " where ";

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

@@ -15,8 +15,8 @@ final class DFetchGroup<T> implements SpiFetchGroup<T> {
   }
 
   @Override
-  public OrmQueryDetail detail(OrmQueryDetail existing) {
-    return detail.copy(existing);
+  public OrmQueryDetail detail() {
+    return detail.copy();
   }
 
   @Override

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

@@ -52,7 +52,7 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
   @SuppressWarnings("rawtypes")
   @Override
   public Query<T> select(FetchGroup fetchGroup) {
-    this.detail = ((SpiFetchGroup) fetchGroup).detail(detail);
+    this.detail = ((SpiFetchGroup) fetchGroup).detail();
     return this;
   }
 

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

@@ -769,7 +769,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     copy.useQueryCache = useQueryCache;
     copy.unmodifiable = unmodifiable;
     if (detail != null) {
-      copy.detail = detail.copy(null);
+      copy.detail = detail.copy();
     }
     copy.temporalMode = temporalMode;
     copy.firstRow = firstRow;
@@ -1387,7 +1387,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
   @Override
   public final Query<T> select(FetchGroup<T> fetchGroup) {
     if (fetchGroup != null) {
-      this.detail = ((SpiFetchGroup<T>) fetchGroup).detail(detail);
+      this.detail = ((SpiFetchGroup<T>) fetchGroup).detail();
     }
     return this;
   }

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

@@ -39,21 +39,12 @@ public final class OrmQueryDetail implements Serializable {
   /**
    * Return a deep copy of the OrmQueryDetail.
    */
-  public OrmQueryDetail copy(OrmQueryDetail existing) {
+  public OrmQueryDetail copy() {
     OrmQueryDetail copy = new OrmQueryDetail();
     copy.baseProps = baseProps.copy();
     for (Map.Entry<String, OrmQueryProperties> entry : fetchPaths.entrySet()) {
       copy.fetchPaths.put(entry.getKey(), entry.getValue().copy());
     }
-    if (existing != null) {
-      // transfer any existing filterMany expressions
-      for (Map.Entry<String, OrmQueryProperties> entry : existing.fetchPaths.entrySet()) {
-        var filterMany = entry.getValue().getFilterMany();
-        if (filterMany != null) {
-          copy.getChunk(entry.getKey(), true).setFilterMany(filterMany);
-        }
-      }
-    }
     return copy;
   }
 

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

@@ -10,7 +10,7 @@ public interface SpiFetchGroup<T> extends FetchGroup<T> {
   /**
    * Return the detail to use for query execution.
    */
-  OrmQueryDetail detail(OrmQueryDetail existing);
+  OrmQueryDetail detail();
 
   /**
    * Return the underlying detail for copy purposes.

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

@@ -20,7 +20,7 @@ public final class DocStoreTransactionManager extends TransactionManager {
 
   @Override
   public SpiTransaction createTransaction(boolean explicit, int isolationLevel) {
-    return new DocStoreOnlyTransaction(explicit, this);
+    return createTransaction(explicit, null);
   }
 
   @Override
@@ -28,4 +28,8 @@ public final class DocStoreTransactionManager extends TransactionManager {
     return new DocStoreOnlyTransaction(false, this);
   }
 
+  @Override
+  protected SpiTransaction createTransaction(boolean explicit, Connection c) {
+    return new DocStoreOnlyTransaction(explicit, this);
+  }
 }

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

@@ -200,7 +200,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
   }
 
   @Override
-  public void registerDeleteBean(Class<?> type, Object id) {
+  public void registerDeleteBean(Integer persistingBean) {
     throw new IllegalStateException(notExpectedMessage);
   }
 
@@ -208,7 +208,7 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    * Return true if this is a bean that has already been saved/deleted.
    */
   @Override
-  public boolean isRegisteredDeleteBean(Class<?> type, Object id) {
+  public boolean isRegisteredDeleteBean(Integer persistingBean) {
     return false;
   }
 

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

@@ -1,32 +0,0 @@
-package io.ebeaninternal.server.transaction;
-
-import org.jspecify.annotations.Nullable;
-
-import java.sql.Connection;
-
-/**
- * Ebean transaction used for AutoCommit true connections.
- */
-final class JdbcAutoCommitTransaction extends JdbcTransaction {
-
-  JdbcAutoCommitTransaction(boolean explicit, Connection connection, @Nullable TransactionManager manager) {
-    super(true, explicit, connection, manager);
-  }
-
-  @Override
-  void performRollback() {
-    long offset = profileOffset();
-    if (profileStream != null) {
-      profileStream.addEvent(EVT_ROLLBACK, offset);
-    }
-  }
-
-  @Override
-  void performCommit() {
-    long offset = profileOffset();
-    if (profileStream != null) {
-      profileStream.addEvent(EVT_COMMIT, offset);
-    }
-  }
-
-}

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

@@ -68,7 +68,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   private int depth;
   private boolean autoCommit;
   private IdentityHashMap<Object, Object> persistingBeans;
-  private Map<Class<?>, Set<Object>> deletingBeans;
+  private HashSet<Integer> deletingBeansHash;
   private HashMap<String, String> m2mIntersectionSave;
   private Map<String, Object> userObjects;
   private List<TransactionCallback> callbackList;
@@ -90,17 +90,13 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    */
   private final boolean skipCacheAfterWrite;
   DocStoreTransaction docStoreTxn;
-  protected ProfileStream profileStream;
+  private ProfileStream profileStream;
   private ProfileLocation profileLocation;
   private final Instant startTime = Instant.now();
   private final long startNanos;
   private boolean autoPersistUpdates;
 
   JdbcTransaction(boolean explicit, Connection connection, TransactionManager manager) {
-    this(false, explicit, connection, manager);
-  }
-
-  JdbcTransaction(boolean autoCommit, boolean explicit, Connection connection, TransactionManager manager) {
     try {
       this.active = true;
       this.explicit = explicit;
@@ -129,9 +125,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
         this.onQueryOnlyCommit = true;
       }
 
-      if (!autoCommit) {
-        checkAutoCommit(connection);
-      }
+      checkAutoCommit(connection);
 
     } catch (Exception e) {
       throw new PersistenceException(e);
@@ -334,28 +328,40 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     deferredList.add(derived);
   }
 
+  /**
+   * Add a bean to the registed list.
+   * <p>
+   * This is to handle bi-directional relationships where both sides Cascade.
+   * </p>
+   */
   @Override
-  public final void registerDeleteBean(Class<?> type, Object id) {
-    deleteBeanIds(type).add(id);
-  }
-
-  @Override
-  public final boolean isRegisteredDeleteBean(Class<?> type, Object id) {
-    return deleteBeanIds(type).contains(id);
-  }
-
-  private Set<Object> deleteBeanIds(Class<?> type) {
-    if (deletingBeans == null) {
-      deletingBeans = new HashMap<>();
+  public final void registerDeleteBean(Integer persistingBean) {
+    if (deletingBeansHash == null) {
+      deletingBeansHash = new HashSet<>();
     }
-    return deletingBeans.computeIfAbsent(type, k -> new HashSet<>());
+    deletingBeansHash.add(persistingBean);
   }
 
+  /**
+   * Return true if this is a bean that has already been saved/deleted.
+   */
+  @Override
+  public final boolean isRegisteredDeleteBean(Integer persistingBean) {
+    return deletingBeansHash != null && deletingBeansHash.contains(persistingBean);
+  }
+
+  /**
+   * Unregister the persisted beans (when persisting at the top level).
+   */
   @Override
   public final void unregisterBeans() {
     persistingBeans.clear();
   }
 
+  /**
+   * Return true if this is a bean that has already been saved. This will
+   * register the bean if it is not already.
+   */
   @Override
   public final boolean isRegisteredBean(Object bean) {
     if (persistingBeans == null) {
@@ -364,6 +370,10 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
     return (persistingBeans.put(bean, PLACEHOLDER) != null);
   }
 
+  /**
+   * Return true if the m2m intersection save is allowed from a given bean direction.
+   * This is to stop m2m intersection management via both directions of a m2m.
+   */
   @Override
   public final boolean isSaveAssocManyIntersection(String intersectionTable, String beanName) {
     if (m2mIntersectionSave == null) {

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

@@ -154,12 +154,12 @@ final class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void registerDeleteBean(Class<?> type, Object id) {
+  public void registerDeleteBean(Integer hash) {
 
   }
 
   @Override
-  public boolean isRegisteredDeleteBean(Class<?> type, Object id) {
+  public boolean isRegisteredDeleteBean(Integer hash) {
     return false;
   }
 

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

@@ -13,18 +13,9 @@ import java.sql.SQLException;
 abstract class TransactionFactory {
 
   final TransactionManager manager;
-  private final boolean autoCommitMode;
 
   TransactionFactory(TransactionManager manager) {
     this.manager = manager;
-    this.autoCommitMode = manager.isAutoCommitMode();
-  }
-
-  /**
-   * Return a new transaction.
-   */
-  SpiTransaction createTransaction(boolean explicit, Connection connection) {
-    return autoCommitMode ? new JdbcAutoCommitTransaction(explicit, connection, manager) : new JdbcTransaction(explicit, connection, manager);
   }
 
   /**

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

@@ -39,7 +39,7 @@ class TransactionFactoryBasic extends TransactionFactory {
     Connection connection = null;
     try {
       connection = dataSource.getConnection();
-      SpiTransaction t = createTransaction(explicit, connection);
+      SpiTransaction t = manager.createTransaction(explicit, connection);
       return setIsolationLevel(t, isolationLevel);
     } catch (PersistenceException ex) {
       JdbcClose.close(connection);

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

@@ -48,7 +48,7 @@ class TransactionFactoryTenant extends TransactionFactory {
     try {
       Object tenantId = tenantProvider.currentId();
       connection = dataSourceSupplier.connection(tenantId);
-      SpiTransaction transaction = createTransaction(explicit, connection);
+      SpiTransaction transaction = manager.createTransaction(explicit, connection);
       transaction.setTenantId(tenantId);
       return setIsolationLevel(transaction, isolationLevel);
 

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

@@ -5,12 +5,12 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.ProfileLocation;
 import io.ebean.TxScope;
 import io.ebean.annotation.PersistBatch;
-import io.ebean.annotation.Platform;
 import io.ebean.annotation.TxType;
 import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.datasource.DataSourcePool;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeSet;
@@ -106,7 +106,6 @@ public class TransactionManager implements SpiTransactionManager {
   private final ServerCacheNotify cacheNotify;
   private final boolean supportsSavepointId;
   private final ConcurrentHashMap<String, ProfileLocation> profileLocations = new ConcurrentHashMap<>();
-  private final boolean autoCommitMode;
 
   /**
    * Create the TransactionManager
@@ -116,7 +115,6 @@ public class TransactionManager implements SpiTransactionManager {
     this.logManager = options.logManager;
     this.databasePlatform = options.config.getDatabasePlatform();
     this.supportsSavepointId = databasePlatform.supportsSavepointId();
-    this.autoCommitMode = databasePlatform.platform() == Platform.CLICKHOUSE;
     this.skipCacheAfterWrite = options.config.isSkipCacheAfterWrite();
     this.notifyL2CacheInForeground = options.notifyL2CacheInForeground;
     this.autoPersistUpdates = options.config.isAutoPersistUpdates();
@@ -208,10 +206,6 @@ public class TransactionManager implements SpiTransactionManager {
     }
   }
 
-  final boolean isAutoCommitMode() {
-    return autoCommitMode;
-  }
-
   /**
    * Return true if the DB platform supports SavepointId().
    */
@@ -304,6 +298,13 @@ public class TransactionManager implements SpiTransactionManager {
     return transactionFactory.createReadOnlyTransaction(tenantId, useMaster);
   }
 
+  /**
+   * Create a new transaction.
+   */
+  SpiTransaction createTransaction(boolean explicit, Connection c) {
+    return new JdbcTransaction(explicit, c, this);
+  }
+
   /**
    * Process a local rolled back transaction.
    */

ebean-ddl-generator/pom.xml

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

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java

@@ -195,7 +195,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor {
       String dbCol = column.getLocalDbColumn();
       BeanProperty importedProperty = p.findMatchImport(dbCol);
       if (importedProperty == null) {
-        continue;
+        throw new RuntimeException("Imported BeanProperty not found?");
       }
       String columnDefn = ctx.getColumnDefn(importedProperty, true);
       String refColumn = importedProperty.dbColumn();

ebean-jackson-mapper/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.1.0</version>
+    <version>16.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</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.1.0</version>
+    <version>16.0.0</version>
   </parent>
 
   <name>ebean net postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</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.1.0</version>
+    <version>16.0.0</version>
   </parent>
 
   <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-querybean/pom.xml

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

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

@@ -13,7 +13,6 @@ import org.example.domain.otherpackage.ValidEmail;
 import org.example.domain.query.QContact;
 import org.example.domain.query.QCustomer;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;
@@ -392,23 +391,6 @@ public class QCustomerTest {
     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
-  @DisplayName("Retain filterMany expression when select fetchGroup applied after filterMany")
-  void filterManyBeforeSelectFetchGroup_expect_filterManyExpressionRetained() {
-    var fetchGroup = QCustomer.forFetchGroup()
-      .select(name)
-      .contacts.fetch(QContact.Alias.email)
-      .buildFetchGroup();
-
-    var q = new QCustomer()
-      .contacts.filterMany(c -> c.firstName.startsWith("R"))
-      .select(fetchGroup)
-      .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 where (t1.id is null or (t1.first_name like ? escape'|')) order by t0.id");
-  }
-
   @Test
   public void testIdIn() {
 

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.1.0</version>
+    <version>16.0.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -29,35 +29,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</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.1.0</version>
+    <version>16.0.0</version>
   </parent>
 
   <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.1.0</version>
+    <version>16.0.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -33,20 +33,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
 
     <dependency>
@@ -149,14 +149,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java

@@ -56,6 +56,7 @@ public class TestCarWheelIud extends BaseTestCase {
     Car car2 = DB.find(Car.class, car.getId());
 
     DB.delete(car2);
+
   }
 
   @Test

ebean-test/src/test/java/org/tests/model/m2o/MTJOrder.java

@@ -1,45 +0,0 @@
-package org.tests.model.m2o;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-
-@Entity
-public class MTJOrder {
-
-  @Id
-  private long id;
-
-  @Column(name = "org_id")
-  private long orgId;
-
-  @Column
-  private String other;
-
-  public Long id() {
-    return id;
-  }
-
-  public MTJOrder setId(Long id) {
-    this.id = id;
-    return this;
-  }
-
-  public Long orgId() {
-    return orgId;
-  }
-
-  public MTJOrder setOrgId(Long orgId) {
-    this.orgId = orgId;
-    return this;
-  }
-
-  public String other() {
-    return other;
-  }
-
-  public MTJOrder setOther(String other) {
-    this.other = other;
-    return this;
-  }
-}

ebean-test/src/test/java/org/tests/model/m2o/MTJTrans.java

@@ -1,47 +0,0 @@
-package org.tests.model.m2o;
-
-import jakarta.persistence.*;
-
-@Entity
-public class MTJTrans {
-
-  @Id
-  private long id;
-
-  @Column(name = "org_id")
-  private long orgId;
-
-  @ManyToOne
-  @JoinColumns({
-    @JoinColumn(name = "org_id", referencedColumnName = "org_id"), // extra join column, not strictly needed
-    @JoinColumn(name = "order_id", referencedColumnName = "id")
-  })
-  private MTJOrder order;
-
-  public Long id() {
-    return id;
-  }
-
-  public MTJTrans setId(Long id) {
-    this.id = id;
-    return this;
-  }
-
-  public Long orgId() {
-    return orgId;
-  }
-
-  public MTJTrans setOrgId(Long orgId) {
-    this.orgId = orgId;
-    return this;
-  }
-
-  public MTJOrder order() {
-    return order;
-  }
-
-  public MTJTrans setOrder(MTJOrder order) {
-    this.order = order;
-    return this;
-  }
-}

ebean-test/src/test/java/org/tests/model/m2o/TestMTJoinColumns.java

@@ -1,48 +0,0 @@
-package org.tests.model.m2o;
-
-import io.ebean.DB;
-import io.ebean.test.LoggedSql;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class TestMTJoinColumns {
-
-  @Test
-  void test() {
-    MTJTrans parent = new MTJTrans();
-    parent.setOrgId(51L);
-
-    DB.save(parent);
-
-    MTJTrans found = DB.find(MTJTrans.class)
-      .setId(parent.id())
-      .fetch("order")
-      .findOne();
-
-    assertThat(found.order()).isNull();
-
-    var order = new MTJOrder()
-      .setOrgId(51L)
-      .setOther("some");
-    DB.save(order);
-    found.setOrder(order);
-    DB.save(found);
-
-    LoggedSql.start();
-    MTJTrans found2 = DB.find(MTJTrans.class)
-      .setId(parent.id())
-      .fetch("order")
-      .findOne();
-
-    assertThat(found2.order()).isNotNull();
-    assertThat(found2.order().id()).isEqualTo(order.id());
-    assertThat(found2.order().other()).isEqualTo("some");
-
-    List<String> sql = LoggedSql.stop();
-    assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("from mtjtrans t0 left join mtjorder t1 on t1.org_id = t0.org_id and t1.id = t0.order_id where t0.id = ?");
-  }
-}

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.1.0'
-git tag 16.1.0
+git commit -am 'Version 16.0.0'
+git tag 16.0.0
 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.1.0</version>
+    <version>16.0.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -56,14 +56,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -83,7 +83,7 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
-        <version>2.2.10</version>
+        <version>${kotlin.version}</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.1.0</version>
+    <version>16.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -16,67 +16,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
 
   </dependencies>

platforms/clickhouse/pom.xml

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

platforms/db2/pom.xml

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

platforms/h2/pom.xml

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

platforms/hana/pom.xml

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

platforms/hsqldb/pom.xml

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

platforms/mariadb/pom.xml

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

platforms/mysql/pom.xml

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

platforms/nuodb/pom.xml

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

platforms/oracle/pom.xml

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

platforms/pom.xml

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

platforms/postgres/pom.xml

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

platforms/sqlanywhere/pom.xml

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

platforms/sqlite/pom.xml

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

platforms/sqlserver/pom.xml

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

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>16.1.0</version>
+  <version>16.0.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -47,11 +47,11 @@
     <ebean-annotation.version>8.4</ebean-annotation.version>
     <ebean-ddl-runner.version>2.3</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
-    <ebean-migration.version>14.3.0</ebean-migration.version>
-    <ebean-test-containers.version>7.15</ebean-test-containers.version>
+    <ebean-migration.version>14.2.0</ebean-migration.version>
+    <ebean-test-containers.version>7.14</ebean-test-containers.version>
     <ebean-datasource.version>10.1</ebean-datasource.version>
-    <ebean-agent.version>16.1.0</ebean-agent.version>
-    <ebean-maven-plugin.version>16.1.0</ebean-maven-plugin.version>
+    <ebean-agent.version>14.12.0</ebean-agent.version>
+    <ebean-maven-plugin.version>14.12.0</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.13</version>
+      <version>1.5.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -96,18 +96,13 @@
     <module>composites</module>
     <module>ebean-jackson-mapper</module>
     <module>ebean-spring-txn</module>
+    <module>kotlin-querybean-generator</module>
     <module>ebean-core-json</module>
   </modules>
 
   <profiles>
-    <profile>
-      <id>ea</id>
-    </profile>
     <profile>
       <id>central</id>
-      <modules>
-        <module>kotlin-querybean-generator</module>
-      </modules>
     </profile>
     <profile>
       <id>h2v1</id>
@@ -130,7 +125,6 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <modules>
-        <module>kotlin-querybean-generator</module>
         <module>tests</module>
       </modules>
     </profile>

querybean-generator/pom.xml

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

tests/pom.xml

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

tests/test-java16/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.1.0</version>
+    <version>16.0.0</version>
   </parent>
 
   <artifactId>test-java16</artifactId>
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-h2</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
 
     <dependency>
@@ -30,14 +30,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>provided</scope>
     </dependency>
 

tests/test-kotlin/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.1.0</version>
+    <version>16.0.0</version>
   </parent>
 
   <artifactId>test-kotlin</artifactId>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
     </dependency>
 
     <dependency>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.1.0</version>
+      <version>16.0.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
-        <version>2.2.10</version>
+        <version>${kotlin.version}</version>
         <configuration>
           <jvmTarget>${maven.compiler.target}</jvmTarget>
         </configuration>