#3433 - Put test back from desc -> description as desc as a column name isn't widely supported by other databases

#3433 - Entity property called desc used with query order by desc generates bad sql
[ebean-migration] #3434 - Connection is closed error running migration with MySql and Hikari (#3437 )
2026-09-24 19:30:06 +00:00 · 2024-07-08 21:52:36 +12:00 · 2024-07-04 00:01:00 +12:00 · 2024-07-02 23:47:14 +12:00 · 2024-07-02 22:06:57 +12:00 · 2024-07-02 18:08:08 +12:00
83 changed files with 565 additions and 372 deletions
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -16,18 +16,18 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [GA,EA]
+        java_version: [GA,EA,23]
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
      uses: oracle-actions/setup-java@v1
      with:
        website: jdk.java.net
        release: ${{ matrix.java_version }}
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -17,14 +17,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'zulu'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -17,14 +17,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -20,14 +20,14 @@ jobs:
        os: [ubuntu-latest]

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
      with:
        java-version: ${{ matrix.java_version }}
        distribution: 'adopt'
    - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
      env:
        cache-name: maven-cache
      with:
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -22,13 +22,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-postgis-types</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -17,13 +17,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
@@ -41,7 +41,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

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

  <name>ebean api</name>
@@ -186,15 +186,15 @@ public class OrderBy<T> implements Serializable {
    if (list.isEmpty()) {
      return null;
    }
-    StringBuilder sb = new StringBuilder();
+    var append = new StringAppend();
    for (int i = 0; i < list.size(); i++) {
      Property property = list.get(i);
      if (i > 0) {
-        sb.append(", ");
+        append.append(", ");
      }
-      sb.append(property.toStringFormat());
+      property.toStringFormat(append);
    }
-    return sb.toString();
+    return append.toString();
  }

  @Override
@@ -231,6 +231,55 @@ public class OrderBy<T> implements Serializable {
    return this;
  }

+  /**
+   * Append the order by clause.
+   */
+  public interface Append {
+
+    /**
+     * Append a property expression.
+     */
+    Append property(String property);
+
+    /**
+     * Append a literal.
+     */
+    Append append(String literal);
+
+    /**
+     * Parse and append an expression.
+     */
+    Append parse(String expression);
+  }
+
+  private static final class StringAppend implements Append {
+
+    private final StringBuilder builder = new StringBuilder();
+
+    @Override
+    public String toString() {
+      return builder.toString();
+    }
+
+    @Override
+    public Append property(String property) {
+      builder.append(property);
+      return this;
+    }
+
+    @Override
+    public Append append(String literal) {
+      builder.append(literal);
+      return this;
+    }
+
+    @Override
+    public Append parse(String raw) {
+      builder.append(raw);
+      return this;
+    }
+  }
+
  /**
   * A property and its ascending descending order.
   */
@@ -309,36 +358,25 @@ public class OrderBy<T> implements Serializable {

    @Override
    public String toString() {
-      return toStringFormat();
+      return property;
    }

-    public String toStringFormat() {
-      if (nulls == null && collation == null) {
-        if (ascending) {
-          return property;
+    public void toStringFormat(Append append) {
+      if (collation != null)  {
+        if (collation.contains("${}")) {
+          // this is a complex collation, e.g. DB2 - we must replace the property
+          append.parse(collation.replace("${}", property));
        } else {
-          return property + " desc";
+          append.property(property).append(" collate ").append(collation);
        }
      } else {
-        StringBuilder sb = new StringBuilder();
-        if (collation != null)  {
-          if (collation.contains("${}")) {
-            // this is a complex collation, e.g. DB2 - we must replace the property
-            sb.append(collation.replace("${}", property));
-          } else {
-            sb.append(property);
-            sb.append(" collate ").append(collation);
-          }
-        } else {
-          sb.append(property);
-        }
-        if (!ascending) {
-          sb.append(' ').append("desc");
-        }
-        if (nulls != null) {
-          sb.append(' ').append(nulls).append(' ').append(highLow);
-        }
-        return sb.toString();
+        append.property(property);
+      }
+      if (!ascending) {
+        append.append(" desc");
+      }
+      if (nulls != null) {
+        append.append(" ").append(nulls).append(" ").append(highLow);
      }
    }

@@ -129,7 +129,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   * When true then include a sql comment in generated SELECT queries with the query
   * label or profile location label.
   */
-  private boolean includeLabelInSql;
+  private boolean includeLabelInSql = true;

  /**
   * Interesting classes such as entities, embedded, ScalarTypes,
@@ -76,7 +76,7 @@ class DatabaseConfigTest {
    props.setProperty("skipDataSourceCheck", "true");
    props.setProperty("readOnlyDatabase", "true");
    props.setProperty("lengthCheck", "ON");
-    props.setProperty("includeLabelInSql", "true");
+    props.setProperty("includeLabelInSql", "false");

    props.setProperty("queryPlan.enable", "true");
    props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -97,7 +97,7 @@ class DatabaseConfigTest {
    assertTrue(settings.isLoadModuleInfo());
    assertTrue(settings.skipDataSourceCheck());
    assertTrue(settings.readOnlyDatabase());
-    assertTrue(settings.isIncludeLabelInSql());
+    assertFalse(settings.isIncludeLabelInSql());
    assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);

    assertTrue(settings.isIdGeneratorAutomatic());
@@ -183,7 +183,7 @@ class DatabaseConfigTest {
    assertEquals(10000L, config.getQueryPlanCaptureMaxTimeMillis());
    assertEquals(10, config.getQueryPlanCaptureMaxCount());
    assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
-    assertFalse(config.isIncludeLabelInSql());
+    assertTrue(config.isIncludeLabelInSql());

    config.setLoadModuleInfo(false);
    assertFalse(config.isAutoLoadModuleInfo());
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <name>ebean bom</name>
@@ -89,25 +89,25 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
@@ -125,13 +125,13 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>querybean-generator</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis-types</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>14.3.1</version>
+        <version>14.4.0</version>
      </dependency>

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

  <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
@@ -46,7 +46,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

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

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

@@ -357,4 +357,8 @@ public interface SpiTransaction extends Transaction {
   */
  void postRollback(Throwable cause);

+  /**
+   * Set the transaction to be inactive via external transaction manager.
+   */
+  void deactivateExternal();
 }
@@ -447,4 +447,9 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
  public void postRollback(Throwable cause) {
    transaction.postRollback(cause);
  }
+
+  @Override
+  public void deactivateExternal() {
+    transaction.deactivateExternal();
+  }
 }
@@ -5,6 +5,7 @@ import io.ebean.OrderBy.Property;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
+import io.ebeaninternal.server.deploy.DeployParser;
 import io.ebeaninternal.server.deploy.id.IdBinder;
 import io.ebeaninternal.server.el.ElPropertyValue;

@@ -17,50 +18,81 @@ final class CQueryOrderBy {

  private final BeanDescriptor<?> desc;
  private final OrderBy<?> orderBy;
+  private final DeployParser parser;

  /**
   * Create the logical order by clause.
   */
-  public static String parse(BeanDescriptor<?> desc, OrderBy<?> orderBy) {
-    return new CQueryOrderBy(desc, orderBy).parseInternal();
+  static String parse(DeployParser parser, BeanDescriptor<?> desc, OrderBy<?> orderBy) {
+    return new CQueryOrderBy(parser, desc, orderBy).parseInternal();
  }

-  private CQueryOrderBy(BeanDescriptor<?> desc, OrderBy<?> orderBy) {
+  private CQueryOrderBy(DeployParser parser, BeanDescriptor<?> desc, OrderBy<?> orderBy) {
    this.desc = desc;
+    this.parser = parser;
    this.orderBy = orderBy;
  }

  private String parseInternal() {
-    StringBuilder sb = new StringBuilder();
    List<Property> properties = orderBy.getProperties();
    if (properties.isEmpty()) {
      // order by clause removed by filterMany()
      return null;
    }
+    var append = new StringAppend(parser);
    for (int i = 0; i < properties.size(); i++) {
      if (i > 0) {
-        sb.append(", ");
+        append.append(", ");
      }
-      Property p = properties.get(i);
-      String expression = parseProperty(p);
-      sb.append(expression);
+      parseProperty(properties.get(i), append);
    }
-    return sb.toString();
+    return append.toString();
  }

-  private String parseProperty(Property p) {
-    String propName = p.getProperty();
-    ElPropertyValue el = desc.elGetValue(propName);
-    if (el == null) {
-      return p.toStringFormat();
+  private void parseProperty(Property p, StringAppend append) {
+    ElPropertyValue el = desc.elGetValue(p.getProperty());
+    if (el != null) {
+      BeanProperty beanProperty = el.beanProperty();
+      if (beanProperty instanceof BeanPropertyAssoc<?>) {
+        BeanPropertyAssoc<?> ap = (BeanPropertyAssoc<?>) beanProperty;
+        IdBinder idBinder = ap.targetDescriptor().idBinder();
+        append.parse(idBinder.orderBy(el.elName(), p.isAscending()));
+        return;
+      }
+    }
+    p.toStringFormat(append);
+  }
+
+  private static class StringAppend implements OrderBy.Append {
+
+    private final StringBuilder builder = new StringBuilder();
+    private final DeployParser parser;
+
+    StringAppend(DeployParser parser) {
+      this.parser = parser;
    }

-    BeanProperty beanProperty = el.beanProperty();
-    if (beanProperty instanceof BeanPropertyAssoc<?>) {
-      BeanPropertyAssoc<?> ap = (BeanPropertyAssoc<?>) beanProperty;
-      IdBinder idBinder = ap.targetDescriptor().idBinder();
-      return idBinder.orderBy(el.elName(), p.isAscending());
+    @Override
+    public String toString() {
+      return builder.toString();
+    }
+
+    @Override
+    public OrderBy.Append property(String property) {
+      builder.append(parser.property(property));
+      return this;
+    }
+
+    @Override
+    public OrderBy.Append append(String literal) {
+      builder.append(literal);
+      return this;
+    }
+
+    @Override
+    public OrderBy.Append parse(String raw) {
+      builder.append(parser.parse(raw));
+      return this;
    }
-    return p.toStringFormat();
  }
 }
@@ -7,7 +7,6 @@ import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiQuery;
 import io.ebeaninternal.server.bind.DataBind;
 import io.ebeaninternal.server.core.OrmQueryRequest;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.DeployParser;
 import io.ebeaninternal.server.expression.DefaultExpressionRequest;
@@ -178,10 +177,7 @@ public final class CQueryPredicates {

    BeanPropertyAssocMany<?> manyProperty = request.determineMany();
    if (buildSql) {
-      String logicalOrderBy = deriveOrderByWithMany(request.manyPropertyForOrderBy());
-      if (logicalOrderBy != null) {
-        dbOrderBy = deployParser.parse(logicalOrderBy);
-      }
+      dbOrderBy = deriveOrderByWithMany(deployParser, request.manyPropertyForOrderBy());
      // create a copy of the includes required to support the orderBy
      orderByIncludes = new HashSet<>(deployParser.includes());
    }
@@ -241,49 +237,47 @@ public final class CQueryPredicates {
    }
  }

-  private String parseOrderBy() {
+  private String parseOrderBy(DeployParser parser) {
    OrderBy<?> orderBy = query.getOrderBy();
    if (orderBy == null) {
      return null;
    }
-    return CQueryOrderBy.parse(request.descriptor(), orderBy);
+    return CQueryOrderBy.parse(parser, request.descriptor(), orderBy);
  }

  /**
   * There is a many property we need to make sure the ordering is appropriate.
   */
-  private String deriveOrderByWithMany(BeanPropertyAssocMany<?> manyProp) {
+  private String deriveOrderByWithMany(DeployParser parser, BeanPropertyAssocMany<?> manyProp) {
+    String orderBy = parseOrderBy(parser);
    if (manyProp == null) {
-      return parseOrderBy();
+      return orderBy;
    }
-    String orderBy = parseOrderBy();
-    BeanDescriptor<?> desc = request.descriptor();
-    String orderById = desc.defaultOrderBy();
+    String orderById = parser.parse(request.descriptor().defaultOrderBy());
    if (orderBy == null) {
      orderBy = orderById;
    }
    // check for default ordering on the many property...
    String manyOrderBy = manyProp.fetchOrderBy();
    if (manyOrderBy != null) {
-      orderBy = orderBy + ", " + CQueryBuilder.prefixOrderByFields(manyProp.name(), manyOrderBy);
+      orderBy = orderBy + ", " + parser.parse(CQueryBuilder.prefixOrderByFields(manyProp.name(), manyOrderBy));
    }
    if (request.isFindById()) {
      // only one master bean so should be fine...
      return orderBy;
    }
-    if (orderBy.startsWith(orderById)) {
-      return orderBy;
-    }
    // more than one top level row may be returned so
    // we need to make sure their is an order by on the
    // top level first (to ensure master/detail construction).
-    int manyPos = orderBy.indexOf(manyProp.name());
-    int idPos = orderBy.indexOf(" " + orderById);
+    int idPos = orderBy.indexOf(orderById);
+    if (idPos == 0) {
+      return orderBy;
+    }
+    int manyPos = orderBy.indexOf("${" + manyProp.name() + "}");
    if (manyPos == -1) {
      // no ordering of the many
      if (idPos == -1) {
        // append the orderById so that master level objects are ordered
-        // even if the orderBy is not unique for the master object
        return orderBy + ", " + orderById;
      }
      // orderById is already in the order by clause
@@ -292,7 +286,7 @@ public final class CQueryPredicates {
    if (idPos == -1 || idPos >= manyPos) {
      if (idPos > manyPos) {
        // there was an error with the order by...
-        String msg = "A Query on [" + desc + "] includes a join to a 'many' association [" + manyProp.name()
+        String msg = "A Query on [" + request.descriptor() + "] includes a join to a 'many' association [" + manyProp.name()
        + "] with an incorrect orderBy [" + orderBy + "]. The id property [" + orderById
        + "] must come before the many property [" + manyProp.name() + "] in the orderBy."
        + " Ebean has automatically modified the orderBy clause to do this.";
@@ -609,6 +609,11 @@ final class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEve
    // do nothing
  }

+  @Override
+  public void deactivateExternal() {
+    this.active = false;
+  }
+
  /**
   * Return true if the transaction is active.
   */
@@ -1082,6 +1082,11 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
    return active;
  }

+  @Override
+  public void deactivateExternal() {
+    this.active = false;
+  }
+
  @Override
  public final boolean isPersistCascade() {
    return persistCascade;
@@ -94,9 +94,14 @@ public final class JtaTransactionManager implements ExternalTransactionManager {
    // check current Ebean transaction
    SpiTransaction currentEbeanTransaction = scope.inScope();
    if (currentEbeanTransaction != null) {
-      // NOT expecting this so log WARNING
-      log.log(WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.id());
-      return currentEbeanTransaction;
+      if (currentEbeanTransaction.isActive()) {
+        // NOT expecting this so log WARNING
+        log.log(WARNING, "JTA Transaction - no current txn BUT using current Ebean one {0}", currentEbeanTransaction.id());
+        return currentEbeanTransaction;
+      } else {
+        log.log(DEBUG, "JTA Transaction - clearing inActive Ebean transaction {0}", currentEbeanTransaction.id());
+        scope.clearExternal();
+      }
    }

    UserTransaction ut = userTransaction();
@@ -186,27 +191,27 @@ public final class JtaTransactionManager implements ExternalTransactionManager {

    @Override
    public void afterCompletion(int status) {
-      switch (status) {
-        case Status.STATUS_COMMITTED:
-          log.log(DEBUG, "Jta Txn [{0}] committed", transaction.id());
-          transaction.postCommit();
-          // Remove this transaction object as it is completed
-          transactionManager.scope().clearExternal();
-          break;
+      try {
+        switch (status) {
+          case Status.STATUS_COMMITTED:
+            log.log(DEBUG, "Jta Txn [{0}] committed", transaction.id());
+            transaction.postCommit();
+            break;

-        case Status.STATUS_ROLLEDBACK:
-          log.log(DEBUG, "Jta Txn [{0}] rollback", transaction.id());
-          transaction.postRollback(null);
-          // Remove this transaction object as it is completed
-          transactionManager.scope().clearExternal();
-          break;
+          case Status.STATUS_ROLLEDBACK:
+            log.log(DEBUG, "Jta Txn [{0}] rollback", transaction.id());
+            transaction.postRollback(null);
+            break;

-        default:
-          log.log(DEBUG, "Jta Txn [{0}] status:{1}", transaction.id(), status);
+          default:
+            log.log(DEBUG, "Jta Txn [{0}] status:{1}", transaction.id(), status);
+        }
+      } finally {
+        transaction.deactivateExternal();
+        transactionManager.scope().clearExternal();
+        // No matter the completion status of the transaction, we release the connection we got from the pool.
+        JdbcClose.close(transaction.internalConnection());
      }
-
-      // No matter the completion status of the transaction, we release the connection we got from the pool.
-      JdbcClose.close(transaction.internalConnection());
    }
  }

@@ -117,6 +117,10 @@ final class NoTransaction implements SpiTransaction {
    // do nothing
  }

+  @Override
+  public void deactivateExternal() {
+    // do nothing
+  }

  @Override
  public boolean isLogSql() {
@@ -196,10 +196,6 @@ public class InitDataSourceTest {
    public void dataSourceDown(DataSource dataSource, SQLException reason) {
    }

-    @Override
-    public void dataSourceWarning(DataSource dataSource, String msg) {
-    }
-
  }

  @Test
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

@@ -65,7 +65,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

@@ -3,7 +3,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <!-- provided scope -->
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

@@ -62,7 +62,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <name>ebean querybean</name>
@@ -17,7 +17,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

@@ -63,14 +63,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

@@ -84,7 +84,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <artifactId>ebean-redis</artifactId>
@@ -13,51 +13,51 @@

  <dependencies>

+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.5.6</version>
+      <scope>test</scope>
+    </dependency>
+
    <dependency>
      <groupId>redis.clients</groupId>
      <artifactId>jedis</artifactId>
-      <version>4.2.3</version>
+      <version>4.4.8</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.3.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje.composite</groupId>
-      <artifactId>logback</artifactId>
-      <version>1.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

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

@@ -11,11 +11,12 @@ public final class EncodeSerializable implements Encode {
  @Override
  public byte[] encode(Object value) {
    try {
-      ObjectOutputStream oos = new ObjectOutputStream(new ByteArrayOutputStream());
+      final var baos = new ByteArrayOutputStream();
+      final var oos = new ObjectOutputStream(baos);
      oos.writeObject(value);
      oos.flush();
      oos.close();
-      return new ByteArrayOutputStream().toByteArray();
+      return baos.toByteArray();
    } catch (IOException e) {
      throw new RuntimeException("Failed to decode cache data", e);
    }
@@ -0,0 +1,17 @@
+package io.ebean.redis.encode;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class EncodeSerializableTest {
+
+  @Test
+  void encode() {
+    EncodeSerializable encodeSerializable = new EncodeSerializable();
+    byte[] asBytes = encodeSerializable.encode("HelloWorld");
+
+    Object result = encodeSerializable.decode(asBytes);
+    assertThat(result).isEqualTo("HelloWorld");
+  }
+}
@@ -0,0 +1,40 @@
+package org.domain;
+
+
+import io.ebean.annotation.Cache;
+import jakarta.persistence.Entity;
+
+/**
+ * Using Natural Key caching but no Near Caching so always hitting Redis.
+ */
+@SuppressWarnings("unused")
+@Cache(naturalKey = {"one", "two"})
+@Entity
+public class OtherOne extends EBase {
+
+  private final String one;
+  private final String two;
+  private String notes;
+
+  public OtherOne(String one, String two, String notes) {
+    this.one = one;
+    this.two = two;
+    this.notes = notes;
+  }
+
+  public String one() {
+    return one;
+  }
+
+  public String two() {
+    return two;
+  }
+
+  public String notes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+}
@@ -3,10 +3,8 @@ package org.integration;
 import io.ebean.DB;
 import io.ebean.cache.ServerCache;
 import io.ebean.cache.ServerCacheStatistics;
-import org.domain.Person;
-import org.domain.RCust;
-import org.domain.UChild;
-import org.domain.UParent;
+import org.domain.*;
+import org.domain.query.QOtherOne;
 import org.domain.query.QPerson;
 import org.domain.query.QRCust;
 import org.junit.jupiter.api.Test;
@@ -148,6 +146,37 @@ class IntegrationTest {
    assertThat(stats2.getHitCount()).isEqualTo(3);
  }

+  @Test
+  void testOtherOne() {
+    DB.save(new OtherOne("A", "B", "ab"));
+    DB.save(new OtherOne("A", "C", "ac"));
+    DB.save(new OtherOne("B", "B", "bb"));
+
+    ServerCache nkeyCache = DB.cacheManager().naturalKeyCache(OtherOne.class);
+    nkeyCache.clear();
+    nkeyCache.statistics(true);
+
+    OtherOne ab0 = findOther("A", "B");
+    OtherOne ab1 = findOther("A", "B");
+    OtherOne ab2 = findOther("A", "B");
+    OtherOne bb = findOther("B", "B");
+
+    assertThat(ab0).isNotNull();
+    assertThat(ab1).isNotNull();
+    assertThat(ab2).isNotNull();
+    assertThat(bb).isNotNull();
+
+    ServerCacheStatistics statistics = nkeyCache.statistics(true);
+    assertThat(statistics.getHitCount()).isEqualTo(2);
+  }
+
+  private static OtherOne findOther(String a, String b) {
+    return new QOtherOne()
+      .one.eq(a)
+      .two.eq(b)
+      .findOne();
+  }
+
  @Test
  void test() throws InterruptedException {

@@ -1,14 +1,11 @@
-<configuration scan="true" scanPeriod="10 seconds">
+<configuration>
  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>TRACE</level>
-    </filter>
    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
    </encoder>
  </appender>

-  <root level="WARN">
+  <root level="TRACE">
    <appender-ref ref="STDOUT"/>
  </root>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

@@ -77,7 +77,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <name>ebean test</name>
@@ -33,20 +33,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
@@ -149,14 +149,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

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

@@ -14,6 +14,8 @@ public class BSimpleWithGen {

  private String name;

+  private String description;
+
  @Transient
  private Map<String, List<String>> someMap;

@@ -45,4 +47,11 @@ public class BSimpleWithGen {
    this.someMap = someMap;
  }

+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
 }
@@ -1,5 +1,6 @@
 package org.tests.basic.type;

+import io.ebean.Query;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import org.junit.jupiter.api.Test;
@@ -11,22 +12,32 @@ import java.util.Map;

 import static org.assertj.core.api.Assertions.assertThat;

-public class TestTransientMap extends BaseTestCase {
+class TestTransientMap extends BaseTestCase {

  @Test
-  public void testMe() {
+  void testMe() {

    Map<String, List<String>> map = new HashMap<>();
    map.put("foo", new ArrayList<>());

    BSimpleWithGen b = new BSimpleWithGen("blah");
    b.setSomeMap(map);
+    b.setDescription("hi");
    DB.save(b);

    final BSimpleWithGen found = DB.find(BSimpleWithGen.class, b.getId());
    assertThat(found.getName()).isEqualTo("blah");
    assertThat(found.getSomeMap()).isNull();

+    Query<BSimpleWithGen> query = DB.find(BSimpleWithGen.class)
+      .where().startsWith("description", "h")
+      .orderBy().desc("description");
+
+    var list = query.findList();
+    assertThat(list).hasSize(1);
+    assertThat(query.getGeneratedSql()).contains("where t0.description like");
+    assertThat(query.getGeneratedSql()).contains("order by t0.description desc");
+
    DB.delete(b);
  }
 }
@@ -228,7 +228,7 @@ public class TestQueryFindIterate extends BaseTestCase {
      dsPool = (DataSourcePool) server().dataSource();
    }

-    int startConns = dsPool.getStatus(false).getBusy();
+    int startConns = dsPool.status(false).busy();
    final Query<Customer> query = server().find(Customer.class)
      .where()
      .isNotNull("name")
@@ -241,22 +241,22 @@ public class TestQueryFindIterate extends BaseTestCase {

    QueryIterator<Customer> queryIterator = query.findIterate();

-    assertThat(dsPool.getStatus(false).getBusy()).isEqualTo(startConns + 1);
+    assertThat(dsPool.status(false).busy()).isEqualTo(startConns + 1);

    assertTrue(queryIterator.hasNext());
    assertThat(queryIterator.next()).isNotNull();
-    assertThat(dsPool.getStatus(false).getBusy()).isEqualTo(startConns + 1);
+    assertThat(dsPool.status(false).busy()).isEqualTo(startConns + 1);

    assertTrue(queryIterator.hasNext());
    assertThat(queryIterator.next()).isNotNull();
-    assertThat(dsPool.getStatus(false).getBusy()).isEqualTo(startConns + 1);
+    assertThat(dsPool.status(false).busy()).isEqualTo(startConns + 1);

    assertTrue(queryIterator.hasNext());
    assertThat(queryIterator.next()).isNotNull();
-    assertThat(dsPool.getStatus(false).getBusy()).isEqualTo(startConns + 1);
+    assertThat(dsPool.status(false).busy()).isEqualTo(startConns + 1);

    assertFalse(queryIterator.hasNext());
-    assertThat(dsPool.getStatus(false).getBusy()).isEqualTo(startConns);
+    assertThat(dsPool.status(false).busy()).isEqualTo(startConns);
    try {
      queryIterator.next();
      fail("noSuchElementException expected");
@@ -11,6 +11,7 @@ import org.tests.model.basic.ResetBasicData;

 import java.util.List;

+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;

 public class TestOrderByWithMany extends BaseTestCase {
@@ -64,7 +65,7 @@ public class TestOrderByWithMany extends BaseTestCase {

    String sql = query.getGeneratedSql();

-    assertTrue(sql.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc"));
+    assertThat(sql).contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc");
  }

  private void checkWithBuiltInMany() {
@@ -151,6 +152,6 @@ public class TestOrderByWithMany extends BaseTestCase {

    String sql = query.getGeneratedSql();
    // prepend id in order by
-    assertTrue(sql.contains("order by t0.order_date, t0.id, t1.ship_time desc"));
+    assertThat(sql).contains("order by t0.order_date, t0.id, t1.ship_time desc");
  }
 }
@@ -15,8 +15,8 @@ mvn -T 4 clean package
 mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests -DskipStagingRepositoryClose=true -DstagingProgressTimeoutMinutes=9

 ## git commit, git tag, git push --tags
-git commit -am 'Version 14.3.1'
-git tag 14.3.1
+git commit -am 'Version 14.4.0'
+git tag 14.4.0
 git push --tags

 ## convert to javax
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

@@ -35,7 +35,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

@@ -56,14 +56,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,67 +15,67 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,13 +15,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

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

  <artifactId>platforms</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
    <relativePath>../..</relativePath>
  </parent>

@@ -15,7 +15,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

  </dependencies>
@@ -9,7 +9,7 @@

  <groupId>io.ebean</groupId>
  <artifactId>ebean-parent</artifactId>
-  <version>14.3.1</version>
+  <version>14.4.0</version>
  <packaging>pom</packaging>

  <name>ebean parent</name>
@@ -50,11 +50,11 @@
    <ebean-annotation.version>8.4</ebean-annotation.version>
    <ebean-ddl-runner.version>2.3</ebean-ddl-runner.version>
    <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
-    <ebean-migration.version>14.0.0</ebean-migration.version>
+    <ebean-migration.version>14.2.0</ebean-migration.version>
    <ebean-test-containers.version>7.4</ebean-test-containers.version>
-    <ebean-datasource.version>8.14</ebean-datasource.version>
-    <ebean-agent.version>14.3.1</ebean-agent.version>
-    <ebean-maven-plugin.version>14.3.1</ebean-maven-plugin.version>
+    <ebean-datasource.version>9.0</ebean-datasource.version>
+    <ebean-agent.version>14.5.0</ebean-agent.version>
+    <ebean-maven-plugin.version>14.5.0</ebean-maven-plugin.version>
    <surefire.useModulePath>false</surefire.useModulePath>
  </properties>

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

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

  <artifactId>tests</artifactId>
@@ -5,7 +5,7 @@
  <parent>
    <artifactId>tests</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <artifactId>test-java16</artifactId>
@@ -18,7 +18,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-h2</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
@@ -30,14 +30,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>

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

@@ -6,7 +6,7 @@
  <parent>
    <artifactId>tests</artifactId>
    <groupId>io.ebean</groupId>
-    <version>14.3.1</version>
+    <version>14.4.0</version>
  </parent>

  <artifactId>test-kotlin</artifactId>
@@ -40,7 +40,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
    </dependency>

    <dependency>
@@ -53,7 +53,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>14.3.1</version>
+      <version>14.4.0</version>
      <scope>test</scope>
    </dependency>
Author	SHA1	Message	Date
Rob Bygrave	f27958210c	#3433 - Put test back from desc -> description as desc as a column name isn't widely supported by other databases	2024-07-08 21:52:36 +12:00
Rob Bygrave	70cfc77b5b	#3433 - Entity property called desc used with query order by desc generates bad sql	2024-07-04 00:01:00 +12:00
Rob Bygrave	8913bead89	[ebean-migration] #3434 - Connection is closed error running migration with MySql and Hikari (#3437 )	2024-07-02 23:47:14 +12:00
Rob Bygrave	cdf1cd8487	[ebean-redis] Fix for #3432 empty value for natural keys (#3436 )	2024-07-02 22:06:57 +12:00
Rob Bygrave	2582c4b653	Bump to ebean-agent 14.5.0/15.5.0 with ASM 9.7 for JDK 22 and 23 support (#3435 )	2024-07-02 18:08:08 +12:00
Rob Bygrave	a9e3e2ea43	Version 14.4.0	2024-06-26 22:33:04 +12:00
Rob Bygrave	834ce971b3	Bump ebean-agent, no functional change	2024-06-26 22:19:58 +12:00
Rob Bygrave	5c27f89677	Change includeLabelInSql to default to true (#3431 ) To disable this use ebean.includeLabelInSql=false or set this via `DatabaseBuilder.includeLabelInSql(false)``	2024-06-26 20:32:19 +12:00
Rob Bygrave	bfbbb7e7a7	Bump ebean-datasource dependency to 9.0 with automatic Lambda mode detection (#3430 ) * Bump ebean-datasource dependency to 9.0 with automatic Lambda mode detection ebean-datasource 9.0 automatically detects when it is running in AWS Lambda and will set validateOnHeartbeat to false. In Lambda we don't want to validate connections in background threads that can suspend in Lambda.	2024-06-26 20:27:49 +12:00
Rob Bygrave	a8947c7d2f	Bump ebean-migration dependency to 14.1.0 with fastMode enabled by default (#3429 ) ebean-migration 14.1.0 defaults fastMode to true. This means that it first runs a fast check that all migrations have been run. If that does not succeed for any reason it runs the normal migration process.	2024-06-26 20:15:21 +12:00
Rob Bygrave	d5401efb08	#3423 JtaTransactionManager keeps reference to already closed scope (and Transaction/connection ThreadLocal) when JtaTxnListener#afterCompletion is called by a different thread (#3424 ) Bugfix for "Long/slow transaction reaper" in Wildfire that can close/rollback a transaction in a different thread. Fix is to use active flag to inactivate the transaction and detect that case in JtaTransactionManager.getCurrentTransaction()	2024-06-21 07:57:31 +12:00
Rob Bygrave	925ceaf441	Update build actions/setup-java@v4	2024-06-14 21:47:43 +12:00
Rob Bygrave	c5fea13ca5	Update build actions/setup-java@v4	2024-06-14 21:42:06 +12:00
Rob Bygrave	6fa3759786	Add 23 to build	2024-06-14 21:34:54 +12:00