Version 13.17.4

#3031 Improve error message
Update README add end
2024-04-21 10:51:47 +00:00 · 2023-05-10 00:34:53 +12:00 · 2023-05-10 00:34:27 +12:00 · 2023-05-10 00:30:07 +12:00 · 2023-05-09 23:37:05 +12:00 · 2023-05-09 23:23:31 +12:00
74 changed files with 531 additions and 343 deletions
@@ -120,3 +120,4 @@ To set this option as the global default for IntelliJ use:
 `Run - Edit Configurations -> Edit configuration templates -> JUnit -> modify options - Do not use module-path option`


+end
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-db2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-h2</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-hana</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -35,13 +35,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean (all platforms)</name>
@@ -16,31 +16,31 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -53,13 +53,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

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

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

  <name>ebean api</name>
@@ -26,12 +26,6 @@
      <version>1.0</version>
    </dependency>

-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-config</artifactId>
-      <version>2.4</version>
-    </dependency>
-
    <!--
    Class retention Nonnull and Nullable annotations
    to assist with IDE auto-completion with Ebean API
@@ -42,6 +36,12 @@
      <version>1.1</version>
    </dependency>

+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-config</artifactId>
+      <version>3.1</version>
+    </dependency>
+
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>persistence-api</artifactId>
@@ -115,7 +115,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {

  @Override
  public String toString() {
-    return "InterceptReadWrite{state=" + state +
+    return "InterceptReadWrite@" + hashCode() + "{state=" + state +
      (dirty ? " dirty;" : "") +
      (forceUpdate ? " forceUpdate;" : "") +
      (readOnly ? " readOnly;" : "") +
@@ -128,7 +128,6 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
      (lazyLoadProperty > -1 ? (", lazyLoadProperty=" + lazyLoadProperty) : "") +
      ", loader=" + beanLoader +
      (ownerId != null ? (", ownerId=" + ownerId) : "") +
-      ", owner=" + owner +
      '}';
  }

@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>provided</scope>
    </dependency>

@@ -62,7 +62,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -76,7 +76,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -91,7 +91,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:13.12.0</tile>
+            <tile>io.ebean.tile:enhancement:13.17.1</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean bom</name>
@@ -89,112 +89,112 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-joda-time</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
        <scope>provided</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
        <scope>test</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <!-- platforms -->
@@ -202,67 +202,67 @@
      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-clickhouse</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>13.17.1</version>
+        <version>13.17.4</version>
      </dependency>

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

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

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

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

    <dependency>
@@ -46,13 +46,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -143,21 +143,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

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

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

@@ -24,4 +24,8 @@ public interface LoadBeanBuffer {
  void configureQuery(SpiQuery<?> query, String lazyLoadProperty);

  boolean isCache();
+
+  void loadingStarted();
+
+  void loadingStopped();
 }
@@ -6,7 +6,13 @@ import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;

-import java.util.*;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static java.lang.System.Logger.Level.DEBUG;

 /**
 * Request for loading ManyToOne and OneToOne relationships.
@@ -18,12 +24,16 @@ public final class LoadBeanRequest extends LoadRequest {
  private final String lazyLoadProperty;
  private final boolean loadCache;
  private final boolean alreadyLoaded;
+  private String triggerEbi;
+  private String batchBefore;
+  private List<Object> queryIds;

  /**
   * Construct for lazy load request.
   */
  public LoadBeanRequest(LoadBeanBuffer loadBuffer, EntityBeanIntercept ebi, boolean loadCache) {
    this(loadBuffer, null, true, ebi.lazyLoadProperty(), ebi.isLoaded(), loadCache || ebi.isLoadedFromCache());
+    this.triggerEbi = String.valueOf(ebi);
  }

  /**
@@ -53,16 +63,19 @@ public final class LoadBeanRequest extends LoadRequest {
  }

  /**
-   * Return the batch of beans to actually load.
+   * Return true if the batch is empty.
   */
-  public Set<EntityBeanIntercept> batch() {
-    return batch;
+  public boolean checkEmpty() {
+    loadBuffer.loadingStarted();
+    batchBefore = String.valueOf(batch);
+    queryIds = ids();
+    return batch.isEmpty();
  }

  /**
   * Return the list of Id values for the beans in the lazy load buffer.
   */
-  public List<Object> ids() {
+  private List<Object> ids() {
    final List<Object> idList = new ArrayList<>(batch.size());
    final BeanDescriptor<?> desc = loadBuffer.descriptor();
    for (EntityBeanIntercept ebi : batch) {
@@ -74,7 +87,7 @@ public final class LoadBeanRequest extends LoadRequest {
  /**
   * Configure the query for lazy loading execution.
   */
-  public void configureQuery(SpiQuery<?> query, List<Object> idList) {
+  public void configureQuery(SpiQuery<?> query) {
    query.setMode(Mode.LAZYLOAD_BEAN);
    query.setPersistenceContext(loadBuffer.persistenceContext());
    query.setLoadDescription(mode(), description());
@@ -90,10 +103,10 @@ public final class LoadBeanRequest extends LoadRequest {
    if (loadCache) {
      query.setBeanCacheMode(CacheMode.PUT);
    }
-    if (idList.size() == 1) {
-      query.where().idEq(idList.get(0));
+    if (queryIds.size() == 1) {
+      query.where().idEq(queryIds.get(0));
    } else {
-      query.where().idIn(idList);
+      query.where().idIn(queryIds);
    }
  }

@@ -104,7 +117,8 @@ public final class LoadBeanRequest extends LoadRequest {
  /**
   * Load the beans into the L2 cache if that is requested and check for load failures due to deletes.
   */
-  public Result postLoad(List<?> list) {
+  public void postLoad(List<?> list) {
+    loadBuffer.loadingStopped();
    Set<Object> loadedIds = new HashSet<>();
    BeanDescriptor<?> desc = loadBuffer.descriptor();
    // collect Ids and maybe load bean cache
@@ -122,45 +136,26 @@ public final class LoadBeanRequest extends LoadRequest {
        // necessary but allow processing to continue until it is accessed by client code
        Object id = desc.getId(ebi.owner());
        if (!loadedIds.contains(id)) {
-          // assume this is logically deleted (hence not found)
-          desc.markAsDeleted(ebi.owner());
-          missedIds.add(id);
-          missed.add(ebi);
+          if (queryIds.contains(id)) {
+            // assume this is logically deleted (hence not found)
+            desc.markAsDeleted(ebi.owner());
+          } else {
+            // unexpected, added to batch during loading
+            missedIds.add(id);
+            missed.add(ebi);
+          }
+        }
+        if (!missed.isEmpty()) {
+          if (CoreLog.markedAsDeleted.isLoggable(DEBUG)) {
+            CoreLog.markedAsDeleted.log(DEBUG, "Loaded bean batch triggered by ebi:{0} property:{1}", triggerEbi, lazyLoadProperty);
+            CoreLog.markedAsDeleted.log(DEBUG, "Loaded bean batch BEFORE {0}", batchBefore);
+            CoreLog.markedAsDeleted.log(DEBUG, "Loaded bean batch AFTER {0}", batch);
+            String msg = MessageFormat.format("Bean added to batch during load for {0} missedIds:{1} queryIds:{2} missed:{3}",
+              beanType(), missedIds, queryIds, missed);
+            CoreLog.markedAsDeleted.log(DEBUG, msg, new RuntimeException("LoadBeanRequest - Bean added to batch during load"));
+          }
        }
      }
-      return new Result(loadedIds, missedIds, missed);
-    }
-    return EMPTY_RESULT;
-  }
-
-  static final Result EMPTY_RESULT = new Result(Collections.emptySet(),Collections.emptySet(), Collections.emptyList());
-
-  public static class Result {
-
-    private final Set<Object> loadedIds;
-    private final Set<Object> missedIds;
-    private final List<EntityBeanIntercept> missed;
-
-    Result(Set<Object> loadedIds, Set<Object> missedIds, List<EntityBeanIntercept> missed) {
-      this.loadedIds = loadedIds;
-      this.missedIds = missedIds;
-      this.missed = missed;
-    }
-
-    public boolean markedDeleted() {
-      return !missedIds.isEmpty();
-    }
-
-    public Set<Object> missedIds() {
-      return missedIds;
-    }
-
-    public Set<Object> loadedIds() {
-      return loadedIds;
-    }
-
-    public List<EntityBeanIntercept> missed() {
-      return missed;
    }
  }
 }
@@ -14,12 +14,9 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;

 import javax.persistence.EntityNotFoundException;
-import java.text.MessageFormat;
 import java.util.List;
-import java.util.Set;

 import static java.lang.System.Logger.Level.DEBUG;
-import static java.lang.System.Logger.Level.ERROR;

 /**
 * Helper to handle lazy loading and refreshing of beans.
@@ -126,30 +123,12 @@ final class DefaultBeanLoader {
   * Load a batch of beans for +query or +lazy loading.
   */
  void loadBean(LoadBeanRequest loadRequest) {
-    final Set<EntityBeanIntercept> batch = loadRequest.batch();
-    if (batch.isEmpty()) {
+    if (loadRequest.checkEmpty()) {
      throw new RuntimeException("Nothing in batch?");
    }
-
-    final String batchBefore = String.valueOf(batch);
-    final List<Object> ids = loadRequest.ids();
-    if (ids.isEmpty()) {
-      // this should never happen given the batch is not empty
-      CoreLog.internal.log(ERROR, "No Ids when loading Batch buffer");
-      return;
-    }
-
    final SpiQuery<?> query = server.createQuery(loadRequest.beanType());
-    loadRequest.configureQuery(query, ids);
-    final List<?> list = executeQuery(loadRequest, query);
-    final LoadBeanRequest.Result result = loadRequest.postLoad(list);
-    if (result.markedDeleted() && CoreLog.markedAsDeleted.isLoggable(DEBUG)) {
-      CoreLog.markedAsDeleted.log(DEBUG, "Loaded bean batch BEFORE {0}", batchBefore);
-      CoreLog.markedAsDeleted.log(DEBUG, "Loaded bean batch AFTER {0}", batch);
-      String msg = MessageFormat.format("Loaded bean marked as deleted for {0} ids:{1} missedIds:{2} loadedIds:{3} sql:{4} loadedList:{5} missed:{6}",
-        loadRequest.beanType(), ids, result.missedIds(), result.loadedIds(), query.getGeneratedSql(), list, result.missed());
-      CoreLog.markedAsDeleted.log(DEBUG, msg, new RuntimeException("LoadBeanRequest markedAsDeleted"));
-    }
+    loadRequest.configureQuery(query);
+    loadRequest.postLoad(executeQuery(loadRequest, query));
  }

  /**
@@ -5,22 +5,23 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.bean.PersistenceContext;
-import io.ebeaninternal.api.LoadBeanBuffer;
-import io.ebeaninternal.api.LoadBeanContext;
-import io.ebeaninternal.api.LoadBeanRequest;
-import io.ebeaninternal.api.SpiQuery;
+import io.ebeaninternal.api.*;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.querydefn.OrmQueryProperties;

+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;

+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
 * ToOne bean load context.
 */
@@ -71,6 +72,9 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
    if (currentBuffer.isFull()) {
      currentBuffer = createBuffer(batchSize);
    }
+    if (currentBuffer.addWhenLoading()) {
+      CoreLog.markedAsDeleted.log(DEBUG, "Adding " + ebi + " to batch " + currentBuffer + " after loadingStarted(1)", new RuntimeException("Adding to batch after load(1)"));
+    }
    ebi.setBeanLoader(currentBuffer, persistenceContext());
    currentBuffer.add(ebi);
  }
@@ -117,6 +121,7 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
    private final DLoadBeanContext context;
    private final int batchSize;
    private final Set<EntityBeanIntercept> batch;
+    private final Instant whenCreated = Instant.now();
    private PersistenceContext persistenceContext;

    LoadBuffer(DLoadBeanContext context, int batchSize) {
@@ -127,7 +132,8 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext

    @Override
    public String toString() {
-      return "LoadBuffer@" + hashCode();
+      return "LoadBuffer@" + hashCode() + ":" + whenCreated + ":size=" + batch.size()
+        +":locked=" +bufferLock.isLocked()+ "/currentThread=" + bufferLock.isHeldByCurrentThread();
    }

    @Override
@@ -148,6 +154,10 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
      return batchSize == batch.size();
    }

+    final boolean addWhenLoading() {
+      return loadingStarted.get() && CoreLog.markedAsDeleted.isLoggable(DEBUG);
+    }
+
    /**
     * Add the bean to the load buffer.
     */
@@ -194,6 +204,18 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
      return context.cache;
    }

+    private final AtomicBoolean loadingStarted = new AtomicBoolean();
+
+    @Override
+    public void loadingStarted() {
+      loadingStarted.set(true);
+    }
+
+    @Override
+    public void loadingStopped() {
+      loadingStarted.set(false);
+    }
+
    @Override
    public void loadBean(EntityBeanIntercept ebi) {
      // A lock is effectively held by EntityBeanIntercept.loadBean()
@@ -203,6 +225,11 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
      }
      if (!batch.contains(ebi)) {
        // re-add to the batch and lazy load from DB skipping l2 cache
+        if (loadingStarted.get()) {
+          if (CoreLog.markedAsDeleted.isLoggable(DEBUG)) {
+            CoreLog.markedAsDeleted.log(DEBUG, "Adding " + ebi + "to batch " + this + "after loadingStarted(2) ", new RuntimeException("Adding to batch after load(2"));
+          }
+        }
        batch.add(ebi);
      } else if (context.hitCache) {
        Set<EntityBeanIntercept> hits = context.desc.cacheBeanLoadAll(batch, persistenceContext, ebi.lazyLoadPropertyIndex(), ebi.lazyLoadProperty());
@@ -213,8 +240,7 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
        }
      }

-      LoadBeanRequest req = new LoadBeanRequest(this, ebi, context.hitCache);
-      context.desc.ebeanServer().loadBean(req);
+      context.desc.ebeanServer().loadBean(new LoadBeanRequest(this, ebi, context.hitCache));
      batch.clear();
    }
  }
@@ -147,6 +147,7 @@ class SqlTreeLoadBean implements SqlTreeLoad {
    EntityBean contextBean;
    SqlBeanLoad sqlBeanLoad;
    boolean lazyLoadMany;
+    boolean usingContextBean;

    private Load(DbReadContext ctx, EntityBean parentBean) {
      this.ctx = ctx;
@@ -189,6 +190,7 @@ class SqlTreeLoadBean implements SqlTreeLoad {
        contextBean = localBean;
      } else {
        // bean already exists in persistenceContext
+        usingContextBean = true;
        if (ctx.isLoadContextBean()) {
          // if explicitly set loadContextBean to true, then reload
          localBean = contextBean;
@@ -247,7 +249,7 @@ class SqlTreeLoadBean implements SqlTreeLoad {
      return queryMode == Mode.LAZYLOAD_MANY && isRoot();
    }

-    private EntityBean getContextBean() {
+    private EntityBean contextBean() {
      return contextBean;
    }

@@ -278,13 +280,11 @@ class SqlTreeLoadBean implements SqlTreeLoad {
          if (!partialObject) {
            ebi.setFullyLoadedBean(true);
          }
-        } else if (partialObject) {
-          if (readId) {
-            // register for lazy loading
-            ctx.register(null, ebi);
-          }
-        } else {
+        } else if (!partialObject) {
          ebi.setFullyLoadedBean(true);
+        } else if (readId && !usingContextBean) {
+          // register for lazy loading if bean is new
+          ctx.register(null, ebi);
        }

        if (ctx.isAutoTuneProfiling() && !disableLazyLoad) {
@@ -358,7 +358,7 @@ class SqlTreeLoadBean implements SqlTreeLoad {
    final EntityBean perform() throws SQLException {
      initialise();
      if (isLazyLoadManyRoot()) {
-        return getContextBean();
+        return contextBean();
      }
      postLoad();
      setBeanToParent();
@@ -370,7 +370,7 @@ class SqlTreeLoadBean implements SqlTreeLoad {
     * context we need to check if it is already contained in the collection.
     */
    final boolean isContextBean() {
-      return localBean == null || queryMode == Mode.LAZYLOAD_BEAN;
+      return usingContextBean;
    }
  }

@@ -511,7 +511,7 @@ public final class DefaultTypeManager implements TypeManager {
    ScalarTypeEnum<?> scalarEnum = (ScalarTypeEnum<?>) scalarType;
    if (scalarEnum != null && !scalarEnum.isOverrideBy(type)) {
      if (type != null && !scalarEnum.isCompatible(type)) {
-        throw new IllegalStateException("Error mapping Enum type:" + enumType + " It is mapped using 2 different modes when only one is supported (ORDINAL, STRING or an Ebean mapping)");
+        throw new IllegalStateException("Error mapping Enum type:" + enumType + " It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
      }
      return scalarEnum;
    }
@@ -57,7 +57,7 @@ public class DefaultTypeManagerTest {
      assertThat(true).isFalse().as("never get here");

    } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
    }
  }

@@ -72,7 +72,7 @@ public class DefaultTypeManagerTest {
      typeManager.enumType(Month.class, EnumType.STRING);
      assertThat(true).isFalse().as("never get here");
    } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
    }
  }

@@ -90,7 +90,7 @@ public class DefaultTypeManagerTest {
      typeManager.enumType(DayOfWeek.class, EnumType.ORDINAL);
      assertThat(true).isFalse().as("never get here");
    } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
    }
  }

@@ -105,7 +105,7 @@ public class DefaultTypeManagerTest {
      typeManager.enumType(DayOfWeek.class, EnumType.STRING);
      assertThat(true).isFalse().as("never get here");
    } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
    }
  }

@@ -57,7 +57,7 @@ class TestTypeManager extends BaseTest {
      typeManager.enumType(MyEnum.class, EnumType.STRING);
      fail("never get here");
    } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
    }
  }

@@ -91,7 +91,7 @@ class TestTypeManager extends BaseTest {
      typeManager.enumType(MyDayOfWeek.class, EnumType.ORDINAL);
      fail("never get here");
    } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
    }
  }

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

  <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -52,7 +52,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:13.12.0</tile>
+            <tile>io.ebean.tile:enhancement:13.17.1</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>provided</scope>
    </dependency>

@@ -72,7 +72,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

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

  <name>ebean external mapping api</name>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <scm>
@@ -21,7 +21,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <!-- JAVAX-DEPENDENCY-START -->
@@ -68,21 +68,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

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

@@ -105,7 +105,7 @@
        <configuration>
          <tiles>
            <!-- other tiles ... -->
-            <tile>io.ebean.tile:enhancement:13.12.0</tile>
+            <tile>io.ebean.tile:enhancement:13.17.1</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-jackson-jsonnode</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core-type</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>provided</scope>
    </dependency>

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

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

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

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

@@ -6,7 +6,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>provided</scope>
    </dependency>

@@ -50,7 +50,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -92,7 +92,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:13.12.0</tile>
+            <tile>io.ebean.tile:enhancement:13.17.1</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>ebean postgis</name>
@@ -22,14 +22,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

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

@@ -65,7 +65,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -96,7 +96,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:13.12.0</tile>
+            <tile>io.ebean.tile:enhancement:13.17.1</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -98,12 +98,7 @@ abstract class ScalarTypePgisBase<T extends Geometry> implements ScalarType<T> {

  @Override
  public String formatValue(T value) {
-    return null;
-  }
-
-  @Override
-  public T parse(String value) {
-    return null;
+    return value.toString();
  }

  @Override
@@ -3,10 +3,20 @@ package io.ebean.postgis;
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import org.postgis.LineString;

+import java.sql.SQLException;
+
 public class ScalarTypePgisLineString extends ScalarTypePgisBase<LineString> {

  public ScalarTypePgisLineString() {
    super(ExtraDbTypes.LINESTRING, LineString.class);
  }

+  @Override
+  public LineString parse(String value) {
+    try {
+      return new LineString(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
 }
@@ -3,10 +3,20 @@ package io.ebean.postgis;
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import org.postgis.MultiLineString;

+import java.sql.SQLException;
+
 public class ScalarTypePgisMultiLineString extends ScalarTypePgisBase<MultiLineString> {

  public ScalarTypePgisMultiLineString() {
    super(ExtraDbTypes.MULTILINESTRING, MultiLineString.class);
  }

+  @Override
+  public MultiLineString parse(String value) {
+    try {
+      return new MultiLineString(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
 }
@@ -3,10 +3,20 @@ package io.ebean.postgis;
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import org.postgis.MultiPoint;

+import java.sql.SQLException;
+
 public class ScalarTypePgisMultiPoint extends ScalarTypePgisBase<MultiPoint> {

  public ScalarTypePgisMultiPoint() {
    super(ExtraDbTypes.MULTIPOINT, MultiPoint.class);
  }

+  @Override
+  public MultiPoint parse(String value) {
+    try {
+      return new MultiPoint(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
 }
@@ -3,10 +3,20 @@ package io.ebean.postgis;
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import org.postgis.MultiPolygon;

+import java.sql.SQLException;
+
 public class ScalarTypePgisMultiPolygon extends ScalarTypePgisBase<MultiPolygon> {

  public ScalarTypePgisMultiPolygon() {
    super(ExtraDbTypes.MULTIPOLYGON, MultiPolygon.class);
  }

+  @Override
+  public MultiPolygon parse(String value) {
+    try {
+      return new MultiPolygon(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
 }
@@ -3,10 +3,20 @@ package io.ebean.postgis;
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import org.postgis.Point;

+import java.sql.SQLException;
+
 public class ScalarTypePgisPoint extends ScalarTypePgisBase<Point> {

  public ScalarTypePgisPoint() {
    super(ExtraDbTypes.POINT, Point.class);
  }

+  @Override
+  public Point parse(String value) {
+    try {
+      return new Point(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
 }
@@ -3,9 +3,20 @@ package io.ebean.postgis;
 import io.ebean.config.dbplatform.ExtraDbTypes;
 import org.postgis.Polygon;

+import java.sql.SQLException;
+
 public class ScalarTypePgisPolygon extends ScalarTypePgisBase<Polygon> {

  public ScalarTypePgisPolygon() {
    super(ExtraDbTypes.POLYGON, Polygon.class);
  }
+
+  @Override
+  public Polygon parse(String value) {
+    try {
+      return new Polygon(value);
+    } catch (SQLException e) {
+      throw new IllegalStateException(e);
+    }
+  }
 }
@@ -0,0 +1,43 @@
+package org.example.domain;
+
+import io.ebean.annotation.Cache;
+import org.postgis.Point;
+import org.postgis.Polygon;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="mybean_cached")
+@Cache
+public class CachedBean extends BaseEntity {
+  String name;
+
+  Point point;
+
+  Polygon polygon;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Point getPoint() {
+    return point;
+  }
+
+  public void setPoint(Point point) {
+    this.point = point;
+  }
+
+  public Polygon getPolygon() {
+    return polygon;
+  }
+
+  public void setPolygon(Polygon polygon) {
+    this.polygon = polygon;
+  }
+}
@@ -0,0 +1,80 @@
+package org.example.domain;
+
+import io.ebean.DB;
+import org.junit.jupiter.api.Test;
+import org.postgis.Point;
+import org.postgis.Polygon;
+
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestCacheSerialization {
+  @Test
+  public void testCache() throws SQLException {
+    Point p1=new Point(1.0, 2.0);
+    p1.setSrid(4674);
+
+    Polygon pol=new Polygon("SRID=4674;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(1 1, 1 2, 2 2, 2 1, 1 1))");
+
+    CachedBean tb=new CachedBean();
+    tb.setId(2080L);
+    tb.setName("Serialize Test");
+    tb.setPoint(p1);
+    tb.setPolygon(pol);
+
+    DB.insert(tb);
+
+    CachedBean r1=DB.find(CachedBean.class, tb.getId());
+    assertNotNull(r1);
+    assertEquals(p1, r1.getPoint());
+    assertEquals(pol, r1.getPolygon());
+
+    CachedBean r2=DB.find(CachedBean.class, tb.getId());  // this is returned from cache
+    assertNotNull(r2);
+    assertEquals(p1, r2.getPoint());  // and did fail https://github.com/ebean-orm/ebean/issues/3026
+    assertEquals(pol, r2.getPolygon());
+
+  }
+
+  @Test
+  public void testNullCache() throws SQLException {
+    Point p1=new Point(1.0, 2.0);
+    p1.setSrid(4674);
+    Polygon pol=new Polygon("SRID=4674;POLYGON((0 0, 10 0, 10 10, 0 10, 0 0),(1 1, 1 2, 2 2, 2 1, 1 1))");
+
+    CachedBean tb=new CachedBean();
+    tb.setId(2081L);
+    tb.setName("Serialize Test");
+    tb.setPoint(p1);
+    tb.setPolygon(null);
+
+    DB.insert(tb);
+
+    CachedBean r1=DB.find(CachedBean.class, tb.getId());
+    assertNotNull(r1);
+    assertEquals(p1, r1.getPoint());
+    assertNull(r1.getPolygon());
+
+    CachedBean r2=DB.find(CachedBean.class, tb.getId());  // this is returned from cache
+    assertNotNull(r2);
+    assertEquals(p1, r2.getPoint());  // and did fail https://github.com/ebean-orm/ebean/issues/3026
+    assertNull(r1.getPolygon());
+
+    tb.setPoint(null);
+    tb.setPolygon(pol);
+
+    DB.save(tb);
+
+    r1=DB.find(CachedBean.class, tb.getId());
+    assertNotNull(r1);
+    assertEquals(pol, r1.getPolygon());
+    assertNull(r1.getPoint());
+
+    r2=DB.find(CachedBean.class, tb.getId());  // this is returned from cache
+    assertNotNull(r2);
+    assertEquals(pol, r2.getPolygon());  // and did fail https://github.com/ebean-orm/ebean/issues/3026
+    assertNull(r1.getPoint());
+
+  }
+}
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

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

@@ -63,21 +63,21 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -107,7 +107,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:13.13.2</tile>
+            <tile>io.ebean.tile:enhancement:13.17.1</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>querybean-generator</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -80,7 +80,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:13.12.0</tile>
+            <tile>io.ebean.tile:enhancement:13.17.1</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

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

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

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

  <name>ebean test</name>
@@ -28,20 +28,20 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -118,28 +118,28 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

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

@@ -299,7 +299,7 @@
        <extensions>true</extensions>
        <configuration>
          <tiles>
-            <tile>io.ebean.tile:enhancement:13.12.0</tile>
+            <tile>io.ebean.tile:enhancement:13.17.1</tile>
          </tiles>
        </configuration>
      </plugin>
@@ -399,6 +399,11 @@ class Config {
  }

  private void setDockerOptionalParameters() {
+    String mirror = properties.getProperty("ebean.test.containers.mirror");
+    if (mirror != null) {
+      // use a image mirror (when not running locally, i.e. CI)
+      dockerProperties.setProperty("ebean.test.containers.mirror", mirror);
+    }
    // check for shutdown mode on all containers
    String mode = properties.getProperty("ebean.test.shutdownMode");
    if (mode != null) {
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -43,7 +43,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

@@ -64,14 +64,14 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

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

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

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

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-db2</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

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

  <artifactId>ebean-platform-hana</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,13 +14,13 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

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

  <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

  </dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>platforms</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.1</version>
+    <version>13.17.4</version>
  </parent>

  <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -4,12 +4,12 @@
  <parent>
    <groupId>org.avaje</groupId>
    <artifactId>java11-oss</artifactId>
-    <version>3.9</version>
+    <version>3.10</version>
  </parent>

  <groupId>io.ebean</groupId>
  <artifactId>ebean-parent</artifactId>
-  <version>13.17.1</version>
+  <version>13.17.4</version>
  <packaging>pom</packaging>

  <name>ebean parent</name>
@@ -50,10 +50,10 @@
    <ebean-ddl-runner.version>2.2</ebean-ddl-runner.version>
    <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
    <ebean-migration.version>13.7.0</ebean-migration.version>
-    <ebean-test-containers.version>6.3</ebean-test-containers.version>
+    <ebean-test-containers.version>6.7</ebean-test-containers.version>
    <ebean-datasource.version>8.5</ebean-datasource.version>
-    <ebean-agent.version>13.17.1</ebean-agent.version>
-    <ebean-maven-plugin.version>13.17.1</ebean-maven-plugin.version>
+    <ebean-agent.version>13.17.3</ebean-agent.version>
+    <ebean-maven-plugin.version>13.17.3</ebean-maven-plugin.version>
    <surefire.useModulePath>false</surefire.useModulePath>
  </properties>

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

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

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

  <artifactId>test-java16</artifactId>
@@ -18,7 +18,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
    </dependency>

    <dependency>
@@ -30,7 +30,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>

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

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

    <dependency>
@@ -53,7 +53,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.1</version>
+      <version>13.17.4</version>
      <scope>test</scope>
    </dependency>
Author	SHA1	Message	Date
Rob Bygrave	588527a5b9	Version 13.17.4	2023-05-10 00:34:53 +12:00
Rob Bygrave	06cad500c1	#3031 Improve error message	2023-05-10 00:34:27 +12:00
Rob Bygrave	e29b57811b	Update README add end	2023-05-10 00:30:07 +12:00
Rob Bygrave	e6bf46e8c4	Improve error message for #3031	2023-05-09 23:37:05 +12:00
Rob BygraveandGitHub	646f8cc66b	Merge pull request #3050 from ebean-orm/feature/LoadBeanRequest Fix SqlTreeLoadBean to only register new beans into load context	2023-05-09 23:23:31 +12:00
Rob Bygrave	4c9f0f23f0	Fix SqlTreeLoadBean to only register new beans into load context Additionally, refactor LoadBeanRequest moving the MarkedAsDeleted logging	2023-05-09 22:49:17 +12:00
Rob Bygrave	ecfd831603	#3049 - Support for ebean.test.containers.mirror	2023-05-08 17:22:41 +12:00
Rob BygraveandGitHub	b8324905ae	Merge pull request #3036 from Ryszard-Trojnacki/postgis Implemented missing cache functions for Postgis module.	2023-05-08 17:15:14 +12:00
Rob BygraveandGitHub	8cbcd1afad	Merge pull request #3049 from ebean-orm/feature/ebean.test.containers.mirror [ebean-test] Add support for ebean.test.containers.mirror	2023-05-08 17:12:22 +12:00
Rob Bygrave	7970ea39f3	Bump to next snapshot version	2023-05-08 17:11:24 +12:00
robin.bygrave	a399d4f2cd	[ebean-test] Add support for ebean.test.containers.mirror Can use this property to specify a mirror to use for test images when running in CI Currently, we assume that for local builds we actually prefer to not use the mirror (for Arm64 support etc)	2023-05-08 14:35:14 +12:00
Rob Bygrave	5b91e671dd	Version 13.17.3	2023-05-01 14:51:33 +12:00
Rob Bygrave	547843fd52	Bump ebean-agent to 13.17.3 (no effective change)	2023-05-01 13:30:39 +12:00
Rob BygraveandGitHub	21e9c5c3d4	Merge pull request #3044 from ebean-orm/feature/markedAsDeleted-v3 Modify MarkedAsDeleted to ignore beans added during load	2023-05-01 13:21:36 +12:00
Rob Bygrave	05ab1ba25e	Modify MarkedAsDeleted to ignore beans added during load Adds the additional queryIds.contains(id) check	2023-05-01 13:11:03 +12:00
Ryszard Trojnacki	40a6693a4c	Implemented missing cache functions for Postgis module.	2023-04-21 08:58:44 +02:00
Rob Bygrave	e04f33aaf0	Bump to next snapshot version	2023-04-21 16:53:12 +12:00
Rob Bygrave	e4162a5b03	Version 13.17.2	2023-04-21 16:14:48 +12:00
Rob BygraveandGitHub	23e6b18262	Merge pull request #3035 from ebean-orm/feature/markedAsDeleted-mutateAfterLoadingFlag Update MarkedAsDeleted logging to included check for loadingStarted	2023-04-21 02:44:39 +12:00
Rob Bygrave	c8852c521e	Update MarkedAsDeleted logging to included check for loadingStarted	2023-04-21 02:43:34 +12:00
Rob Bygrave	7351258d99	Bump ebean-agent to 13.17.2 (no functional change)	2023-04-21 00:51:57 +12:00
Rob BygraveandGitHub	af9f9585fb	Merge pull request #3034 from ebean-orm/feature/3033 #3033 - Fix for ConcurrentModificationException introduced in 13.17.1	2023-04-21 00:50:23 +12:00
Rob Bygrave	d7f9dd40a0	#3033 - Fix for ConcurrentModificationException introduced in 13.17.1 java.util.ConcurrentModificationException at java.base/java.util.HashMap$HashIterator.nextNode(HashMap.java:1493) at java.base/java.util.HashMap$KeyIterator.next(HashMap.java:1516) at java.base/java.util.AbstractCollection.toString(AbstractCollection.java:472) at java.base/java.lang.String.valueOf(String.java:2951) at io.ebeaninternal.server.core.DefaultBeanLoader.loadBean(DefaultBeanLoader.java:134) at io.ebeaninternal.server.core.DefaultServer.loadBean(DefaultServer.java:475) at io.ebeaninternal.server.loadcontext.DLoadBeanContext$LoadBuffer.loadBean(DLoadBeanContext.java:217) at io.ebean.bean.InterceptReadWrite.loadBeanInternal(InterceptReadWrite.java:742) at io.ebean.bean.InterceptReadWrite.loadBean(InterceptReadWrite.java:724) at io.ebean.bean.InterceptReadWrite.preGetter(InterceptReadWrite.java:837) at ...	2023-04-21 00:49:41 +12:00
Rob BygraveandGitHub	d353b98307	Merge pull request #3029 from ebean-orm/feature/bump-avaje-config Bump avaje-config to version 3.1	2023-04-18 00:04:14 +12:00
Rob Bygrave	3ddd7b4b2b	Bump avaje-config to version 3.1	2023-04-18 00:03:35 +12:00
Rob Bygrave	3960e1deb5	Bump test tile use to 13.17.1	2023-04-17 23:56:20 +12:00
Rob Bygrave	84af78e43c	Bump parent pom to 3.10	2023-04-17 23:52:36 +12:00
Rob Bygrave	cbdbf6d2e0	Bump to next snapshot version	2023-04-17 23:51:58 +12:00