Version 13.23.2-jakarta

Bump ebean-agent to 13.23.2
Merge pull request #3256 from ebean-orm/feature/upgrade-antlr4-4_13_1
2024-04-21 10:51:47 +00:00 · 2023-10-27 22:13:05 +13:00 · 2023-10-27 22:10:40 +13:00 · 2023-10-27 21:45:37 +13:00 · 2023-10-26 13:52:44 +13:00 · 2023-10-25 22:12:49 +13:00
1597 changed files with 9624 additions and 5563 deletions
@@ -16,7 +16,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [11, 17]
+        java_version: [11, 17, 21]
        os: [ubuntu-latest]

    steps:
@@ -34,6 +34,8 @@ jobs:
        path:
          ~/.m2
        key: build-${{ env.cache-name }}
+    - name: Maven version
+      run: mvn --version
    - name: Build with Maven
      run: mvn package

@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-clickhouse</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-cockroach</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-db2</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-h2</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-hana</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-mariadb</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-mysql</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-nuodb</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-oracle</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
+  <name>ebean-postgis</name>
+  <description>ebean-postgis composite</description>
+  <artifactId>ebean-postgis</artifactId>
+
+  <properties>
+    <postgis.jdbc.version>2.5.1</postgis.jdbc.version>
+    <postgres.jdbc.version>42.6.0</postgres.jdbc.version>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>${ebean-migration.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-postgis-types</artifactId>
+      <version>13.23.2-jakarta</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgres.jdbc.version}</version>
+      <exclusions>
+        <!-- exclude unnecessary checker framework -->
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>net.postgis</groupId>
+      <artifactId>postgis-jdbc</artifactId>
+      <version>${postgis.jdbc.version}</version>
+    </dependency>
+
+  </dependencies>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.postgis.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,10 @@
+module io.ebean.postgis {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.postgres;
+  // requires transitive io.ebean.postgis.types;
+
+}
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-postgres</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-sqlite</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-sqlserver</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean-yugabyte</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -41,13 +42,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -2,9 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>composites</artifactId>
+    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
+    <relativePath>../..</relativePath>
  </parent>

  <name>ebean (all platforms)</name>
@@ -16,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -40,7 +41,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -59,13 +60,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
  </parent>

  <artifactId>composites</artifactId>
@@ -23,6 +23,7 @@
    <module>ebean-nuodb</module>
    <module>ebean-oracle</module>
    <module>ebean-postgres</module>
+    <module>ebean-postgis</module>
 <!--    <module>sqlanywhere</module>-->
    <module>ebean-sqlite</module>
    <module>ebean-sqlserver</module>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
  </parent>

  <name>ebean api</name>
@@ -39,12 +39,12 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>avaje-config</artifactId>
-      <version>3.4</version>
+      <version>3.9</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
-      <artifactId>persistence-api</artifactId>
+      <artifactId>jakarta-persistence-api</artifactId>
      <version>${ebean-persistence-api.version}</version>
    </dependency>

@@ -90,29 +90,22 @@
      <optional>true</optional>
    </dependency>

-    <!-- JAVAX-DEPENDENCY-START -->
+    <!-- JAVAX-DEPENDENCY-START ___
    <dependency>
      <groupId>javax.servlet</groupId>
      <artifactId>javax.servlet-api</artifactId>
      <version>3.1.0</version>
      <optional>true</optional>
    </dependency>
-    <!-- JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START ___
+    ____ JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START -->
    <dependency>
      <groupId>jakarta.servlet</groupId>
      <artifactId>jakarta.servlet-api</artifactId>
      <version>6.0.0</version>
      <optional>true</optional>
    </dependency>
-    ____ JAKARTA-DEPENDENCY-END -->
-
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
+    <!-- JAKARTA-DEPENDENCY-END -->

  </dependencies>

@@ -1,6 +1,6 @@
 package io.ebean;

-import javax.persistence.PessimisticLockException;
+import jakarta.persistence.PessimisticLockException;

 /**
 * Thrown when failing to acquire a pessimistic lock.
@@ -7,8 +7,8 @@ import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
 import io.ebean.text.json.JsonContext;

-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -267,15 +267,21 @@ public final class DB {
  }

  /**
+   * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
+   * <p>
   * Commit the current transaction.
   */
+  @Deprecated(forRemoval = true)
  public static void commitTransaction() {
    getDefault().commitTransaction();
  }

  /**
+   * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
+   * <p>
   * Rollback the current transaction.
   */
+  @Deprecated(forRemoval = true)
  public static void rollbackTransaction() {
    getDefault().rollbackTransaction();
  }
@@ -0,0 +1,49 @@
+package io.ebean;
+
+import io.ebean.service.SpiInTuples;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Default implementation of SpiInTuples.
+ */
+final class DInTuples implements SpiInTuples {
+
+  private final String[] properties;
+  private final int propertyCount;
+  private final List<Object[]> entries = new ArrayList<>();
+
+
+  DInTuples(String[] properties) {
+    this.properties = properties;
+    this.propertyCount = properties.length;
+  }
+
+  @Override
+  public InTuples add(Object... values) {
+    if (values.length != propertyCount) {
+      throw new IllegalArgumentException("Require " + propertyCount + " values but got " + values.length);
+    }
+    entries.add(values);
+    return this;
+  }
+
+  /**
+   * Return the first property name.
+   */
+  @Override
+  public String[] properties() {
+    return properties;
+  }
+
+  /**
+   * Return all the value pairs.
+   */
+  @Override
+  public List<Object[]> entries() {
+    return Collections.unmodifiableList(entries);
+  }
+
+}
@@ -1,6 +1,6 @@
 package io.ebean;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;

 /**
 * Thrown when a foreign key constraint is enforced.
@@ -11,8 +11,8 @@ import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.json.JsonContext;

-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.util.Collection;
 import java.util.List;
@@ -650,13 +650,19 @@ public interface Database {
  void flush();

  /**
+   * Deprecated for removal migrate using try-with-resources and commit on the transaction itself.
+   * <p>
   * Commit the current transaction.
   */
+  @Deprecated(forRemoval = true)
  void commitTransaction();

  /**
+   * Deprecated for removal migrate to using try-with-resources and rollback on the transaction itself.
+   * <p>
   * Rollback the current transaction.
   */
+  @Deprecated(forRemoval = true)
  void rollbackTransaction();

  /**
@@ -5,7 +5,7 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.service.SpiContainer;
 import io.ebean.service.SpiContainerFactory;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.ServiceLoader;
@@ -3,7 +3,7 @@ package io.ebean;
 import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.datasource.DataSourceConfigurationException;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
@@ -38,12 +38,15 @@ final class DbContext {
        }
      }
    } catch (BeanNotEnhancedException e) {
+      String msg = "Bean is not enhanced? See https://ebean.io/docs/trouble-shooting#not-enhanced";
+      log.log(ERROR, msg, e);
      throw e;

    } catch (DataSourceConfigurationException e) {
      String msg = "Configuration error creating DataSource for the default Database." +
        " This typically means a missing application-test.yaml or missing ebean-test dependency." +
        " See https://ebean.io/docs/trouble-shooting#datasource";
+      log.log(ERROR, msg, e);
      throw new DataSourceConfigurationException(msg, e);

    } catch (Throwable e) {
@@ -205,4 +205,16 @@ public interface DtoQuery<T> extends CancelableQuery {
   * Use the explicit transaction to execute the query.
   */
  DtoQuery<T> usingTransaction(Transaction transaction);
+
+  /**
+   * Ensure that the master DataSource is used if there is a read only data source
+   * being used (that is using a read replica database potentially with replication lag).
+   * <p>
+   * When the database is configured with a read-only DataSource via
+   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
+   * by default when a query is run without an active transaction, it uses the read-only data
+   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
+   * against the master data source.
+   */
+  DtoQuery<T> usingMaster();
 }
@@ -36,6 +36,11 @@ import java.util.Map;
 */
 public interface ExpressionFactory {

+  /**
+   * Return a new ExpressionList.
+   */
+  <T> ExpressionList<T> expressionList();
+
  /**
   * Path exists - for the given path in a JSON document.
   */
@@ -369,6 +374,11 @@ public interface ExpressionFactory {
   */
  Expression inPairs(Pairs pairs);

+  /**
+   * In expression using multiple columns.
+   */
+  Expression inTuples(InTuples pairs);
+
  /**
   * In - property has a value in the array of values.
   */
@@ -4,7 +4,7 @@ import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
 import io.ebean.search.*;

-import javax.persistence.NonUniqueResultException;
+import jakarta.persistence.NonUniqueResultException;
 import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.*;
@@ -56,7 +56,7 @@ public interface ExpressionList<T> {
  /**
   * Deprecated migrate to {@link #orderBy(String)}
   */
-  @Deprecated(since = "13.19")
+  @Deprecated(since = "13.19", forRemoval = true)
  default ExpressionList<T> order(String orderByClause) {
    return orderBy(orderByClause);
  }
@@ -74,7 +74,7 @@ public interface ExpressionList<T> {
  /**
   * Deprecated migrate to orderBy().
   */
-  @Deprecated
+  @Deprecated(forRemoval = true)
  default OrderBy<T> order() {
    return orderBy();
  }
@@ -508,6 +508,8 @@ public interface ExpressionList<T> {
  ExpressionList<T> filterMany(String manyProperty);

  /**
+   * Deprecated for removal - migrate to filterManyRaw()
+   * <p>
   * Add filter expressions to the many property.
   *
   * <pre>{@code
@@ -524,8 +526,29 @@ public interface ExpressionList<T> {
   * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
   * @param params       Bind parameters used in the expressions
   */
+  @Deprecated(forRemoval = true)
  ExpressionList<T> filterMany(String manyProperty, String expressions, Object... params);

+  /**
+   * Add filter expressions for the many path. The expressions can include SQL functions if
+   * desired and the property names are translated to column names.
+   * <p>
+   * The expressions can contain placeholders for bind values using <code>?</code> or <code>?1</code> style.
+   *
+   * <pre>{@code
+   *
+   *     new QCustomer()
+   *       .name.startsWith("Postgres")
+   *       .contacts.filterManyRaw("status = ? and firstName like ?", Contact.Status.NEW, "Rob%")
+   *       .findList();
+   *
+   * }</pre>
+   *
+   * @param rawExpressions The raw expressions which can include ? and ?1 style bind parameter placeholders
+   * @param params The parameter values to bind
+   */
+  ExpressionList<T> filterManyRaw(String manyProperty, String rawExpressions, Object... params);
+
  /**
   * Specify specific properties to fetch on the main/root bean (aka partial
   * object).
@@ -1131,6 +1154,11 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> inPairs(Pairs pairs);

+  /**
+   * In expression using multiple columns.
+   */
+  ExpressionList<T> inTuples(InTuples pairs);
+
  /**
   * EXISTS a raw SQL SubQuery.
   *
@@ -1,6 +1,6 @@
 package io.ebean;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.List;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -0,0 +1,36 @@
+package io.ebean;
+
+/**
+ * IN expression using multiple columns.
+ * <p>
+ * Currently this is not supported with SQLServer or DB2.
+ * <p>
+ * Produces SQL expression in the form of (A,B,C) IN ((a0,b0,c0), (a1,b1,c1), ... )
+ * where A,B,C are the properties in the tuples.
+ */
+public interface InTuples {
+
+  /**
+   * Create given the properties in the tuples.
+   */
+  static InTuples of(String... properties) {
+    return new DInTuples(properties);
+  }
+
+  /**
+   * Create given the properties in the tuples.
+   */
+  static InTuples of(Query.Property<?>... properties) {
+    String[] props = new String[properties.length];
+    for (int i = 0; i < properties.length; i++) {
+      props[i] = properties[i].toString();
+    }
+    return new DInTuples(props);
+  }
+
+  /**
+   * Add a tuple entry. All values must be non-null.
+   */
+  InTuples add(Object... values);
+
+}
@@ -0,0 +1,42 @@
+package io.ebean;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Helper methods for Lists.
+ */
+public final class Lists {
+
+  private Lists() {
+  }
+
+  /**
+   * Partition the source List into sub-lists with a maximum size.
+   * <p>
+   * The sub-lists will all be the max size except for the last sub-list
+   * which can potentially be smaller.
+   *
+   * @param source The source list
+   * @param max    The max size of each partition
+   * @param <T>    The list element type
+   * @return List of sub-list partitions
+   */
+  public static <T> List<List<T>> partition(List<T> source, int max) {
+    final int totalCount = source.size();
+    if (totalCount == 0) {
+      return Collections.emptyList();
+    } else if (totalCount <= max) {
+      return List.of(source);
+    }
+    final int numOfPartitions = (totalCount + max - 1) / max;  // round up
+    final var dest = new ArrayList<List<T>>(numOfPartitions);
+    for (int i = 0; i < numOfPartitions; i++) {
+      final int from = i * max;
+      final int to = Math.min(from + max, totalCount);
+      dest.add(source.subList(from, to));
+    }
+    return dest;
+  }
+}
@@ -333,10 +333,10 @@ public class OrderBy<T> implements Serializable {
          sb.append(property);
        }
        if (!ascending) {
-          sb.append(" ").append("desc");
+          sb.append(' ').append("desc");
        }
        if (nulls != null) {
-          sb.append(" ").append(nulls).append(" ").append(highLow);
+          sb.append(' ').append(nulls).append(' ').append(highLow);
        }
        return sb.toString();
      }
@@ -1,6 +1,6 @@
 package io.ebean;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;

 /**
 * Captures and wraps IOException's occurring during ElasticSearch processing etc.
@@ -3,13 +3,15 @@ package io.ebean;
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;

-import javax.persistence.NonUniqueResultException;
+import jakarta.persistence.NonUniqueResultException;
+import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
@@ -670,6 +672,16 @@ public interface Query<T> extends CancelableQuery {
   */
  Query<T> apply(FetchPath fetchPath);

+  /**
+   * Apply changes to the query conditional on the supplied predicate.
+   * <p>
+   * Typically, the changes are extra predicates etc.
+   *
+   * @param predicate The predicate which when true the changes are applied
+   * @param apply The changes to apply to the query
+   */
+  Query<T> alsoIf(BooleanSupplier predicate, Consumer<Query<T>> apply);
+
  /**
   * Execute the query using the given transaction.
   */
@@ -685,6 +697,18 @@ public interface Query<T> extends CancelableQuery {
   */
  Query<T> usingDatabase(Database database);

+  /**
+   * Ensure that the master DataSource is used if there is a read only data source
+   * being used (that is using a read replica database potentially with replication lag).
+   * <p>
+   * When the database is configured with a read-only DataSource via
+   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
+   * by default when a query is run without an active transaction, it uses the read-only data
+   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
+   * against the master data source.
+   */
+  Query<T> usingMaster();
+
  /**
   * Execute the query returning the list of Id's.
   * <p>
@@ -1374,7 +1398,7 @@ public interface Query<T> extends CancelableQuery {
  /**
   * Deprecated migrate to orderBy().
   */
-  @Deprecated(since = "13.19")
+  @Deprecated(since = "13.19", forRemoval = true)
  default Query<T> order(String orderByClause) {
    return orderBy(orderByClause);
  }
@@ -1393,7 +1417,7 @@ public interface Query<T> extends CancelableQuery {
  /**
   * Deprecated migrate to orderBy().
   */
-  @Deprecated(since = "13.19")
+  @Deprecated(since = "13.19", forRemoval = true)
  default OrderBy<T> order() {
    return orderBy();
  }
@@ -1406,7 +1430,7 @@ public interface Query<T> extends CancelableQuery {
  /**
   * Deprecated migrate to setOrderBy().
   */
-  @Deprecated(since = "13.19")
+  @Deprecated(since = "13.19", forRemoval = true)
  default Query<T> setOrder(OrderBy<T> orderBy) {
    return setOrderBy(orderBy);
  }
@@ -1,6 +1,6 @@
 package io.ebean;

-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;

 /**
 * Thrown at SERIALIZABLE isolation level for non-recoverable concurrent conflict.
@@ -45,6 +45,18 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   */
  SqlQuery usingTransaction(Transaction transaction);

+  /**
+   * Ensure that the master DataSource is used if there is a read only data source
+   * being used (that is using a read replica database potentially with replication lag).
+   * <p>
+   * When the database is configured with a read-only DataSource via
+   * say {@link io.ebean.config.DatabaseConfig#setReadOnlyDataSource(DataSource)} then
+   * by default when a query is run without an active transaction, it uses the read-only data
+   * source. We we use {@code usingMaster()} to instead ensure that the query is executed
+   * against the master data source.
+   */
+  SqlQuery usingMaster();
+
  /**
   * Execute the query returning a list.
   */
@@ -9,7 +9,6 @@ import java.util.Collection;
 * <p>
 * This is currently deemed to be experimental and subject to change.
 */
-@Deprecated(since = "experimental")
 public final class StdOperators {

  // ---- Functions ---- //
@@ -77,9 +76,9 @@ public final class StdOperators {
    StringBuilder expression = new StringBuilder(50);
    expression.append("concat(").append(property.toString());
    for (Object value : values) {
-      expression.append(",").append(sqlConcatString(value));
+      expression.append(',').append(sqlConcatString(value));
    }
-    expression.append(")");
+    expression.append(')');
    return Property.of(expression.toString());
  }

@@ -5,7 +5,7 @@ import io.ebean.annotation.PersistBatch;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DocStoreConfig;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Connection;

 /**
@@ -4,8 +4,8 @@ import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.ValuePair;

-import javax.persistence.EntityNotFoundException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -45,7 +45,7 @@ public final class ToStringBuilder {
      id.putIfAbsent(bean, 0);
    }
    if (counter <= MAX) {
-      sb.append(bean.getClass().getSimpleName()).append("@").append(counter).append("(");
+      sb.append(bean.getClass().getSimpleName()).append('@').append(counter).append('(');
    }
  }

@@ -77,7 +77,7 @@ public final class ToStringBuilder {
   */
  public void end() {
    if (counter <= MAX) {
-      sb.append(")");
+      sb.append(')');
    }
  }

@@ -90,7 +90,7 @@ public final class ToStringBuilder {
    } else {
      sb.append(", ");
    }
-    sb.append(name).append(":");
+    sb.append(name).append(':');
  }

  private void value(Object value) {
@@ -125,20 +125,20 @@ public final class ToStringBuilder {
      sb.append("{}");
    } else {
      boolean firstElement = true;
-      sb.append("{");
+      sb.append('{');
      for (Map.Entry<?, ?> entry : map.entrySet()) {
        if (firstElement) {
          firstElement = false;
        } else {
          sb.append(", ");
        }
-        sb.append(entry.getKey()).append(":");
+        sb.append(entry.getKey()).append(':');
        value(entry.getValue());
        if (counter > MAX) {
          return;
        }
      }
-      sb.append("}");
+      sb.append('}');
    }
  }

@@ -151,7 +151,7 @@ public final class ToStringBuilder {
      return;
    }
    boolean firstElement = true;
-    sb.append("[");
+    sb.append('[');
    for (Object o : c) {
      if (firstElement) {
        firstElement = false;
@@ -163,7 +163,7 @@ public final class ToStringBuilder {
        return;
      }
    }
-    sb.append("]");
+    sb.append(']');
  }

  private boolean push(Object bean) {
@@ -178,7 +178,7 @@ public final class ToStringBuilder {
    Integer idx = id.putIfAbsent(bean, counter++);
    if (idx != null) {
      --counter;
-      sb.append(bean.getClass().getSimpleName()).append("@").append(idx);
+      sb.append(bean.getClass().getSimpleName()).append('@').append(idx);
      return false;
    }
    first = true;
@@ -69,7 +69,7 @@ public class TenantAwareKey {
    public String toString() {
      StringBuilder sb = new StringBuilder(key.toString());
      if (tenantId != null) {
-        sb.append(":").append(tenantId);
+        sb.append(':').append(tenantId);
      }
      return sb.toString();
    }
@@ -119,7 +119,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
    try {
      if (set == null) {
        if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(true);
+          lazyLoadCollection(false);
        } else {
          set = new LinkedHashSet<>();
        }
@@ -136,7 +136,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
        if (disableLazyLoad) {
          set = new LinkedHashSet<>();
        } else {
-          lazyLoadCollection(true);
+          lazyLoadCollection(false);
        }
      }
    } finally {
@@ -3,9 +3,9 @@ package io.ebean.config;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.util.AnnotationUtil;

-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Inheritance;
-import javax.persistence.Table;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.Table;

 import static io.ebean.util.StringHelper.isNull;

@@ -228,7 +228,7 @@ public abstract class AbstractNamingConvention implements NamingConvention {
  public TableName getM2MJoinTableName(TableName lhsTable, TableName rhsTable) {
    StringBuilder buffer = new StringBuilder();
    buffer.append(unQuote(lhsTable.getName()));
-    buffer.append("_");
+    buffer.append('_');

    String rhsTableName = unQuote(rhsTable.getName());
    if (rhsTableName.indexOf('_') < rhsPrefixLength) {
@@ -271,10 +271,10 @@ public abstract class AbstractNamingConvention implements NamingConvention {
  public String getTableName(String catalog, String schema, String name) {
    StringBuilder sb = new StringBuilder();
    if (!isNull(catalog)) {
-      sb.append(quoteIdentifiers(catalog)).append(".");
+      sb.append(quoteIdentifiers(catalog)).append('.');
    }
    if (!isNull(schema)) {
-      sb.append(quoteIdentifiers(schema)).append(".");
+      sb.append(quoteIdentifiers(schema)).append('.');
    }
    return sb.append(quoteIdentifiers(name)).toString();
  }
@@ -19,7 +19,7 @@ import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetricNamingMatch;
 import io.ebean.util.StringHelper;

-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
 import javax.sql.DataSource;
 import java.time.Clock;
 import java.time.ZonedDateTime;
@@ -2376,7 +2376,7 @@ public class DatabaseConfig {
   * Sorry if returning Set rather than List breaks code but it feels safer to
   * do that than a subtle change to return a shallow copy which you will not detect.
   */
-  @Deprecated
+  @Deprecated(forRemoval = true)
  public Set<Class<?>> getClasses() {
    return classes;
  }
@@ -3389,7 +3389,7 @@ public class DatabaseConfig {
  /**
   * Deprecated - migrate to isLoadModuleInfo().
   */
-  @Deprecated
+  @Deprecated(forRemoval = true)
  public boolean isAutoLoadModuleInfo() {
    return loadModuleInfo;
  }
@@ -135,12 +135,12 @@ public class DbConstraintNaming {
   */
  protected String joinColumnNames(String[] columns) {
    if (columns.length == 1) {
-      return normaliseColumn(columns[0]);
+      return normaliseColumn(columns[0]).replace(" ", "_");
    }
    StringBuilder sb = new StringBuilder();
    for (int i = 0; i < columns.length; i++) {
      if (i > 0) {
-        sb.append("_");
+        sb.append('_');
      }
      sb.append(normaliseColumn(columns[i]));
    }
@@ -1,7 +1,7 @@
 package io.ebean.config;

 /**
- * Matches the functionality of javax.persistence.AttributeConverter
+ * Matches the functionality of jakarta.persistence.AttributeConverter
 * <p>
 * In general AttributeConverter should be used in preference to this
 * ScalarTypeConverter as it is JPA standard and offers the same functionality.
@@ -117,12 +117,12 @@ public final class TableName {
    // Add schema
    if (schema != null) {
      if (buffer.length() > 0) {
-        buffer.append(".");
+        buffer.append('.');
      }
      buffer.append(schema);
    }
    if (buffer.length() > 0) {
-      buffer.append(".");
+      buffer.append('.');
    }
    return buffer.append(name).toString();
  }
@@ -23,11 +23,11 @@ public class BasicSqlLimitOffset implements BasicSqlLimiter {
    sb.append(dbSql);

    if (maxRows > 0) {
-      sb.append(" ").append(LIMIT);
-      sb.append(" ").append(maxRows);
+      sb.append(' ').append(LIMIT);
+      sb.append(' ').append(maxRows);
    }
    if (firstRow > 0) {
-      sb.append(" ").append(OFFSET).append(" ");
+      sb.append(' ').append(OFFSET).append(' ');
      sb.append(firstRow);
    }
    return sb.toString();
@@ -9,7 +9,7 @@ import io.ebean.config.CustomDbTypeMapping;
 import io.ebean.config.PlatformConfig;
 import io.ebean.util.JdbcClose;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.*;

@@ -5,7 +5,7 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -3,7 +3,7 @@ package io.ebean.config.dbplatform;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -5,7 +5,7 @@ import io.ebean.DataIntegrityException;
 import io.ebean.DuplicateKeyException;
 import io.ebean.SerializableConflictException;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.Map;
@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;

 /**
@@ -1,8 +1,11 @@
 package io.ebean.event;

-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextEvent;

 /**
+ * Deprecated for removal - no intention to replace. Create your own copy of this
+ * ServletContextListener if needed for your application.
+ * <p>
 * Listens for webserver server starting and stopping events.
 * <p>
 * This should be used when the deployment is into a servlet container where the webapp
@@ -15,7 +18,8 @@ import javax.servlet.ServletContextEvent;
 * hook that Ebean registers.
 * </p>
 */
-public class ServletContextListener implements javax.servlet.ServletContextListener {
+@Deprecated(forRemoval = true)
+public class ServletContextListener implements jakarta.servlet.ServletContextListener {

  /**
   * The servlet container is stopping.
@@ -118,28 +118,28 @@ final class MetricsAsJson implements ServerMetricsAsJson {

  private void objStart() throws IOException {
    objKeyCounter = 0;
-    writer.append("{");
+    writer.append('{');
  }

  private void objEnd() throws IOException {
-    writer.append("}");
+    writer.append('}');
  }

  private void listStart() throws IOException {
    listCounter = 0;
-    writer.append("[");
+    writer.append('[');
    writer.append(newLine);
  }

  private void listEnd() throws IOException {
-    writer.append("]");
+    writer.append(']');
  }

  private void key(String key) throws IOException {
    if (objKeyCounter++ > 0) {
      writer.append(", ");
    }
-    writer.append("\"").append(key).append("\":");
+    writer.append('"').append(key).append("\":");
  }

  private void val(long count) throws IOException {
@@ -147,12 +147,12 @@ final class MetricsAsJson implements ServerMetricsAsJson {
  }

  private void val(String val) throws IOException {
-    writer.append("\"").append(val).append("\"");
+    writer.append('"').append(val).append('"');
  }

  private void metricStart(MetaMetric metric) throws IOException {
    if (listCounter++ > 0) {
-      writer.append(",").append(newLine);
+      writer.append(',').append(newLine);
    }
    objStart();
    key("name");
@@ -187,11 +187,22 @@ final class MetricsAsJson implements ServerMetricsAsJson {
    }
    if (isIncludeDetail(metric)) {
      append("loc", metric.location());
-      append("sql", metric.sql());
+      append("sql", escape(metric.sql()));
    }
    metricEnd();
  }

+  static String escape(String sql) {
+    return sql == null ? null : sql
+      .replace("\\", "\\\\")
+      .replace("\"", "\\\"")
+      .replace("\b", "\\b")
+      .replace("\f", "\\f")
+      .replace("\n", "\\n")
+      .replace("\r", "\\r")
+      .replace("\t", "\\t");
+  }
+
  private boolean isIncludeDetail(MetaTimedMetric metric) {
    return includeExtraAttributes == 2 || includeExtraAttributes == 1 && metric.initialCollection();
  }
@@ -0,0 +1,22 @@
+package io.ebean.service;
+
+import io.ebean.InTuples;
+
+import java.util.List;
+
+/**
+ * Internal extension to InTuples.
+ */
+public interface SpiInTuples extends InTuples {
+
+  /**
+   * Return the properties of the tuples.
+   */
+  String[] properties();
+
+  /**
+   * Return all the tuple entries.
+   */
+  List<Object[]> entries();
+
+}
@@ -1,91 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body {
-  background-color: #FFFFFF;
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10pt;
-}
-
-pre.code {
-  padding: 1em;
-  margin-left: 2em;
-  border: 1px solid #ccc;
-  background-color: #eee;
-}
-
-/* Headings */
-h1 {
-  font-size: 14pt
-}
-
-#overviewexamples h3 {
-  font-size: 10pt
-}
-
-/* Table colors */
-.TableHeadingColor {
-  background: #CCCCFF
-}
-
-/* Dark mauve */
-.TableSubHeadingColor {
-  background: #EEEEFF
-}
-
-/* Light mauve */
-.TableRowColor {
-  background: #FFFFFF
-}
-
-/* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont {
-  font-size: 12pt;
-  font-family: Helvetica, Arial, sans-serif
-}
-
-.FrameHeadingFont {
-  font-size: 10pt;
-  font-family: Helvetica, Arial, sans-serif
-}
-
-.FrameItemFont {
-  font-size: 10pt;
-  font-family: Helvetica, Arial, sans-serif
-}
-
-/* Navigation bar fonts and colors */
-.NavBarCell1 {
-  background-color: #EEEEFF;
-}
-
-/* Light mauve */
-.NavBarCell1Rev {
-  background-color: #00008B;
-}
-
-/* Dark Blue */
-.NavBarFont1 {
-  font-family: Arial, Helvetica, sans-serif;
-  color: #000000;
-}
-
-.NavBarFont1Rev {
-  font-family: Arial, Helvetica, sans-serif;
-  color: #FFFFFF;
-}
-
-.NavBarCell2 {
-  font-family: Arial, Helvetica, sans-serif;
-  background-color: #FFFFFF;
-}
-
-.NavBarCell3 {
-  font-family: Arial, Helvetica, sans-serif;
-  background-color: #FFFFFF;
-}
-
@@ -205,7 +205,7 @@ public class PathProperties implements FetchPath {
        sb.append(it.next());
        hasNext = it.hasNext();
        if (hasNext) {
-          sb.append(",");
+          sb.append(',');
        }
      }
      return sb.toString();
@@ -25,14 +25,14 @@ public final class CamelCaseHelper {
        lastUpper = i;
      } else if (Character.isDigit(c)) {
        if (i > lastUpper + 1 && !digitsCompressed) {
-          sb.append("_");
+          sb.append('_');
          lastUpper = i;
        }
        sb.append(c);

      } else if (Character.isUpperCase(c)) {
        if (i > lastUpper + 1) {
-          sb.append("_");
+          sb.append('_');
        }
        sb.append(Character.toLowerCase(c));
        lastUpper = i;
@@ -12,7 +12,7 @@ module io.ebean.api {
  requires transitive java.sql;
  requires transitive io.avaje.config;
  requires transitive io.avaje.lang;
-  requires transitive persistence.api;
+  requires transitive jakarta.persistence.api;
  requires transitive io.ebean.annotation;
  requires transitive io.ebean.datasource.api;
  requires transitive io.avaje.applog;
@@ -21,7 +21,7 @@ module io.ebean.api {
  requires static io.ebean.types;
  requires static com.fasterxml.jackson.core;
  requires static com.fasterxml.jackson.databind;
-  requires static javax.servlet.api;
+  requires static jakarta.servlet;

  exports io.ebean;
  exports io.ebean.bean;
@@ -0,0 +1,82 @@
+package io.ebean;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ListsTest {
+
+  @Test
+  void partition_empty() {
+    List<List<Integer>> partitions = Lists.partition(List.of(), 5);
+    assertThat(partitions).isEmpty();
+  }
+
+  @Test
+  void partition_lt() {
+    List<List<Integer>> partitions = Lists.partition(List.of(1, 2, 3, 4), 5);
+    assertThat(partitions).hasSize(1);
+    assertThat(partitions.get(0)).hasSize(4);
+  }
+
+  @Test
+  void partition_eq() {
+    List<List<Integer>> partitions = Lists.partition(List.of(1, 2, 3, 4, 5), 5);
+    assertThat(partitions).hasSize(1);
+    assertThat(partitions.get(0)).hasSize(5);
+  }
+
+  @Test
+  void partition_gt() {
+    List<List<Integer>> partitions = Lists.partition(List.of(1, 2, 3, 4, 5, 6), 5);
+    assertThat(partitions).hasSize(2);
+    assertThat(partitions.get(0)).hasSize(5);
+    assertThat(partitions.get(1)).hasSize(1);
+    assertThat(partitions.get(0)).containsExactly(1, 2, 3, 4, 5);
+    assertThat(partitions.get(1)).containsExactly(6);
+  }
+
+  @Test
+  void partition_gt1_letters() {
+    var partitions = Lists.partition(List.of("a", "b", "c", "d"), 3);
+    assertThat(partitions).hasSize(2);
+    assertThat(partitions.get(0)).hasSize(3);
+    assertThat(partitions.get(1)).hasSize(1);
+    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
+    assertThat(partitions.get(1)).containsExactly("d");
+  }
+
+  @Test
+  void partition_gt1a_letters() {
+    var partitions = Lists.partition(List.of("a", "b", "c", "d", "e"), 3);
+    assertThat(partitions).hasSize(2);
+    assertThat(partitions.get(0)).hasSize(3);
+    assertThat(partitions.get(1)).hasSize(2);
+    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
+    assertThat(partitions.get(1)).containsExactly("d", "e");
+  }
+
+  @Test
+  void partition_eq2_letters() {
+    var partitions = Lists.partition(List.of("a", "b", "c", "d", "e", "f"), 3);
+    assertThat(partitions).hasSize(2);
+    assertThat(partitions.get(0)).hasSize(3);
+    assertThat(partitions.get(1)).hasSize(3);
+    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
+    assertThat(partitions.get(1)).containsExactly("d", "e", "f");
+  }
+
+  @Test
+  void partition_gt2_letters() {
+    var partitions = Lists.partition(List.of("a", "b", "c", "d", "e", "f", "g"), 3);
+    assertThat(partitions).hasSize(3);
+    assertThat(partitions.get(0)).hasSize(3);
+    assertThat(partitions.get(1)).hasSize(3);
+    assertThat(partitions.get(2)).hasSize(1);
+    assertThat(partitions.get(0)).containsExactly("a", "b", "c");
+    assertThat(partitions.get(1)).containsExactly("d", "e", "f");
+    assertThat(partitions.get(2)).containsExactly("g");
+  }
+}
@@ -0,0 +1,25 @@
+package io.ebean.meta;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class MetricsAsJsonTest {
+
+  @Test
+  void trimIt() {
+    assertThat(MetricsAsJson.escape(null)).isNull();
+    assertThat(MetricsAsJson.escape("abc")).isEqualTo("abc");
+  }
+
+  @Test
+  void escape() {
+    assertThat(MetricsAsJson.escape("a\"bc")).isEqualTo("a\\\"bc");
+    assertThat(MetricsAsJson.escape("a\tbc")).isEqualTo("a\\tbc");
+    assertThat(MetricsAsJson.escape("a\bbc")).isEqualTo("a\\bbc");
+    assertThat(MetricsAsJson.escape("a\bc")).isEqualTo("a\\bc");
+    assertThat(MetricsAsJson.escape("a\rbc")).isEqualTo("a\\rbc");
+    assertThat(MetricsAsJson.escape("a\nbc")).isEqualTo("a\\nbc");
+    assertThat(MetricsAsJson.escape("a\\bc")).isEqualTo("a\\\\bc");
+  }
+}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
  </parent>

  <name>ebean bom</name>
@@ -20,7 +20,7 @@

      <dependency>
        <groupId>io.ebean</groupId>
-        <artifactId>persistence-api</artifactId>
+        <artifactId>jakarta-persistence-api</artifactId>
        <version>${ebean-persistence-api.version}</version>
      </dependency>

@@ -89,25 +89,25 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
@@ -125,13 +125,13 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
@@ -155,46 +155,37 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>13.20.0</version>
-        <scope>provided</scope>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.20.0</version>
-        <scope>provided</scope>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>13.20.0</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>io.ebean</groupId>
-        <artifactId>ebean-postgis</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <!-- platforms -->
@@ -202,67 +193,79 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-clickhouse</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-postgis</artifactId>
+        <version>13.23.2-jakarta</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-postgis-types</artifactId>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>13.20.0</version>
+        <version>13.23.2-jakarta</version>
      </dependency>

    </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
  </parent>

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -30,17 +30,10 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.4.3</version>
+      <version>42.6.0</version>
      <optional>true</optional>
    </dependency>

-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-
  </dependencies>

 </project>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.20.0</version>
+    <version>13.23.2-jakarta</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -46,7 +46,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
    </dependency>

    <dependency>
@@ -58,7 +58,7 @@
    <dependency>
      <groupId>org.antlr</groupId>
      <artifactId>antlr4-runtime</artifactId>
-      <version>4.8-1</version>
+      <version>4.13.1</version>
    </dependency>

    <!--
@@ -81,15 +81,15 @@
      <scope>provided</scope>
    </dependency>

-    <!-- JAVAX-DEPENDENCY-START -->
+    <!-- JAVAX-DEPENDENCY-START ___
    <dependency>
      <groupId>javax.transaction</groupId>
      <artifactId>javax.transaction-api</artifactId>
      <version>1.3</version>
      <optional>true</optional>
    </dependency>
-    <!-- JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START ___
+    ____ JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START -->
    <dependency>
      <groupId>jakarta.transaction</groupId>
      <artifactId>jakarta.transaction-api</artifactId>
@@ -102,7 +102,7 @@
      <version>4.0.1</version>
      <scope>provided</scope>
    </dependency>
-    ____ JAKARTA-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-END -->

    <!-- validation annotations Size etc -->
    <dependency>
@@ -151,7 +151,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.5.1</version>
+      <version>42.6.0</version>
      <optional>true</optional>
    </dependency>

@@ -159,21 +159,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.20.0</version>
+      <version>13.23.2-jakarta</version>
      <scope>test</scope>
    </dependency>

@@ -184,13 +184,6 @@
      <scope>test</scope>
    </dependency>

-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-
  </dependencies>

  <build>
@@ -73,13 +73,13 @@ public final class BindParams implements Serializable {
    for (Param param : positionedParameters) {
      tempBindCount = param.queryBindCount();
      bc += tempBindCount;
-      builder.append("p").append(bc).append(" ?:").append(tempBindCount).append(",");
+      builder.append('p').append(bc).append(" ?:").append(tempBindCount).append(',');
    }

    for (Map.Entry<String, Param> entry : namedParameters.entrySet()) {
      tempBindCount = entry.getValue().queryBindCount();
      bc += tempBindCount;
-      builder.append("n").append(bc).append(" k:").append(entry.getKey()).append(" ?:").append(tempBindCount).append(",");
+      builder.append('n').append(bc).append(" k:").append(entry.getKey()).append(" ?:").append(tempBindCount).append(',');
    }
  }

@@ -111,7 +111,12 @@ public final class LoadManyRequest extends LoadRequest {
    loadContext.configureQuery(query);
    if (onlyIds) {
      // lazy loading invoked via clear() and removeAll()
-      query.select(many.targetIdProperty());
+      String mapKey = many.mapKey();
+      if (mapKey != null) {
+        query.select(mapKey);
+      } else {
+        query.select(many.targetIdProperty());
+      }
    }
    return query;
  }
@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import io.ebeaninternal.server.util.ArrayStack;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;

 /**
 * Manage scoped (typically thread local) transactions.
@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;

 import io.ebean.CancelableQuery;

@@ -61,9 +61,4 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
   */
  SpiQuery<?> ormQuery();

-  /**
-   * Return the explicit transaction used to execute the query.
-   */
-  Transaction transaction();
-
 }
@@ -66,6 +66,11 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  CallOrigin createCallOrigin();

+  /**
+   * Override in order to return SpiQuery
+   */
+  <T> SpiQuery<T> createQuery(Class<T> beanType);
+
  /**
   * Return the PersistenceContextScope to use defined at query or server level.
   */
@@ -135,8 +140,9 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   * Create a ServerTransaction for query purposes.
   *
   * @param tenantId For multi-tenant lazy loading provide the tenantId to use.
+   * @param useMaster Set to true when the query should use the master data source.
   */
-  SpiTransaction createReadOnlyTransaction(Object tenantId);
+  SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster);

  /**
   * An event from another server in the cluster used to notify local
@@ -147,7 +153,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
  /**
   * Compile a query.
   */
-  <T> CQuery<T> compileQuery(Type type, Query<T> query, Transaction transaction);
+  <T> CQuery<T> compileQuery(Type type, SpiQuery<T> query, Transaction transaction);

  /**
   * Execute the findId's query but without copying the query.
@@ -156,12 +162,12 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   * the query has finished (if executing in a background thread).
   * </p>
   */
-  <A, T> List<A> findIdsWithCopy(Query<T> query, Transaction transaction);
+  <A, T> List<A> findIdsWithCopy(SpiQuery<T> query);

  /**
   * Execute the findCount query but without copying the query.
   */
-  <T> int findCountWithCopy(Query<T> query, Transaction transaction);
+  <T> int findCountWithCopy(SpiQuery<T> query);

  /**
   * Load a batch of Associated One Beans.
@@ -289,7 +295,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
  /**
   * Execute the underlying ORM query returning as a JDBC ResultSet to map to DTO beans.
   */
-  SpiResultSet findResultSet(SpiQuery<?> ormQuery, SpiTransaction transaction);
+  SpiResultSet findResultSet(SpiQuery<?> ormQuery);

  /**
   * Visit all the metrics (typically reporting them).
@@ -321,136 +327,57 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, BeanCollectio
   */
  SpiQueryBindCapture createQueryBindCapture(SpiQueryPlan queryPlan);

+  <T> boolean exists(SpiQuery<T> ormQuery);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> boolean exists(Query<T> ormQuery, Transaction transaction);
+  <T> int findCount(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> int findCount(Query<T> query, Transaction transaction);
+  <A, T> List<A> findIds(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <A, T> List<A> findIds(Query<T> query, Transaction transaction);
+  <T> QueryIterator<T> findIterate(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);
+  <T> Stream<T> findStream(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> Stream<T> findStream(Query<T> query, Transaction transaction);
+  <T> void findEach(SpiQuery<T> query, Consumer<T> consumer);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
+  <T> void findEach(SpiQuery<T> query, int batch, Consumer<List<T>> consumer);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction t);
+  <T> void findEachWhile(SpiQuery<T> query, Predicate<T> consumer);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction);
+  <T> List<Version<T>> findVersions(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);
+  <T> List<T> findList(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> List<T> findList(Query<T> query, Transaction transaction);
+  <T> FutureRowCount<T> findFutureCount(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);
+  <T> FutureIds<T> findFutureIds(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);
+  <T> FutureList<T> findFutureList(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);
+  <T> PagedList<T> findPagedList(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);
+  <T> Set<T> findSet(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> Set<T> findSet(Query<T> query, Transaction transaction);
+  <K, T> Map<K, T> findMap(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);
+  <A, T> List<A> findSingleAttributeList(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);
+  <A, T> Set<A> findSingleAttributeSet(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <A, T> Set<A> findSingleAttributeSet(Query<T> query, Transaction transaction);
-
-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
  @Nullable
-  <T> T findOne(Query<T> query, Transaction transaction);
+  <T> T findOne(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);
+  <T> Optional<T> findOneOrEmpty(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> int delete(Query<T> query, Transaction transaction);
+  <T> int delete(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  <T> int update(Query<T> query, Transaction transaction);
+  <T> int update(SpiQuery<T> query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  List<SqlRow> findList(SqlQuery query, Transaction transaction);
+  List<SqlRow> findList(SpiSqlQuery query);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  void findEach(SqlQuery query, Consumer<SqlRow> consumer, Transaction transaction);
+  void findEach(SpiSqlQuery query, Consumer<SqlRow> consumer);

-  /**
-   * Deprecated migrate to using {@link Query#usingTransaction(Transaction)}.
-   */
-  void findEachWhile(SqlQuery query, Predicate<SqlRow> consumer, Transaction transaction);
+  void findEachWhile(SpiSqlQuery query, Predicate<SqlRow> consumer);

-  /**
-   * Deprecated migrate to using {@link SqlQuery#usingTransaction(Transaction)}.
-   */
  @Nullable
-  SqlRow findOne(SqlQuery query, Transaction transaction);
+  SqlRow findOne(SpiSqlQuery query);
 }
@@ -36,6 +36,11 @@ public interface SpiExpressionRequest {
   */
  SpiExpressionRequest append(String expression);

+  /**
+   * Append to the expression sql without any parsing.
+   */
+  SpiExpressionRequest append(char c);
+
  /**
   * Append to the expression sql with logical property parsing to db columns with logical path prefix.
   * <p>
@@ -235,6 +235,16 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  String planLabel();

+  /**
+   * Return the transaction explicitly assigned or null.
+   */
+  SpiTransaction transaction();
+
+  /**
+   * Return true if this query should not use the read only data source.
+   */
+  boolean isUseMaster();
+
  /**
   * Return true if this is a "find by id" query. This includes a check for a single "equal to" expression for the Id.
   */
@@ -867,17 +877,6 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
   */
  boolean isDisableReadAudit();

-  /**
-   * Return true if this is a query executing in the background.
-   */
-  boolean isFutureFetch();
-
-  /**
-   * Set to true to indicate the query is executing in a background thread
-   * asynchronously.
-   */
-  void setFutureFetch(boolean futureFetch);
-
  /**
   * Set the readEvent for future queries (as prepared in foreground thread).
   */
@@ -1,10 +1,23 @@
 package io.ebeaninternal.api;

+import io.avaje.lang.Nullable;
+
 /**
 * SQL query binding (for SqlQuery and DtoQuery).
 */
 public interface SpiSqlBinding extends SpiCancelableQuery {

+  /**
+   * Return the transaction explicitly associated to the query.
+   */
+  @Nullable
+  SpiTransaction transaction();
+
+  /**
+   * Return true if this query should not use the read only data source.
+   */
+  boolean isUseMaster();
+
  /**
   * Return the named or positioned parameters.
   */
@@ -1,17 +1,10 @@
 package io.ebeaninternal.api;

-import io.avaje.lang.Nullable;
 import io.ebean.SqlQuery;
-import io.ebean.Transaction;

 /**
 * SQL query - Internal extension to SqlQuery.
 */
 public interface SpiSqlQuery extends SqlQuery, SpiSqlBinding {

-  /**
-   * Return the transaction explicitly associated to the query.
-   */
-  @Nullable
-  Transaction transaction();
 }
@@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
 import io.ebeanservice.docstore.api.DocStoreTransaction;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.SQLException;

@@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
 import io.ebeanservice.docstore.api.DocStoreTransaction;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.SQLException;

@@ -33,10 +33,10 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery {
  /**
   * Create the BeanFindRequest.
   */
-  AbstractSqlQueryRequest(SpiEbeanServer server, SpiSqlBinding query, Transaction t) {
+  AbstractSqlQueryRequest(SpiEbeanServer server, SpiSqlBinding query) {
    this.server = server;
    this.query = query;
-    this.transaction = (SpiTransaction) t;
+    this.transaction = query.transaction();
    this.query.setCancelableQuery(this);
  }

@@ -48,7 +48,7 @@ public abstract class AbstractSqlQueryRequest implements CancelableQuery {
      transaction = server.currentServerTransaction();
      if (transaction == null || !transaction.isActive()) {
        // create a local readOnly transaction
-        transaction = server.createReadOnlyTransaction(null);
+        transaction = server.createReadOnlyTransaction(null, query.isUseMaster());
        createdTransaction = true;
      }
    }
@@ -48,7 +48,7 @@ public abstract class BeanRequest {
   */
  public void commitTransIfRequired() {
    if (createdTransaction) {
-      server.commitTransaction();
+      transaction.commit();
    }
  }

@@ -7,7 +7,7 @@ import io.ebean.util.IOUtils;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.util.UrlHelper;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.io.*;
 import java.net.URL;
 import java.nio.file.Path;
@@ -6,7 +6,7 @@ import io.ebean.config.dbplatform.DatabasePlatformProvider;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.DbOffline;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;

-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.EntityNotFoundException;
 import java.util.List;

 import static java.lang.System.Logger.Level.DEBUG;
@@ -87,7 +87,7 @@ final class DefaultBeanLoader {
      query.setLoadDescription("+lazy", null);
    }

-    query.select(parentDesc.idBinder().getIdProperty());
+    query.select(parentDesc.idBinder().idSelect());
    if (onlyIds) {
      query.fetch(many.name(), many.targetIdProperty());
    } else {
@@ -106,7 +106,7 @@ final class DefaultBeanLoader {
      query.setReadOnly(true);
    }

-    server.findOne(query, null);
+    server.findOne(query);
    if (beanCollection != null) {
      if (beanCollection.checkEmptyLazyLoad()) {
        if (log.isLoggable(DEBUG)) {
@@ -127,6 +127,7 @@ final class DefaultBeanLoader {
      throw new RuntimeException("Nothing in batch?");
    }
    final SpiQuery<?> query = server.createQuery(loadRequest.beanType());
+    query.usingTransaction(loadRequest.transaction());
    loadRequest.configureQuery(query);
    loadRequest.postLoad(executeQuery(loadRequest, query));
  }
@@ -137,14 +138,15 @@ final class DefaultBeanLoader {
  private List<?> executeQuery(LoadRequest loadRequest, SpiQuery<?> query) {
    if (onIterateUseExtraTxn && loadRequest.isParentFindIterate()) {
      // MySql - we need a different transaction to execute the secondary query
-      SpiTransaction extraTxn = server.createReadOnlyTransaction(query.tenantId());
+      SpiTransaction extraTxn = server.createReadOnlyTransaction(query.tenantId(), query.isUseMaster());
      try {
-        return server.findList(query, extraTxn);
+        query.usingTransaction(extraTxn);
+        return server.findList(query);
      } finally {
        extraTxn.end();
      }
    } else {
-      return server.findList(query, loadRequest.transaction());
+      return server.findList(query);
    }
  }

@@ -13,7 +13,7 @@ import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -45,10 +45,10 @@ import io.ebeaninternal.util.ParamTypeHelper;
 import io.ebeaninternal.util.ParamTypeHelper.TypeInfo;
 import io.ebeanservice.docstore.api.DocStoreIntegration;

-import javax.persistence.EntityNotFoundException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -440,8 +440,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   * Compile a query. Only valid for ORM queries.
   */
  @Override
-  public <T> CQuery<T> compileQuery(Type type, Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest<T> qr = createQueryRequest(type, query, transaction);
+  public <T> CQuery<T> compileQuery(Type type, SpiQuery<T> query, Transaction transaction) {
+    query.usingTransaction(transaction);
+    SpiOrmQueryRequest<T> qr = createQueryRequest(type, query);
    OrmQueryRequest<T> orm = (OrmQueryRequest<T>) qr;
    return cqueryEngine.buildQuery(orm);
  }
@@ -903,8 +904,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public SpiResultSet findResultSet(SpiQuery<?> ormQuery, SpiTransaction transaction) {
-    SpiOrmQueryRequest<?> request = createQueryRequest(ormQuery.type(), ormQuery, transaction);
+  public SpiResultSet findResultSet(SpiQuery<?> ormQuery) {
+    SpiOrmQueryRequest<?> request = createQueryRequest(ormQuery.type(), ormQuery);
    request.initTransIfRequired();
    return request.findResultSet();
  }
@@ -935,24 +936,26 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  @Override
  public <T> T find(Class<T> beanType, Object id, @Nullable Transaction transaction) {
    Objects.requireNonNull(id);
-    Query<T> query = createQuery(beanType).setId(id);
-    return findId(query, transaction);
+    SpiQuery<T> query = createQuery(beanType);
+    query.usingTransaction(transaction);
+    query.setId(id);
+    return findId(query);
  }

-  <T> SpiOrmQueryRequest<T> createQueryRequest(Type type, Query<T> query, @Nullable Transaction transaction) {
-    SpiOrmQueryRequest<T> request = buildQueryRequest(type, query, transaction);
+  <T> SpiOrmQueryRequest<T> createQueryRequest(Type type, SpiQuery<T> query) {
+    SpiOrmQueryRequest<T> request = buildQueryRequest(type, query);
    request.prepareQuery();
    return request;
  }

-  <T> SpiOrmQueryRequest<T> buildQueryRequest(Type type, Query<T> query, @Nullable Transaction transaction) {
-    SpiQuery<T> spiQuery = (SpiQuery<T>) query;
-    spiQuery.setType(type);
-    spiQuery.checkNamedParameters();
-    return buildQueryRequest(spiQuery, transaction);
+  <T> SpiOrmQueryRequest<T> buildQueryRequest(Type type, SpiQuery<T> query) {
+    query.setType(type);
+    query.checkNamedParameters();
+    return buildQueryRequest(query);
  }

-  private <T> SpiOrmQueryRequest<T> buildQueryRequest(SpiQuery<T> query, @Nullable Transaction transaction) {
+  private <T> SpiOrmQueryRequest<T> buildQueryRequest(SpiQuery<T> query) {
+    SpiTransaction transaction = query.transaction();
    if (transaction == null) {
      transaction = currentServerTransaction();
    }
@@ -973,7 +976,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    if (query.parentNode() == null) {
      query.setOrigin(createCallOrigin());
    }
-    return new OrmQueryRequest<>(this, queryEngine, query, (SpiTransaction) transaction);
+    return new OrmQueryRequest<>(this, queryEngine, query, transaction);
  }

  /**
@@ -981,8 +984,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   */
  @Nullable
  @SuppressWarnings("unchecked")
-  private <T> T findIdCheckPersistenceContextAndCache(@Nullable Transaction transaction, SpiQuery<T> query, Object id) {
-    SpiTransaction t = (SpiTransaction) transaction;
+  private <T> T findIdCheckPersistenceContextAndCache(SpiQuery<T> query, Object id) {
+    SpiTransaction t = query.transaction();
    if (t == null) {
      t = currentServerTransaction();
    }
@@ -1028,18 +1031,17 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {

  @Nullable
  @SuppressWarnings("unchecked")
-  private <T> T findId(Query<T> query, @Nullable Transaction transaction) {
-    SpiQuery<T> spiQuery = (SpiQuery<T>) query;
-    spiQuery.setType(Type.BEAN);
-    if (SpiQuery.Mode.NORMAL == spiQuery.mode() && !spiQuery.isForceHitDatabase()) {
+  private <T> T findId(SpiQuery<T> query) {
+    query.setType(Type.BEAN);
+    if (SpiQuery.Mode.NORMAL == query.mode() && !query.isForceHitDatabase()) {
      // See if we can skip doing the fetch completely by getting the bean from the
      // persistence context or the bean cache
-      T bean = findIdCheckPersistenceContextAndCache(transaction, spiQuery, spiQuery.getId());
+      T bean = findIdCheckPersistenceContextAndCache(query, query.getId());
      if (bean != null) {
        return bean;
      }
    }
-    SpiOrmQueryRequest<T> request = buildQueryRequest(spiQuery, transaction);
+    SpiOrmQueryRequest<T> request = buildQueryRequest(query);
    request.prepareQuery();
    if (request.isUseDocStore()) {
      return docStore().find(request);
@@ -1053,23 +1055,19 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction) {
-    return Optional.ofNullable(findOne(query, transaction));
+  public <T> Optional<T> findOneOrEmpty(SpiQuery<T> query) {
+    return Optional.ofNullable(findOne(query));
  }

  @Nullable
  @Override
-  public <T> T findOne(Query<T> query, @Nullable Transaction transaction) {
-    SpiQuery<T> spiQuery = (SpiQuery<T>) query;
-    if (spiQuery.isFindById()) {
+  public <T> T findOne(SpiQuery<T> query) {
+    if (query.isFindById()) {
      // actually a find by Id query
-      return findId(query, transaction);
-    }
-    if (transaction == null) {
-      transaction = currentServerTransaction();
+      return findId(query);
    }
    // a query that is expected to return either 0 or 1 beans
-    List<T> list = findList(query, transaction, true);
+    List<T> list = findList(query, true);
    return extractUnique(list);
  }

@@ -1086,10 +1084,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {

  @Override
  @SuppressWarnings({"unchecked", "rawtypes"})
-  public <T> Set<T> findSet(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest request = buildQueryRequest(Type.SET, query, transaction);
+  public <T> Set<T> findSet(SpiQuery<T> query) {
+    SpiOrmQueryRequest request = buildQueryRequest(Type.SET, query);
    request.resetBeanCacheAutoMode(false);
-    if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) {
+    if (request.isGetAllFromBeanCache()) {
      // hit bean cache and got all results from cache
      return request.beanCacheHitsAsSet();
    }
@@ -1108,10 +1106,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {

  @Override
  @SuppressWarnings({"unchecked", "rawtypes"})
-  public <K, T> Map<K, T> findMap(Query<T> query, @Nullable Transaction transaction) {
-    SpiOrmQueryRequest request = buildQueryRequest(Type.MAP, query, transaction);
+  public <K, T> Map<K, T> findMap(SpiQuery<T> query) {
+    SpiOrmQueryRequest request = buildQueryRequest(Type.MAP, query);
    request.resetBeanCacheAutoMode(false);
-    if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) {
+    if (request.isGetAllFromBeanCache()) {
      // hit bean cache and got all results from cache
      return request.beanCacheHitsAsMap();
    }
@@ -1130,8 +1128,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {

  @Override
  @SuppressWarnings("unchecked")
-  public <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = buildQueryRequest(Type.ATTRIBUTE, query, transaction);
+  public <A, T> List<A> findSingleAttributeList(SpiQuery<T> query) {
+    SpiOrmQueryRequest<T> request = buildQueryRequest(Type.ATTRIBUTE, query);
    request.query().setSingleAttribute();
    request.prepareQuery();
    Object result = request.getFromQueryCache();
@@ -1148,8 +1146,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {

  @Override
  @SuppressWarnings("unchecked")
-  public <A, T> Set<A> findSingleAttributeSet(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = buildQueryRequest(Type.ATTRIBUTE_SET, query, transaction);
+  public <A, T> Set<A> findSingleAttributeSet(SpiQuery<T> query) {
+    SpiOrmQueryRequest<T> request = buildQueryRequest(Type.ATTRIBUTE_SET, query);
    request.query().setSingleAttribute();
    request.prepareQuery();
    Object result = request.getFromQueryCache();
@@ -1165,17 +1163,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> int findCount(Query<T> query, @Nullable Transaction transaction) {
-    SpiQuery<T> spiQuery = ((SpiQuery<T>) query);
-    if (!spiQuery.isDistinct()) {
-      spiQuery = spiQuery.copy();
+  public <T> int findCount(SpiQuery<T> query) {
+    if (!query.isDistinct()) {
+      query = query.copy();
    }
-    return findCountWithCopy(spiQuery, transaction);
+    return findCountWithCopy(query);
  }

  @Override
-  public <T> int findCountWithCopy(Query<T> query, @Nullable Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.COUNT, query, transaction);
+  public <T> int findCountWithCopy(SpiQuery<T> query) {
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.COUNT, query);
    Integer result = request.getFromQueryCache();
    if (result != null) {
      return result;
@@ -1190,13 +1187,17 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {

  @Override
  public boolean exists(Class<?> beanType, Object beanId, Transaction transaction) {
-    return !findIdsWithCopy(find(beanType).setId(beanId), transaction).isEmpty();
+    final DefaultOrmQuery<?> query = createQuery(beanType);
+    query.usingTransaction(transaction);
+    query.setId(beanId);
+    return !findIdsWithCopy(query).isEmpty();
  }

  @Override
-  public <T> boolean exists(Query<T> ormQuery, Transaction transaction) {
-    Query<T> ormQueryCopy = ormQuery.copy().setMaxRows(1);
-    SpiOrmQueryRequest<?> request = createQueryRequest(Type.EXISTS, ormQueryCopy, transaction);
+  public <T> boolean exists(SpiQuery<T> ormQuery) {
+    SpiQuery<T> ormQueryCopy = ormQuery.copy();
+    ormQueryCopy.setMaxRows(1);
+    SpiOrmQueryRequest<?> request = createQueryRequest(Type.EXISTS, ormQueryCopy);
    List<Object> ids = request.getFromQueryCache();
    if (ids != null) {
      return !ids.isEmpty();
@@ -1210,14 +1211,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <A, T> List<A> findIds(Query<T> query, Transaction transaction) {
-    return findIdsWithCopy(((SpiQuery<T>) query).copy(), transaction);
+  public <A, T> List<A> findIds(SpiQuery<T> query) {
+    return findIdsWithCopy(query.copy());
  }

  @SuppressWarnings("unchecked")
  @Override
-  public <A, T> List<A> findIdsWithCopy(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest<?> request = createQueryRequest(Type.ID_LIST, query, transaction);
+  public <A, T> List<A> findIdsWithCopy(SpiQuery<T> query) {
+    SpiOrmQueryRequest<?> request = createQueryRequest(Type.ID_LIST, query);
    Object result = request.getFromQueryCache();
    if (result != null) {
      if (Boolean.FALSE.equals(request.query().isReadOnly())) {
@@ -1235,8 +1236,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> int delete(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.DELETE, query, transaction);
+  public <T> int delete(SpiQuery<T> query) {
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.DELETE, query);
    try {
      request.initTransIfRequired();
      request.markNotQueryOnly();
@@ -1258,8 +1259,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> int update(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.UPDATE, query, transaction);
+  public <T> int update(SpiQuery<T> query) {
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.UPDATE, query);
    try {
      request.initTransIfRequired();
      request.markNotQueryOnly();
@@ -1270,29 +1271,44 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction) {
-    SpiQuery<T> copy = ((SpiQuery<T>) query).copy();
-    copy.setFutureFetch(true);
-    Transaction newTxn = createTransaction();
-    QueryFutureRowCount<T> queryFuture = new QueryFutureRowCount<>(new CallableQueryCount<>(this, copy, newTxn));
+  public <T> FutureRowCount<T> findFutureCount(SpiQuery<T> query) {
+    SpiQuery<T> copy = query.copy();
+    boolean createdTransaction = false;
+    SpiTransaction transaction = query.transaction();
+    if (transaction == null) {
+      transaction = currentServerTransaction();
+      if (transaction == null) {
+        transaction = (SpiTransaction) createTransaction();
+        createdTransaction = true;
+      }
+      copy.usingTransaction(transaction);
+    }
+    var queryFuture = new QueryFutureRowCount<>(new CallableQueryCount<>(this, copy, createdTransaction));
    backgroundExecutor.execute(queryFuture.futureTask());
    return queryFuture;
  }

  @Override
-  public <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction) {
-    SpiQuery<T> copy = ((SpiQuery<T>) query).copy();
-    copy.setFutureFetch(true);
-    Transaction newTxn = createTransaction();
-    QueryFutureIds<T> queryFuture = new QueryFutureIds<>(new CallableQueryIds<>(this, copy, newTxn));
+  public <T> FutureIds<T> findFutureIds(SpiQuery<T> query) {
+    SpiQuery<T> copy = query.copy();
+    boolean createdTransaction = false;
+    SpiTransaction transaction = query.transaction();
+    if (transaction == null) {
+      transaction = currentServerTransaction();
+      if (transaction == null) {
+        transaction = (SpiTransaction) createTransaction();
+        createdTransaction = true;
+      }
+      copy.usingTransaction(transaction);
+    }
+    QueryFutureIds<T> queryFuture = new QueryFutureIds<>(new CallableQueryIds<>(this, copy, createdTransaction));
    backgroundExecutor.execute(queryFuture.futureTask());
    return queryFuture;
  }

  @Override
-  public <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction) {
-    SpiQuery<T> spiQuery = (SpiQuery<T>) query.copy();
-    spiQuery.setFutureFetch(true);
+  public <T> FutureList<T> findFutureList(SpiQuery<T> query) {
+    SpiQuery<T> spiQuery = query.copy();
    // FutureList query always run in it's own persistence content
    spiQuery.setPersistenceContext(new DefaultPersistenceContext());
    if (!spiQuery.isDisableReadAudit()) {
@@ -1300,28 +1316,36 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
      desc.readAuditFutureList(spiQuery);
    }
    // Create a new transaction solely to execute the findList() at some future time
-    Transaction newTxn = createTransaction();
-    QueryFutureList<T> queryFuture = new QueryFutureList<>(new CallableQueryList<>(this, spiQuery, newTxn));
+    boolean createdTransaction = false;
+    SpiTransaction transaction = query.transaction();
+    if (transaction == null) {
+      transaction = currentServerTransaction();
+      if (transaction == null) {
+        transaction = (SpiTransaction) createTransaction();
+        createdTransaction = true;
+      }
+      spiQuery.usingTransaction(transaction);
+    }
+    QueryFutureList<T> queryFuture = new QueryFutureList<>(new CallableQueryList<>(this, spiQuery, createdTransaction));
    backgroundExecutor.execute(queryFuture.futureTask());
    return queryFuture;
  }

  @Override
-  public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction) {
-    SpiQuery<T> spiQuery = (SpiQuery<T>) query;
-    int maxRows = spiQuery.getMaxRows();
+  public <T> PagedList<T> findPagedList(SpiQuery<T> query) {
+    int maxRows = query.getMaxRows();
    if (maxRows == 0) {
      throw new PersistenceException("maxRows must be specified for findPagedList() query");
    }
-    if (spiQuery.isUseDocStore()) {
-      return docStore().findPagedList(createQueryRequest(Type.LIST, query, transaction));
+    if (query.isUseDocStore()) {
+      return docStore().findPagedList(createQueryRequest(Type.LIST, query));
    }
-    return new LimitOffsetPagedList<>(this, spiQuery);
+    return new LimitOffsetPagedList<>(this, query);
  }

  @Override
-  public <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, transaction);
+  public <T> QueryIterator<T> findIterate(SpiQuery<T> query) {
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query);
    try {
      request.initTransIfRequired();
      return request.findIterate();
@@ -1332,8 +1356,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> Stream<T> findStream(Query<T> query, Transaction transaction) {
-    return toStream(findIterate(query, transaction));
+  public <T> Stream<T> findStream(SpiQuery<T> query) {
+    return toStream(findIterate(query));
  }

  private <T> Stream<T> toStream(QueryIterator<T> queryIterator) {
@@ -1341,8 +1365,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, transaction);
+  public <T> void findEach(SpiQuery<T> query, Consumer<T> consumer) {
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query);
    if (request.isUseDocStore()) {
      docStore().findEach(request, consumer);
      return;
@@ -1353,8 +1377,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, transaction);
+  public <T> void findEach(SpiQuery<T> query, int batch, Consumer<List<T>> consumer) {
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query);
 //    if (request.isUseDocStore()) {
 //      docStore().findEach(request, consumer);
 //      return;
@@ -1365,8 +1389,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, transaction);
+  public <T> void findEachWhile(SpiQuery<T> query, Predicate<T> consumer) {
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query);
    if (request.isUseDocStore()) {
      docStore().findEachWhile(request, consumer);
      return;
@@ -1377,8 +1401,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> List<Version<T>> findVersions(Query<T> query, @Nullable Transaction transaction) {
-    SpiOrmQueryRequest<T> request = createQueryRequest(Type.LIST, query, transaction);
+  public <T> List<Version<T>> findVersions(SpiQuery<T> query) {
+    SpiOrmQueryRequest<T> request = createQueryRequest(Type.LIST, query);
    try {
      request.initTransIfRequired();
      return request.findVersions();
@@ -1388,15 +1412,15 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public <T> List<T> findList(Query<T> query, Transaction transaction) {
-    return findList(query, transaction, false);
+  public <T> List<T> findList(SpiQuery<T> query) {
+    return findList(query, false);
  }

  @SuppressWarnings("unchecked")
-  private <T> List<T> findList(Query<T> query, @Nullable Transaction transaction, boolean findOne) {
-    SpiOrmQueryRequest<T> request = buildQueryRequest(Type.LIST, query, transaction);
+  private <T> List<T> findList(SpiQuery<T> query, boolean findOne) {
+    SpiOrmQueryRequest<T> request = buildQueryRequest(Type.LIST, query);
    request.resetBeanCacheAutoMode(findOne);
-    if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) {
+    if (request.isGetAllFromBeanCache()) {
      // hit bean cache and got all results from cache
      return request.beanCacheHits();
    }
@@ -1418,16 +1442,16 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {

  @Nullable
  @Override
-  public SqlRow findOne(SqlQuery query, Transaction transaction) {
+  public SqlRow findOne(SpiSqlQuery query) {
    // no findId() method for SqlQuery...
    // a query that is expected to return either 0 or 1 rows
-    List<SqlRow> list = findList(query, transaction);
+    List<SqlRow> list = findList(query);
    return extractUnique(list);
  }

  @Override
-  public void findEach(SqlQuery query, Consumer<SqlRow> consumer, Transaction transaction) {
-    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, transaction);
+  public void findEach(SpiSqlQuery query, Consumer<SqlRow> consumer) {
+    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query);
    try {
      request.initTransIfRequired();
      request.findEach(consumer);
@@ -1437,8 +1461,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public void findEachWhile(SqlQuery query, Predicate<SqlRow> consumer, Transaction transaction) {
-    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, transaction);
+  public void findEachWhile(SpiSqlQuery query, Predicate<SqlRow> consumer) {
+    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query);
    try {
      request.initTransIfRequired();
      request.findEachWhile(consumer);
@@ -1448,8 +1472,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public List<SqlRow> findList(SqlQuery query, Transaction transaction) {
-    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, transaction);
+  public List<SqlRow> findList(SpiSqlQuery query) {
+    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query);
    try {
      request.initTransIfRequired();
      return request.findList();
@@ -1459,7 +1483,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  private <P> P executeSqlQuery(Function<RelationalQueryRequest, P> fun, SpiSqlQuery query) {
-    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, query.transaction());
+    RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query);
    try {
      request.initTransIfRequired();
      return fun.apply(request);
@@ -2123,8 +2147,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  }

  @Override
-  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
-    return transactionManager.createReadOnlyTransaction(tenantId);
+  public SpiTransaction createReadOnlyTransaction(Object tenantId, boolean useMaster) {
+    return transactionManager.createReadOnlyTransaction(tenantId, useMaster);
  }

  /**
@@ -2179,9 +2203,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    Object id = idProperty.getValue(entityBean);
    if (entityBean._ebean_getIntercept().isNew() && id != null) {
      // Primary Key is changeable only on new models - so skip check if we are not new
-      Query<?> query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory);
+      SpiQuery<?> query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory);
+      query.usingTransaction(transaction);
      query.setId(id);
-      if (findCount(query, transaction) > 0) {
+      if (findCount(query) > 0) {
        return Collections.singleton(idProperty);
      }
    }
@@ -2200,7 +2225,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
  @Nullable
  private Set<Property> checkUniqueness(EntityBean entityBean, BeanDescriptor<?> beanDesc, BeanProperty[] props, @Nullable Transaction transaction) {
    BeanProperty idProperty = beanDesc.idProperty();
-    Query<?> query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory);
+    SpiQuery<?> query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory);
+    query.usingTransaction(transaction);
    ExpressionList<?> exprList = query.where();
    if (!entityBean._ebean_getIntercept().isNew()) {
      // if model is not new, exclude ourself.
@@ -2213,7 +2239,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
      }
      exprList.eq(prop.name(), value);
    }
-    if (findCount(query, transaction) > 0) {
+    if (findCount(query) > 0) {
      Set<Property> ret = new LinkedHashSet<>();
      Collections.addAll(ret, props);
      return ret;
@@ -281,9 +281,9 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
    int offset = 0;
    for (Object val : values) {
      if (offset > 0) {
-        sqlExpand.append(",");
+        sqlExpand.append(',');
      }
-      sqlExpand.append("?");
+      sqlExpand.append('?');
      bindParams.setParameter(position + offset++, val);
    }
    bindExpansion += (offset - 1);
@@ -33,7 +33,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
  private DataReader dataReader;

  DtoQueryRequest(SpiEbeanServer server, DtoQueryEngine engine, SpiDtoQuery<T> query) {
-    super(server, query, query.transaction());
+    super(server, query);
    this.queryEngine = engine;
    this.query = query;
    query.obtainLocation();
@@ -52,7 +52,8 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {

      query.setCancelableQuery(ormQuery);
      // execute the underlying ORM query returning the ResultSet
-      SpiResultSet result = server.findResultSet(ormQuery, transaction);
+      ormQuery.usingTransaction(transaction);
+      SpiResultSet result = server.findResultSet(ormQuery);
      this.pstmt = result.statement();
      this.sql = ormQuery.getGeneratedSql();
      setResultSet(result.resultSet(), ormQuery.queryPlanKey());
@@ -121,7 +121,7 @@ final class DumpMetrics {
  }

  private void appendQueryName(MetaQueryMetric metric, StringBuilder sb) {
-    sb.append("query:").append(padName(metric.name())).append(" ");
+    sb.append("query:").append(padName(metric.name())).append(' ');
  }

  private void appendProfileAndSql(MetaQueryMetric metric, StringBuilder sb) {
@@ -136,7 +136,7 @@ final class DumpMetrics {

  private void log(MetaTimedMetric metric) {
    StringBuilder sb = new StringBuilder();
-    sb.append(padNameTimed(metric.name())).append(" ");
+    sb.append(padNameTimed(metric.name())).append(' ');
    appendCounters(metric, sb);
    out(sb.toString());
  }
@@ -7,7 +7,7 @@ import io.ebean.datasource.DataSourceConfig;
 import io.ebean.datasource.DataSourceFactory;
 import io.ebean.datasource.DataSourcePoolListener;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;

 /**
@@ -590,14 +590,16 @@ public final class InternalConfiguration {
   */
  QueryPlanLogger queryPlanLogger(Platform platform) {
    switch (platform.base()) {
-      case POSTGRES:
-        return new QueryPlanLoggerPostgres();
      case SQLSERVER:
        return new QueryPlanLoggerSqlServer();
      case ORACLE:
        return new QueryPlanLoggerOracle();
+      case POSTGRES:
+        return new QueryPlanLoggerExplain("explain (analyze, buffers) ");
+      case YUGABYTE:
+        return new QueryPlanLoggerExplain("explain (analyze, buffers, dist) ");
      default:
-        return new QueryPlanLoggerExplain();
+        return new QueryPlanLoggerExplain("explain ");
    }
  }

@@ -56,7 +56,10 @@ final class MultiTenantDbCatalogSupplier implements DataSourceSupplier {
  }

  @Override
-  public Connection readOnlyConnection(Object tenantId) throws SQLException {
+  public Connection readOnlyConnection(Object tenantId, boolean useMaster) throws SQLException {
+    if (readOnly == null || useMaster) {
+      return catalogDataSource.getConnectionForTenant(tenantId);
+    }
    return readOnly.getConnectionForTenant(tenantId);
  }

@@ -103,7 +106,6 @@ final class MultiTenantDbCatalogSupplier implements DataSourceSupplier {
     */
    @Override
    public Connection getConnection() throws SQLException {
-
      Connection connection = dataSource.getConnection();
      connection.setCatalog(tenantCatalog());
      return connection;
@@ -56,8 +56,12 @@ final class MultiTenantDbSchemaSupplier implements DataSourceSupplier {
  }

  @Override
-  public Connection readOnlyConnection(Object tenantId) throws SQLException {
-    return readOnly.getConnectionForTenant(tenantId);
+  public Connection readOnlyConnection(Object tenantId, boolean useMaster) throws SQLException {
+    if (readOnly == null || useMaster) {
+      return schemaDataSource.getConnectionForTenant(tenantId);
+    } else {
+      return readOnly.getConnectionForTenant(tenantId);
+    }
  }

  @Override
@@ -106,7 +110,6 @@ final class MultiTenantDbSchemaSupplier implements DataSourceSupplier {
     */
    @Override
    public Connection getConnection() throws SQLException {
-
      Connection connection = dataSource.getConnection();
      connection.setSchema(tenantSchema());
      return connection;
@@ -43,8 +43,8 @@ final class MultiTenantDbSupplier implements DataSourceSupplier {
  }

  @Override
-  public Connection readOnlyConnection(Object tenantId) throws SQLException {
-    throw new SQLException("Not currently supported");
+  public Connection readOnlyConnection(Object tenantId, boolean useMaster) throws SQLException {
+    return dataSourceProvider.dataSource(tenantId).getConnection();
  }

  @Override
@@ -23,7 +23,7 @@ final class ObtainedTransactionImplicit extends ObtainedTransaction {

  @Override
  public void commitIfCreated() {
-    server.commitTransaction();
+    transaction.commit();
  }

  @Override
@@ -4,7 +4,7 @@ import io.ebean.QueryIterator;
 import io.ebean.Version;
 import io.ebean.bean.BeanCollection;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
@@ -18,7 +18,7 @@ import io.ebeaninternal.server.loadcontext.DLoadContext;
 import io.ebeaninternal.server.query.CQueryPlan;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.function.Consumer;
@@ -60,6 +60,11 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    return queryEngine.translate(this, bindLog, sql, e);
  }

+  @Override
+  public boolean isGetAllFromBeanCache() {
+    return (transaction == null || !transaction.isSkipCache()) && getFromBeanCache();
+  }
+
  @Override
  public boolean isDeleteByStatement() {
    if (!transaction.isPersistCascade() || beanDescriptor.isDeleteByStatement()) {
@@ -220,7 +225,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
      } else {
        // create an implicit transaction to execute this query
        // potentially using read-only DataSource with autoCommit
-        transaction = server.createReadOnlyTransaction(query.tenantId());
+        transaction = server.createReadOnlyTransaction(query.tenantId(), query.isUseMaster());
      }
      createdTransaction = true;
    }
@@ -44,7 +44,7 @@ public final class PersistDeferredRelationship {
      return; // could not bind: TODO: should we log/throw an error?
    }
    // bind the where clause for the bean
-    Object[] idValues = beanDescriptor.idBinder().getIdValues(bean);
+    Object[] idValues = beanDescriptor.idBinder().values(bean);
    for (int j = 0; j < idValues.length; j++) {
      sqlUpdate.setParameter(pos + j, idValues[j]);
    }
@@ -8,7 +8,7 @@ import io.ebeaninternal.server.persist.BatchPostExecute;
 import io.ebeaninternal.server.persist.BatchedSqlException;
 import io.ebeaninternal.server.persist.PersistExecute;

-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;

 /**
@@ -20,9 +20,9 @@ import io.ebeanservice.docstore.api.DocStoreUpdate;
 import io.ebeanservice.docstore.api.DocStoreUpdateContext;
 import io.ebeanservice.docstore.api.DocStoreUpdates;

-import javax.persistence.EntityNotFoundException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import java.io.IOException;
 import java.sql.Statement;
 import java.util.*;
--- a/Show More
+++ b/Show More