Version 13.17.2

Merge pull request #3035 from ebean-orm/feature/markedAsDeleted-mutateAfterLoadingFlag
Update MarkedAsDeleted logging to included check for loadingStarted
2024-04-21 10:51:47 +00:00 · 2023-04-21 16:14:48 +12:00 · 2023-04-21 02:44:39 +12:00 · 2023-04-21 02:43:34 +12:00 · 2023-04-21 00:51:57 +12:00 · 2023-04-21 00:50:23 +12:00
61 changed files with 303 additions and 258 deletions
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.0</version>
+    <version>13.17.2</version>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-db2</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-h2</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-hana</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-joda-time</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-all</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

  <artifactId>composites</artifactId>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.0</version>
+    <version>13.17.2</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>
@@ -47,7 +47,7 @@ public final class InterceptReadWrite implements EntityBeanIntercept {
   */
  private static final byte FLAG_MUTABLE_HASH_SET = 16;

-  private transient final ReentrantLock lock = new ReentrantLock();
+  private final ReentrantLock lock = new ReentrantLock();
  private transient NodeUsageCollector nodeUsageCollector;
  private transient PersistenceContext persistenceContext;
  private transient BeanLoader beanLoader;
@@ -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.0</version>
+    <version>13.17.2</version>
  </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>provided</scope>
    </dependency>

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

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

@@ -87,11 +87,11 @@
      <plugin>
        <groupId>io.repaint.maven</groupId>
        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
+        <version>2.34</version>
        <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.0</version>
+    <version>13.17.2</version>
  </parent>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-api</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-core-type</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-joda-time</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-autotune</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-querybean</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

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

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-test</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
        <scope>test</scope>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgis</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-redis</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-spring-txn</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

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

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-db2</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-h2</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-hana</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mariadb</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-mysql</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-nuodb</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-oracle</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-postgres</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlite</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

      <dependency>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-sqlserver</artifactId>
-        <version>13.17.0</version>
+        <version>13.17.2</version>
      </dependency>

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

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

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

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

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

@@ -23,4 +23,7 @@ public interface LoadBeanBuffer {

  void configureQuery(SpiQuery<?> query, String lazyLoadProperty);

+  boolean isCache();
+
+  void loadingStarted();
 }
@@ -56,6 +56,7 @@ public final class LoadBeanRequest extends LoadRequest {
   * Return the batch of beans to actually load.
   */
  public Set<EntityBeanIntercept> batch() {
+    loadBuffer.loadingStarted();
    return batch;
  }

@@ -77,7 +78,7 @@ public final class LoadBeanRequest extends LoadRequest {
  public void configureQuery(SpiQuery<?> query, List<Object> idList) {
    query.setMode(Mode.LAZYLOAD_BEAN);
    query.setPersistenceContext(loadBuffer.persistenceContext());
-    query.setLoadDescription(lazy ? "+lazy" : "+query", description());
+    query.setLoadDescription(mode(), description());
    if (lazy) {
      query.setLazyLoadBatchSize(loadBuffer.batchSize());
      if (alreadyLoaded) {
@@ -97,6 +98,10 @@ public final class LoadBeanRequest extends LoadRequest {
    }
  }

+  private String mode() {
+    return lazy ? "+lazy" : loadBuffer.isCache() ? "+cache" : "+query";
+  }
+
  /**
   * Load the beans into the L2 cache if that is requested and check for load failures due to deletes.
   */
@@ -131,6 +131,7 @@ final class DefaultBeanLoader {
      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
@@ -143,7 +144,8 @@ final class DefaultBeanLoader {
    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 {0}", batch);
+      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"));
@@ -52,7 +52,7 @@ abstract class DLoadBaseContext {
  void setLabel(SpiQuery<?> query) {
    String label = parent.planLabel();
    if (label != null) {
-      query.setProfilePath(label, fullPath, parent.profileLocation());
+      query.setProfilePath(label, fullPath + "(" + query.getLoadMode() + ")", parent.profileLocation());
    }
  }

@@ -5,10 +5,7 @@ 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;
@@ -18,9 +15,12 @@ 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.
 */
@@ -156,6 +156,11 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
        // get persistenceContext from first loaded bean into the buffer
        persistenceContext = ebi.persistenceContext();
      }
+      if (loadingStarted.get()) {
+        if (CoreLog.markedAsDeleted.isLoggable(DEBUG)) {
+          CoreLog.markedAsDeleted.log(DEBUG, "Adding to batch after loadingStarted(1)", new RuntimeException("Adding to batch after load(1"));
+        }
+      }
      batch.add(ebi);
    }

@@ -189,6 +194,18 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
      context.configureQuery(query, lazyLoadProperty);
    }

+    @Override
+    public boolean isCache() {
+      return context.cache;
+    }
+
+    private final AtomicBoolean loadingStarted = new AtomicBoolean();
+
+    @Override
+    public void loadingStarted() {
+      loadingStarted.set(true);
+    }
+
    @Override
    public void loadBean(EntityBeanIntercept ebi) {
      // A lock is effectively held by EntityBeanIntercept.loadBean()
@@ -198,6 +215,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 to batch 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());
@@ -211,6 +233,7 @@ final class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContext
      LoadBeanRequest req = new LoadBeanRequest(this, ebi, context.hitCache);
      context.desc.ebeanServer().loadBean(req);
      batch.clear();
+      loadingStarted.set(false);
    }
  }

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>test</scope>
    </dependency>

@@ -48,11 +48,11 @@
      <plugin>
        <groupId>io.repaint.maven</groupId>
        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
+        <version>2.34</version>
        <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.0</version>
+    <version>13.17.2</version>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>provided</scope>
    </dependency>

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

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

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

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>test</scope>
    </dependency>

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

@@ -100,12 +100,12 @@
      <plugin>
        <groupId>io.repaint.maven</groupId>
        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
+        <version>2.34</version>
        <extensions>true</extensions>
        <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.0</version>
+    <version>13.17.2</version>
  </parent>

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

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

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

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

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

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

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

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

@@ -88,11 +88,11 @@
      <plugin>
        <groupId>io.repaint.maven</groupId>
        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
+        <version>2.34</version>
        <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.0</version>
+    <version>13.17.2</version>
  </parent>

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

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

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

@@ -92,11 +92,11 @@
      <plugin>
        <groupId>io.repaint.maven</groupId>
        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
+        <version>2.34</version>
        <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.0</version>
+    <version>13.17.2</version>
  </parent>

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

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</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.0</version>
+    <version>13.17.2</version>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>test</scope>
    </dependency>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>test</scope>
    </dependency>

@@ -76,11 +76,11 @@
      <plugin>
        <groupId>io.repaint.maven</groupId>
        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
+        <version>2.34</version>
        <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.0</version>
+    <version>13.17.2</version>
  </parent>

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

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

@@ -102,7 +102,7 @@
      <plugin>
        <groupId>io.repaint.maven</groupId>
        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
+        <version>2.34</version>
        <extensions>true</extensions>
        <configuration>
          <tiles>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.0</version>
+    <version>13.17.2</version>
  </parent>

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-core</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

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

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

@@ -295,11 +295,11 @@
      <plugin>
        <groupId>io.repaint.maven</groupId>
        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
+        <version>2.34</version>
        <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,20 @@ package io.ebean.test;
 * Use in test code when the CurrentUserProvider and/or CurrentTenantProvider were configured by
 * this ebean-test-config plugin.
 * <p>
- * That is, the ebean-test-config plugin will check if there ia a CurrentUserProvider and if not
+ * This is not automatically available. If you wish to use this class in your Tenant testing, you must set the
+ * application.properties setting to:
+ *
+ * <pre>
+ * ebean.test.registerTestTenantProvider=true
+ * </pre>
+ *
+ * or application-test.yaml:
+ * <pre>
+ *   ebean:
+ *     test:
+ *       registerTestTenantProvider: true
+ * </pre>.
+ * If set to true, the ebean-test-config plugin will check if there is a CurrentUserProvider and if not
 * automatically set one and that provider reads the 'current user' from this UserContext.
 * <pre>{@code
 *
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>13.17.0</version>
+    <version>13.17.2</version>
  </parent>

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

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

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

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

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

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

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

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

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

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

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

  <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</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.0</version>
+    <version>13.17.2</version>
  </parent>

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

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

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

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

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

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
    </dependency>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-api</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</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.0</version>
+  <version>13.17.2</version>
  <packaging>pom</packaging>

  <name>ebean parent</name>
@@ -52,8 +52,8 @@
    <ebean-migration.version>13.7.0</ebean-migration.version>
    <ebean-test-containers.version>6.3</ebean-test-containers.version>
    <ebean-datasource.version>8.5</ebean-datasource.version>
-    <ebean-agent.version>13.17.0</ebean-agent.version>
-    <ebean-maven-plugin.version>13.17.0</ebean-maven-plugin.version>
+    <ebean-agent.version>13.17.2</ebean-agent.version>
+    <ebean-maven-plugin.version>13.17.2</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.0</version>
+    <version>13.17.2</version>
  </parent>

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

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

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

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

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

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

    <dependency>
@@ -53,7 +53,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-test</artifactId>
-      <version>13.17.0</version>
+      <version>13.17.2</version>
      <scope>test</scope>
    </dependency>
Author	SHA1	Message	Date
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
Rob Bygrave	548bf871a9	Version 13.17.1	2023-04-17 23:31:00 +12:00
Rob BygraveandGitHub	b5245544d2	Merge pull request #3028 from ebean-orm/feature/markedAsDeleted-beforeState Change MarkedAsDeleted to log batch before state	2023-04-17 22:40:29 +12:00
Rob Bygrave	a986d0c8cd	Change MarkedAsDeleted to log batch before state	2023-04-17 22:18:33 +12:00
Rob BygraveandGitHub	0e02449f67	Merge pull request #3027 from rvowles/docs/update-ebean-test Update the documentation for test tenants	2023-04-17 17:52:48 +12:00
Richard Vowles	19389fb9d4	Update the documentation for test tenants The existing docs for test tenants is no longer correct and additional class level docs point users in the right direction.	2023-04-17 16:22:06 +12:00
Rob BygraveandGitHub	ab1a79281b	Merge pull request #3023 from ebean-orm/feature/profileLabel-withQueryType Add the [+query,+cache,+lazy] query type to the profile label	2023-04-13 19:46:27 +12:00
Rob BygraveandGitHub	073669d312	Merge pull request #3025 from ebean-orm/fix/3024 Fix for #3024 NPE when lazy loading after deserialising an entity bean	2023-04-13 19:46:08 +12:00
Rob Bygrave	f66662fdfa	Fix for #3024 NPE when lazy loading after deserialising an entity bean	2023-04-13 19:42:14 +12:00
Rob Bygrave	04b0d23932	Update tiles-maven-plugin to version 2.34	2023-04-11 10:34:52 +12:00
Rob Bygrave	af613d3096	Add the [+query,+cache,+lazy] query type to the profile label	2023-04-06 21:59:51 +12:00
Rob Bygrave	ecd27e145e	bump to next snapshot version	2023-04-06 17:07:52 +12:00