#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).
2026-09-24 11:29:05 +00:00 · 2025-08-30 09:29:25 +12:00
106 changed files with 359 additions and 997 deletions
@@ -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

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

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-net-postgis-types</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -47,19 +47,19 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -42,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -60,13 +60,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

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

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

  <name>ebean api</name>
@@ -989,14 +989,6 @@ public interface DatabaseBuilder {
  @Deprecated
  DatabaseBuilder setNamingConvention(NamingConvention namingConvention);

-  /**
-   * Set the AggregateFormulaContext which is used to determine if a database function
-   * is an aggregate function (like sum, min, max, avg etc).
-   * <p>
-   * Use this to override the default known aggregation functions.
-   */
-  DatabaseConfig aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext);
-
  /**
   * Set to true if all DB column and table names should use quoted identifiers.
   * <p>
@@ -2618,11 +2610,6 @@ public interface DatabaseBuilder {
     */
    NamingConvention getNamingConvention();

-    /**
-     * Return the AggregateFormulaContext.
-     */
-    AggregateFormulaContext aggregateFormulaContext();
-
    /**
     * Return true if all DB column and table names should use quoted identifiers.
     */
@@ -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();

  /**
@@ -393,12 +393,6 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que
   * This means that the returning graph can't be mutated via setters, all the collections
   * are unmodifiable collections, lazy loading is disabled and that the query uses
   * {@link PersistenceContextScope#QUERY}.
-   * <p>
-   * Attempting to mutate an unmodifiable bean will throw a <code>UnmodifiableEntityException</code>.
-   * Attempting to load an unloaded property will throw a <code>LazyInitialisationException</code>
-   *
-   * @see LazyInitialisationException
-   * @see UnmodifiableEntityException
   */
  SELF setUnmodifiable(boolean unmodifiable);

@@ -447,16 +441,6 @@ public interface QueryBuilder<SELF extends QueryBuilder<SELF, T>, T> extends Que

  /**
   * Set the {@link CacheMode} to use the query for executing this query.
-   * <p>
-   * Since version 16.x using the query bean will set the query to use unmodifiable (see
-   * {@link #setUnmodifiable(boolean)}) so the returned object graph is unmodifiable
-   * and safe to cache by the application.
-   * <p>
-   * Attempting to mutate an unmodifiable bean will throw a <code>UnmodifiableEntityException</code>.
-   * Attempting to load an unloaded property will throw a <code>LazyInitialisationException</code>
-   *
-   * @see LazyInitialisationException
-   * @see UnmodifiableEntityException
   */
  SELF setUseQueryCache(CacheMode cacheMode);

@@ -1,66 +0,0 @@
-package io.ebean.config;
-
-import java.util.Set;
-
-/**
- * Used when parsing formulas to determine if they are aggregation formulas like
- * sum, min, max, avg, count etc.
- * <p>
- * Ebean needs to determine if they are aggregation formulas to determine which
- * properties should be included in a GROUP BY clause etc.
- */
-public interface AggregateFormulaContext {
-
-  /**
-   * Return true if the outer function is an aggregate function (like sum, count, min, max, avg etc).
-   */
-  boolean isAggregate(String outerFunction);
-
-  /**
-   * Return true if the aggregate function returns a BIGINT type.
-   * This is true for functions like count that return a numeric value regardless of the
-   * type of the property or expression inside the outer function.
-   */
-  boolean isCount(String outerFunction);
-
-  /**
-   * Return true if the aggregate function returns a VARCHAR type.
-   * This is true for functions that return a string concatenation like group_concat etc
-   * regardless of the type of the property used inside the outer function.
-   */
-  boolean isConcat(String outerFunction);
-
-  /**
-   * Return a builder for the AggregateFormulaContext.
-   */
-  static Builder builder() {
-    return new AggregateFormulaContextBuilder();
-  }
-
-  /**
-   * A builder for the AggregateFormulaContext.
-   */
-  interface Builder {
-
-    /**
-     * Override the default set of aggregation functions.
-     */
-    Builder aggregateFunctions(Set<String> count);
-
-    /**
-     * Override the default set of concat functions.
-     */
-    Builder concatFunctions(Set<String> concat);
-
-    /**
-     * Override the default set of count functions.
-     */
-    Builder countFunctions(Set<String> count);
-
-    /**
-     * Build the AggregateFormulaContext.
-     */
-    AggregateFormulaContext build();
-  }
-
-}
@@ -1,61 +0,0 @@
-package io.ebean.config;
-
-import java.util.Set;
-
-final class AggregateFormulaContextBuilder implements AggregateFormulaContext.Builder {
-
-  private Set<String> aggFunctions = Set.of("count", "max", "min", "avg", "sum", "group_concat", "string_agg", "listagg");
-  private Set<String> concat = Set.of("concat", "group_concat", "string_agg", "listagg");
-  private Set<String> count = Set.of("count");
-
-  @Override
-  public AggregateFormulaContext.Builder aggregateFunctions(Set<String> agg) {
-    this.aggFunctions = agg;
-    return this;
-  }
-
-  @Override
-  public AggregateFormulaContext.Builder concatFunctions(Set<String> concat) {
-    this.concat = concat;
-    return this;
-  }
-
-  @Override
-  public AggregateFormulaContext.Builder countFunctions(Set<String> count) {
-    this.count = count;
-    return this;
-  }
-
-  @Override
-  public AggregateFormulaContext build() {
-    return new FormulaContext(aggFunctions, concat, count);
-  }
-
-  private static final class FormulaContext implements AggregateFormulaContext {
-
-    private final Set<String> aggFunctions;
-    private final Set<String> concat;
-    private final Set<String> count;
-
-    private FormulaContext(Set<String> aggFunctions, Set<String> concat, Set<String> count) {
-      this.aggFunctions = aggFunctions;
-      this.concat = concat;
-      this.count = count;
-    }
-
-    @Override
-    public boolean isAggregate(String outerFunction) {
-      return aggFunctions.contains(outerFunction);
-    }
-
-    @Override
-    public boolean isCount(String outerFunction) {
-      return count.contains(outerFunction);
-    }
-
-    @Override
-    public boolean isConcat(String outerFunction) {
-      return concat.contains(outerFunction);
-    }
-  }
-}
@@ -356,8 +356,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   */
  private NamingConvention namingConvention = new UnderscoreNamingConvention();

-  private AggregateFormulaContext aggregateFormulaContext = AggregateFormulaContext.builder().build();
-
  /**
   * Behaviour of updates in JDBC batch to by default include all properties.
   */
@@ -1281,17 +1279,6 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
    return this;
  }

-  @Override
-  public AggregateFormulaContext aggregateFormulaContext() {
-    return aggregateFormulaContext;
-  }
-
-  @Override
-  public DatabaseConfig aggregateFormulaContext(AggregateFormulaContext aggregateFormulaContext) {
-    this.aggregateFormulaContext = aggregateFormulaContext;
-    return this;
-  }
-
  @Override
  public boolean isAllQuotedIdentifiers() {
    return platformConfig.isAllQuotedIdentifiers();
@@ -1,65 +0,0 @@
-package io.ebean.config;
-
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-import java.util.Set;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class AggregateFormulaContextTest {
-
-  @Test
-  void defaultContext() {
-    var defaultContext = AggregateFormulaContext.builder().build();
-    for (String aggFunction : List.of("count", "max", "min", "avg", "sum", "group_concat", "string_agg", "listagg")) {
-      assertThat(defaultContext.isAggregate(aggFunction)).isTrue();
-    }
-    for (String c : List.of("concat", "group_concat", "string_agg", "listagg")) {
-      assertThat(defaultContext.isConcat(c)).isTrue();
-    }
-    for (String c : List.of("count")) {
-      assertThat(defaultContext.isCount(c)).isTrue();
-    }
-
-    assertThat(defaultContext.isConcat("junk")).isFalse();
-    assertThat(defaultContext.isCount("junk")).isFalse();
-    assertThat(defaultContext.isAggregate("junk")).isFalse();
-  }
-
-  @Test
-  void overrideAggregateFunctions() {
-    AggregateFormulaContext mySum = AggregateFormulaContext.builder()
-      .aggregateFunctions(Set.of("my_sum"))
-      .build();
-
-    assertThat(mySum.isAggregate("my_sum")).isTrue();
-    assertThat(mySum.isAggregate("avg")).isFalse();
-    assertThat(mySum.isCount("count")).isTrue();
-    assertThat(mySum.isConcat("group_concat")).isTrue();
-  }
-
-  @Test
-  void overrideConcatFunctions() {
-    AggregateFormulaContext myConcat = AggregateFormulaContext.builder()
-      .concatFunctions(Set.of("my_concat"))
-      .build();
-
-    assertThat(myConcat.isAggregate("avg")).isTrue();
-    assertThat(myConcat.isCount("count")).isTrue();
-    assertThat(myConcat.isConcat("group_concat")).isFalse();
-    assertThat(myConcat.isConcat("my_concat")).isTrue();
-  }
-
-  @Test
-  void overrideCountFunctions() {
-    AggregateFormulaContext myCount = AggregateFormulaContext.builder()
-      .countFunctions(Set.of("my_count"))
-      .build();
-
-    assertThat(myCount.isAggregate("avg")).isTrue();
-    assertThat(myCount.isCount("count")).isFalse();
-    assertThat(myCount.isCount("my_count")).isTrue();
-    assertThat(myCount.isConcat("group_concat")).isTrue();
-  }
-}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>16.1.1</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.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
@@ -155,37 +155,37 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <!-- platforms -->
@@ -193,79 +193,79 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-clickhouse</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>16.1.1</version>
+        <version>16.0.0</version>
      </dependency>

    </dependencies>
@@ -3,7 +3,7 @@
  <parent>
    <groupId>io.ebean</groupId>
    <artifactId>ebean-parent</artifactId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <!-- Jackson core used internally by Ebean -->
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-json</artifactId>
-      <version>16.1.1</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.1</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.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -1,10 +0,0 @@
-package io.ebeaninternal.api;
-
-import io.ebean.config.AggregateFormulaContext;
-import io.ebeaninternal.server.query.STreeProperty;
-
-public interface FormulaBuilder {
-
-  STreeProperty create(AggregateFormulaContext context, String formula, String path);
-
-}
@@ -14,9 +14,4 @@ public interface SpiBeanType {
   * or removals from the collection.
   */
  boolean isToManyDirty(EntityBean bean);
-
-  /**
-   * Return the FormulaBuilder for this type.
-   */
-  FormulaBuilder formulaBuilder();
 }
@@ -1,6 +1,5 @@
 package io.ebeaninternal.api;

-import io.ebeaninternal.server.query.STreeProperty;
 import org.jspecify.annotations.Nullable;
 import io.ebean.*;
 import io.ebean.bean.BeanCollectionLoader;
@@ -378,6 +377,4 @@ public interface SpiEbeanServer extends SpiServer, BeanCollectionLoader {

  @Nullable
  SqlRow findOne(SpiSqlQuery query);
-
-  <T> STreeProperty createFormulaProperty(SpiBeanType desc, String formula, String path);
 }
@@ -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
@@ -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
@@ -113,7 +113,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  private final long slowQueryMicros;
  private final SlowQueryListener slowQueryListener;
  private final boolean disableL2Cache;
-  private final AggregateFormulaContext formulaContext;
  private boolean shutdown;

  /**
@@ -129,7 +128,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    this.backgroundExecutor = config.getBackgroundExecutor();
    this.extraMetrics = config.getExtraMetrics();
    this.serverName = this.config.getName();
-    this.formulaContext = config.getConfig().aggregateFormulaContext();
    this.lazyLoadBatchSize = this.config.getLazyLoadBatchSize();
    this.cqueryEngine = config.getCQueryEngine();
    this.expressionFactory = config.getExpressionFactory();
@@ -930,11 +928,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    return findId(query);
  }

-  @Override
-  public <T> STreeProperty createFormulaProperty(SpiBeanType desc, String formula, String path) {
-    return desc.formulaBuilder().create(formulaContext, formula, path);
-  }
-
  <T> SpiOrmQueryRequest<T> createQueryRequest(Type type, SpiQuery<T> query) {
    SpiOrmQueryRequest<T> request = buildQueryRequest(type, query);
    request.prepareQuery();
@@ -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");
@@ -2410,12 +2410,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
   */
  private STreeProperty findSqlTreeFormula(String formula, String path) {
    String key = formula + "-" + path;
-    return dynamicProperty.computeIfAbsent(key, (fullKey) -> ebeanServer.createFormulaProperty(this, formula, path));
-  }
-
-  @Override
-  public FormulaBuilder formulaBuilder() {
-    return new DFormulaBuilder(this);
+    return dynamicProperty.computeIfAbsent(key, (fullKey) -> FormulaPropertyPath.create(this, formula, path));
  }

  /**
@@ -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;
@@ -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 ";
@@ -1,19 +0,0 @@
-package io.ebeaninternal.server.deploy;
-
-import io.ebean.config.AggregateFormulaContext;
-import io.ebeaninternal.api.FormulaBuilder;
-import io.ebeaninternal.server.query.STreeProperty;
-
-final class DFormulaBuilder implements FormulaBuilder {
-
-  private final BeanDescriptor<?> descriptor;
-
-  DFormulaBuilder(BeanDescriptor<?> descriptor) {
-    this.descriptor = descriptor;
-  }
-
-  @Override
-  public STreeProperty create(AggregateFormulaContext context, String formula, String path) {
-    return FormulaPropertyPath.create(descriptor, context, formula, path);
-  }
-}
@@ -1,7 +1,6 @@
 package io.ebeaninternal.server.deploy;

 import io.ebean.core.type.ScalarType;
-import io.ebean.config.AggregateFormulaContext;
 import io.ebeaninternal.server.el.ElPropertyDeploy;
 import io.ebeaninternal.server.query.STreeProperty;

@@ -10,10 +9,11 @@ import java.util.Set;

 final class FormulaPropertyPath {

+  private static final String[] AGG_FUNCTIONS = {"count", "max", "min", "avg", "sum"};
+
  private static final String DISTINCT_ = "distinct ";

  private final BeanDescriptor<?> descriptor;
-  private final AggregateFormulaContext context;
  private final String formula;
  private final String outerFunction;
  private final String internalExpression;
@@ -24,13 +24,12 @@ final class FormulaPropertyPath {
  private String cast;
  private String alias;

-  static STreeProperty create(BeanDescriptor<?> descriptor, AggregateFormulaContext context, String formula, String path) {
-    return new FormulaPropertyPath(descriptor, context, formula, path).build();
+  static STreeProperty create(BeanDescriptor<?> descriptor, String formula, String path) {
+    return new FormulaPropertyPath(descriptor, formula, path).build();
  }

-  FormulaPropertyPath(BeanDescriptor<?> descriptor, AggregateFormulaContext context, String formula, String path) {
+  FormulaPropertyPath(BeanDescriptor<?> descriptor, String formula, String path) {
    this.descriptor = descriptor;
-    this.context = context;
    this.formula = formula;
    int openBracket = formula.indexOf('(');
    int closeBracket = formula.lastIndexOf(')');
@@ -107,10 +106,10 @@ final class FormulaPropertyPath {
      }
      return create(scalarType);
    }
-    if (context.isCount(outerFunction)) {
+    if (isCount()) {
      return create(descriptor.scalarType(Types.BIGINT));
    }
-    if (context.isConcat(outerFunction)) {
+    if (isConcat()) {
      return create(descriptor.scalarType(Types.VARCHAR));
    }
    if (firstProp == null) {
@@ -145,7 +144,12 @@ final class FormulaPropertyPath {
  }

  private boolean isAggregate() {
-    return context.isAggregate(outerFunction);
+    for (String aggFunction : AGG_FUNCTIONS) {
+      if (aggFunction.equals(outerFunction)) {
+        return true;
+      }
+    }
+    return false;
  }

  private String buildFormula(String parsed) {
@@ -804,9 +804,11 @@ public class DeployBeanDescriptor<T> {
   * Return the defaultSelectClause using FetchType.LAZY and FetchType.EAGER.
   */
  public String getDefaultSelectClause() {
+
    StringBuilder sb = new StringBuilder();

    boolean hasLazyFetch = false;
+
    for (DeployBeanProperty prop : propMap.values()) {
      if (!prop.isTransient() && !(prop instanceof DeployBeanPropertyAssocMany<?>)) {
        if (prop.isFetchEager()) {
@@ -617,8 +617,6 @@ public class DeployBeanProperty {
    this.dbRead = true;
    this.dbInsertable = false;
    this.dbUpdateable = false;
-    // aggregation by default not fetchEager
-    this.fetchEager = false;
  }

  /**
@@ -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
@@ -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;
  }

@@ -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;
  }
@@ -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;
  }

@@ -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.
@@ -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);
+  }
 }
@@ -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;
  }

@@ -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);
-    }
-  }
-
-}
@@ -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) {
@@ -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;
  }

@@ -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);
  }

  /**
@@ -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);
@@ -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);

@@ -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.
   */
@@ -1,6 +1,5 @@
 package io.ebeaninternal.server.deploy;

-import io.ebean.config.AggregateFormulaContext;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;

@@ -8,10 +7,11 @@ import static org.assertj.core.api.Assertions.assertThat;

 public class FormulaPropertyPathTest extends BaseTest {

-  private final BeanDescriptor<Customer> customerDesc = getBeanDescriptor(Customer.class);
+  private BeanDescriptor<Customer> customerDesc = getBeanDescriptor(Customer.class);

  @Test
  public void isFormula() {
+
    assertFormula("max(version)", "max", "version");
    assertFormula("min(name)", "min", "name");
    assertFormula("avg(id)", "avg", "id");
@@ -58,8 +58,8 @@ public class FormulaPropertyPathTest extends BaseTest {
  }

  private void assertFormula(String input, String funcName, String expression, String cast, String alias) {
-    var context = AggregateFormulaContext.builder().build();
-    FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, context, input, null);
+
+    FormulaPropertyPath propertyPath = new FormulaPropertyPath(customerDesc, input, null);

    assertThat(propertyPath.internalExpression()).isEqualTo(expression);
    assertThat(propertyPath.outerFunction()).isEqualTo(funcName);
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -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();
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <!-- provided scope -->
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <!-- provided scope -->
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</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.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -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() {

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</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.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

@@ -1,6 +1,5 @@
 package io.ebean.xtest.internal.api;

-import io.ebeaninternal.server.query.STreeProperty;
 import org.jspecify.annotations.NullMarked;
 import io.ebean.*;
 import io.ebean.annotation.Platform;
@@ -712,11 +711,6 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
    return null;
  }

-  @Override
-  public <T> STreeProperty createFormulaProperty(SpiBeanType desc, String formula, String path) {
-    return null;
-  }
-
  @Override
  public void save(Object bean) throws OptimisticLockException {
  }
@@ -1,60 +0,0 @@
-package org.tests.aggregateformula;
-
-import io.ebean.annotation.Aggregation;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Lob;
-
-@Entity
-public class EWithLobAndAgg {
-
-  @Id
-  long id;
-
-  @Column
-  String name;
-
-   @Lob
-  @Column
-  String description;
-
-  @Aggregation("count(*)")
-  int count;
-
-  public long id() {
-    return id;
-  }
-
-  public EWithLobAndAgg setId(long id) {
-    this.id = id;
-    return this;
-  }
-
-  public String name() {
-    return name;
-  }
-
-  public EWithLobAndAgg setName(String name) {
-    this.name = name;
-    return this;
-  }
-
-  public String description() {
-    return description;
-  }
-
-  public EWithLobAndAgg setDescription(String description) {
-    this.description = description;
-    return this;
-  }
-
-  public int count() {
-    return count;
-  }
-
-  public EWithLobAndAgg setCount(int count) {
-    this.count = count;
-    return this;
-  }
-}
@@ -2,7 +2,6 @@ package org.tests.aggregateformula;

 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.xtest.ForPlatform;
 import io.ebean.xtest.IgnorePlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.test.LoggedSql;
@@ -127,27 +126,6 @@ public class TestAggregateFormula extends BaseTestCase {
    assertThat(contact.getCustomer().getId()).isNotNull();
  }

-  @ForPlatform(Platform.H2)
-  @Test
-  public void group_agg() {
-    ResetBasicData.reset();
-
-    LoggedSql.start();
-
-    List<Order> orders = DB.find(Order.class)
-      .select("status, group_concat(id) as customerName")
-      .findList();
-
-    List<String> sql = LoggedSql.stop();
-    assertSql(sql.get(0)).contains("select t0.status, group_concat(t0.id) customerName from o_order t0 group by t0.status");
-
-    assertThat(orders).isNotEmpty();
-    for (Order order : orders) {
-      assertThat(order.getStatus()).isNotNull();
-      assertThat(order.getCustomerName()).isNotNull();
-    }
-  }
-
  @Test
  public void sum_withoutAlias() {

@@ -1,21 +0,0 @@
-package org.tests.aggregateformula;
-
-import io.ebean.DB;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class TestEWithLobAndAgg {
-
-  @Test
-  void when_lobAndAgg_expect_neitherLobOrAggSelectedByDefault() {
-    var query = DB.find(EWithLobAndAgg.class);
-
-    query.findList();
-    var sql = query.getGeneratedSql();
-
-    assertThat(sql)
-      .describedAs("Neither Lob or Aggregation column in query")
-      .isEqualTo("select t0.id, t0.name from ewith_lob_and_agg t0");
-  }
-}
@@ -1,44 +0,0 @@
-package org.tests.insert;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Version;
-
-@Entity
-public class EStrIdBean {
-
-  @Id
-  String id;
-
-  @Version
-  long version; // = 1;
-
-  private String name;
-
-  public String id() {
-    return id;
-  }
-
-  public EStrIdBean setId(String id) {
-    this.id = id;
-    return this;
-  }
-
-  public long version() {
-    return version;
-  }
-
-  public EStrIdBean setVersion(long version) {
-    this.version = version;
-    return this;
-  }
-
-  public String name() {
-    return name;
-  }
-
-  public EStrIdBean setName(String name) {
-    this.name = name;
-    return this;
-  }
-}
@@ -25,24 +25,6 @@ class TestInsertOnConflict extends BaseTestCase {
    .getGeneratedKeys(true)
    .build();

-  @ForPlatform({Platform.POSTGRES, Platform.YUGABYTE})
-  @Test
-  void insertTestEntity() {
-    var entity1 = new EStrIdBean();
-    entity1.setId("entity-1");
-    entity1.setName("Example");
-    DB.insert(entity1);
-
-    var entity2 = new EStrIdBean();
-    entity2.setId("entity-1");
-    entity2.setName("Example");
-
-    DB.getDefault().insert(entity2, InsertOptions.builder()
-      .onConflictNothing()
-      .uniqueColumns("id")
-      .build());
-  }
-
  @ForPlatform({Platform.POSTGRES, Platform.YUGABYTE})
  @Test
  void insertOnConflictUpdateExplicitTransaction() {
@@ -56,6 +56,7 @@ public class TestCarWheelIud extends BaseTestCase {
    Car car2 = DB.find(Car.class, car.getId());

    DB.delete(car2);
+
  }

  @Test
@@ -1,7 +1,6 @@
 package org.tests.json;

 import io.ebean.DB;
-import io.ebean.annotation.Platform;
 import io.ebean.test.LoggedSql;
 import org.junit.jupiter.api.Test;
 import org.tests.model.json.EBasicJsonBString;
@@ -39,21 +38,10 @@ class TestDbJsonBStringType {


    // change content only
-    found.content("{\"mykey\": 95, \"other\": \"AI\"}");
+    found.content("{\"mykey\": 95}");
    DB.save(found);
    sql = LoggedSql.stop();
    assertThat(sql.get(0)).contains("update ebasic_json_bstring set content=?, version=? where id=? and version=?");

-
-    if (DB.getDefault().platform() == Platform.POSTGRES) {
-      List<EBasicJsonBString> result = DB.find(EBasicJsonBString.class)
-        .where()
-        .raw("content -> 'other' ?? ?", "AI")
-        .raw("jsonb_exists(content -> 'other', ?)", "AI")
-        .raw("jsonb_path_exists(content, '$.other ? (@ >= $param)', '{\"param\":\"AI\"}')")
-        .findList();
-
-      assertThat(result).hasSize(1);
-    }
  }
 }
@@ -29,7 +29,7 @@ public class TestAggregationTopLevel extends BaseTestCase {
      .query();

    List<DMachineStatsAgg> result = query.findList();
-    assertThat(sqlOf(query)).contains("select t0.machine_id, t0.edate from d_machine_stats t0 where t0.edate > ?");
+    assertThat(sqlOf(query)).contains("select t0.edate, t0.machine_id from d_machine_stats t0 where t0.edate > ?");
    assertThat(result).isNotEmpty();
  }

@@ -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;
-  }
-}
@@ -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;
-  }
-}
@@ -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 = ?");
-  }
-}
@@ -49,7 +49,7 @@ public class TestAggregationCount extends BaseTestCase {
    List<TEventOne> list = query.findList();

    String sql = sqlOf(query, 5);
-    assertThat(sql).contains("select t0.id, t0.name, t0.status, t0.event_id, t0.version from tevent_one t0");
+    assertThat(sql).contains("select t0.id, t0.name, t0.status, t0.version, t0.event_id from tevent_one t0");

    for (TEventOne eventOne : list) {
      // lazy loading on Aggregation properties
@@ -81,7 +81,7 @@ class PostgresReadOnlyDatabaseTest {
  }

  private static Database setupReadOnlyDatabase() {
-    PostgresContainer.builder("17")
+    PostgresContainer.builder("15")
      .dbName("readonly_test")
      .build()
      .start();
@@ -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.1'
-git tag 16.1.1
+git commit -am 'Version 16.0.0'
+git tag 16.0.0
 git push --tags

 ## convert to javax
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</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.1</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.1</version>
+      <version>16.0.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.1.1</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>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.1.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

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

  <artifactId>platforms</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>16.1.1</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.1</version>
+      <version>16.0.0</version>
    </dependency>

  </dependencies>
--- a/Show More
+++ b/Show More