[maven-release-plugin] prepare release ebean-parent-13.1.0

Bump to 13.1.0-SNAPSHOT
2024-04-21 10:51:47 +00:00 · 2022-04-06 21:55:12 +12:00 · 2022-04-06 21:51:07 +12:00 · 2022-04-06 21:47:19 +12:00 · 2022-04-06 21:39:06 +12:00 · 2022-04-06 21:34:48 +12:00
1532 changed files with 20322 additions and 9606 deletions
@@ -13,7 +13,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [8]
+        java_version: [11]
        os: [ubuntu-latest]

    steps:
@@ -0,0 +1,41 @@
+
+name: ebean EA
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '39 6 * * 1,3,5'
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+      matrix:
+        ## valhalla - failing on javadoc with:
+        ## javadoc: error - The code being documented uses packages in the unnamed module, but the packages defined in https://ebean.io/platforms/ebean-platform-h2/apidocs/ are in named modules.
+        java_version: [17,18,19,loom,metropolis,panama]
+        os: [ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Java
+      uses: oracle-actions/setup-java@v1
+      with:
+        website: jdk.java.net
+        release: ${{ matrix.java_version }}
+    - name: Maven cache
+      uses: actions/cache@v2
+      env:
+        cache-name: maven-cache
+      with:
+        path:
+          ~/.m2
+        key: build-${{ env.cache-name }}
+    - name: Build with Maven
+      run: mvn package
+
@@ -16,7 +16,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        java_version: [8.0.192, 8, 11.0.3, 11, 17]
+        java_version: [11, 17]
        os: [ubuntu-latest]

    steps:
@@ -11,6 +11,16 @@
 [![SqlServer](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml)
 [![Yugabyte](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml)

+
+#### Builds against EA (Early Access) versions of Java (19, Loom, panama etc)
+
+[![ebean EA](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml)
+[![datasource EA](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml)
+[![migration EA](https://github.com/ebean-orm/ebean-migration/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-migration/actions/workflows/jdk-ea.yml)
+[![test-docker EA](https://github.com/ebean-orm/ebean-test-docker/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-test-docker/actions/workflows/jdk-ea.yml)
+[![ebean-agent EA](https://github.com/ebean-orm/ebean-agent/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-agent/actions/workflows/jdk-ea.yml)
+
+
 # Sponsors
 <table>
  <tbody>
@@ -39,15 +49,15 @@
  </tbody>
 </table>

-# Need help?
+## Need help?
 Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean

-# Documentation
+## Documentation
 Goto [https://ebean.io/docs/](https://ebean.io/docs/)


-## Maven central links:
-[Maven central - ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20AND%20a%3A%22ebean%22 "maven central ebean")
+## Maven central
+[Maven central - io.ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20)
+

-[Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cebean "maven central all related projects")

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-clickhouse</name>
+  <description>ebean-clickhouse composite</description>
+  <artifactId>ebean-clickhouse</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-clickhouse</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.clickhouse.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.clickhouse {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.clickhouse;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-cockroach</name>
+  <description>ebean-cockroach composite</description>
+  <artifactId>ebean-cockroach</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.cockroach.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.cockroach {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.postgres;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-db2</name>
+  <description>ebean-db2 composite</description>
+  <artifactId>ebean-db2</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-db2</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.db2.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.db2 {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.db2;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-h2</name>
+  <description>ebean-h2 composite</description>
+  <artifactId>ebean-h2</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-h2</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.h2.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.h2 {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.h2;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-hana</name>
+  <description>ebean-hana composite</description>
+  <artifactId>ebean-hana</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-hana</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.hana.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.hana {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.hana;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-mariadb</name>
+  <description>ebean-mariadb composite</description>
+  <artifactId>ebean-mariadb</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-mariadb</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.mariadb.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.mariadb {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.mariadb;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-mysql</name>
+  <description>ebean-mysql composite</description>
+  <artifactId>ebean-mysql</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-mysql</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.mysql.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.mysql {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.mysql;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-nuodb</name>
+  <description>ebean-nuodb composite</description>
+  <artifactId>ebean-nuodb</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-nuodb</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.nuodb.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.nuodb {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.nuodb;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-oracle</name>
+  <description>ebean-oracle composite</description>
+  <artifactId>ebean-oracle</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-oracle</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.oracle.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.oracle {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.oracle;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-postgres</name>
+  <description>ebean-postgres composite</description>
+  <artifactId>ebean-postgres</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.postgres.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.postgres {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.postgres;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-sqlite</name>
+  <description>ebean-sqlite composite</description>
+  <artifactId>ebean-sqlite</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-sqlite</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.sqlite.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.sqlite {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.sqlite;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-sqlserver</name>
+  <description>ebean-sqlserver composite</description>
+  <artifactId>ebean-sqlserver</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-sqlserver</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.sqlserver.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.sqlserver {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.sqlserver;
+
+}
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>composites</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <name>ebean-yugabyte</name>
+  <description>ebean-yugabyte composite</description>
+  <artifactId>ebean-yugabyte</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+    </dependency>
+
+    <!-- Technically optional but most expected to use query beans -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-querybean</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-postgres</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+  </dependencies>
+
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
+</project>
@@ -0,0 +1,7 @@
+package io.ebean.yugabyte.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}
@@ -0,0 +1,9 @@
+module io.ebean.yugabyte {
+
+  requires transitive io.ebean.api;
+  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
+  requires transitive io.ebean.querybean;
+  requires transitive io.ebean.platform.postgres;
+
+}
@@ -2,57 +2,51 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <artifactId>ebean-parent</artifactId>
+    <artifactId>composites</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.15.1</version>
+    <version>13.1.0</version>
  </parent>

-  <name>ebean composite</name>
-  <description>Composite of common runtime dependencies</description>
+  <name>ebean (all platforms)</name>
+  <description>composite of common runtime dependencies for all platforms</description>
  <artifactId>ebean</artifactId>

  <dependencies>

+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core</artifactId>
+      <version>13.1.0</version>
+    </dependency>
+
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-datasource</artifactId>
      <version>${ebean-datasource.version}</version>
    </dependency>

-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-api</artifactId>
-      <version>12.15.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>12.15.1</version>
-    </dependency>
-
    <!-- Technically optional but most expected to use query beans -->
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-querybean</artifactId>
-      <version>12.15.1</version>
+      <version>13.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-all</artifactId>
+      <version>13.1.0</version>
    </dependency>

  </dependencies>

-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <scm>
+    <tag>ebean-parent-13.1.0</tag>
+  </scm>
 </project>
@@ -2,6 +2,7 @@ module io.ebean {

  requires transitive io.ebean.api;
  requires transitive io.ebean.core;
+  requires transitive io.ebean.datasource;
  requires transitive io.ebean.querybean;
-
+  requires transitive io.ebean.platform.all;
 }
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>13.1.0</version>
+  </parent>
+
+  <artifactId>composites</artifactId>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>ebean</module>
+    <module>ebean-clickhouse</module>
+    <module>ebean-cockroach</module>
+    <module>ebean-db2</module>
+    <module>ebean-h2</module>
+    <module>ebean-hana</module>
+<!--    <module>hsqldb</module>-->
+    <module>ebean-mariadb</module>
+    <module>ebean-mysql</module>
+    <module>ebean-nuodb</module>
+    <module>ebean-oracle</module>
+    <module>ebean-postgres</module>
+<!--    <module>sqlanywhere</module>-->
+    <module>ebean-sqlite</module>
+    <module>ebean-sqlserver</module>
+    <module>ebean-yugabyte</module>
+  </modules>
+
+</project>
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>ebean-parent</artifactId>
    <groupId>io.ebean</groupId>
-    <version>12.15.1</version>
+    <version>13.1.0</version>
  </parent>

  <name>ebean api</name>
@@ -49,7 +49,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-annotation</artifactId>
-      <version>7.6</version>
+      <version>7.8</version>
    </dependency>

    <dependency>
@@ -80,15 +80,6 @@
      <optional>true</optional>
    </dependency>

-    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
-     and not require a separate module for it -->
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>${h2database.version}</version>
-      <optional>true</optional>
-    </dependency>
-
    <dependency>
      <groupId>javax.transaction</groupId>
      <artifactId>jta</artifactId>
@@ -106,25 +97,10 @@
    <dependency>
      <groupId>io.avaje</groupId>
      <artifactId>junit</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
      <scope>test</scope>
    </dependency>

  </dependencies>

-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.24</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
-          </tiles>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
@@ -74,40 +74,16 @@ public interface BeanState {
   */
  Set<String> loadedProps();

-  /**
-   * Deprecated migrate to loadedProps().
-   */
-  @Deprecated
-  default Set<String> getLoadedProps() {
-    return loadedProps();
-  }
-
  /**
   * Return the set of changed properties.
   */
  Set<String> changedProps();

-  /**
-   * Deprecated migrate to changedProps().
-   */
-  @Deprecated
-  default Set<String> getChangedProps() {
-    return changedProps();
-  }
-
  /**
   * Return a map of the updated properties and their new and old values.
   */
  Map<String, ValuePair> dirtyValues();

-  /**
-   * Deprecated migrate to dirtyValues().
-   */
-  @Deprecated
-  default Map<String, ValuePair> getDirtyValues() {
-    return dirtyValues();
-  }
-
  /**
   * Return true if the bean is readOnly.
   * <p>
@@ -139,24 +115,9 @@ public interface BeanState {
   */
  Map<String, Exception> loadErrors();

-  /**
-   * Deprecated migrate to loadErrors().
-   */
-  @Deprecated
-  default Map<String, Exception> getLoadErrors() {
-    return loadErrors();
-  }
-
  /**
   * Return the sort order value for an order column.
   */
  int sortOrder();

-  /**
-   * Deprecated migrate to sortOrder().
-   */
-  @Deprecated
-  default int getSortOrder() {
-    return sortOrder();
-  }
 }
@@ -300,7 +300,7 @@ public interface Database {
   * Create a new instance of T that is an EntityBean.
   * <p>
   * Useful if you use BeanPostConstructListeners or &#64;PostConstruct Annotations.
-   * In this case you should not use "new Bean...()". Making all bean construtors protected
+   * In this case you should not use "new Bean...()". Making all bean constructors protected
   * could be a good idea here.
   * </p>
   */
@@ -26,7 +26,7 @@ import java.util.concurrent.locks.ReentrantLock;
 * methods on the DB singleton such as {@link DB#find(Class)} are just a
 * convenient way of using the 'default/primary' Database.
 */
-public class DatabaseFactory {
+public final class DatabaseFactory {

  private static final ReentrantLock lock = new ReentrantLock();
  private static SpiContainer container;
@@ -10,7 +10,7 @@ import java.util.concurrent.locks.ReentrantLock;
 * <p/>
 * Intended for internal use as part of bootup, construction, registration of the default database.
 */
-class DbPrimary {
+final class DbPrimary {

  private static final ReentrantLock lock = new ReentrantLock();
  private static String defaultServerName;
@@ -12,7 +12,7 @@ import java.util.Properties;
 *
 * @author Roland Praml, FOCONIS AG
 */
-public class EbeanVersion {
+public final class EbeanVersion {

  private static final Logger log = LoggerFactory.getLogger("io.ebean");

@@ -25,7 +25,7 @@ import java.util.Map;
 *
 * @see Query#where()
 */
-public class Expr {
+public final class Expr {

  private Expr() {
  }
@@ -112,19 +112,6 @@ public interface ExtendedServer {
   */
  <T> Stream<T> findStream(Query<T> query, Transaction transaction);

-  /**
-   * Deprecated - migrate to findStream().
-   * <p>
-   * Execute the query returning the result as a Stream.
-   * <p>
-   * Note that this can support very large queries iterating any number of results.
-   * To do so internally it can use multiple persistence contexts.
-   * <p>
-   * Note that the stream needs to be closed so use with try with resources.
-   */
-  @Deprecated
-  <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction);
-
  /**
   * Execute the query visiting the each bean one at a time.
   * <p>
@@ -31,7 +31,7 @@ import java.io.Serializable;
 * @author mario
 * @author rbygrave
 */
-public class FetchConfig implements Serializable {
+public final class FetchConfig implements Serializable {

  private static final long serialVersionUID = 1L;

@@ -750,29 +750,6 @@ public interface Query<T> extends CancelableQuery {
   */
  Stream<T> findStream();

-  /**
-   * Deprecated - migrate to findStream.
-   * <p>
-   * Execute the query returning the result as a Stream.
-   * <p>
-   * Note that this uses multiple persistence contexts such that we can use
-   * it with a large number of results.
-   * </p>
-   * <pre>{@code
-   *
-   *  // use try with resources to ensure Stream is closed
-   *
-   *  try (Stream<Customer> stream = query.findLargeStream()) {
-   *    stream
-   *    .map(...)
-   *    .collect(...);
-   *  }
-   *
-   * }</pre>
-   */
-  @Deprecated
-  Stream<T> findLargeStream();
-
  /**
   * Execute the query processing the beans one at a time.
   * <p>
@@ -74,18 +74,6 @@ public interface SqlQuery extends Serializable, CancelableQuery {
  @Nullable
  SqlRow findOne();

-  /**
-   * Deprecated migrate to use {@link #mapTo(RowMapper)}
-   */
-  @Deprecated
-  <T> T findOne(RowMapper<T> mapper);
-
-  /**
-   * Deprecated migrate to use {@link #mapTo(RowMapper)}
-   */
-  @Deprecated
-  <T> List<T> findList(RowMapper<T> mapper);
-
  /**
   * Execute the query reading each row from ResultSet using the RowConsumer.
   * <p>
@@ -121,50 +109,6 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   */
  Optional<SqlRow> findOneOrEmpty();

-  /**
-   * Deprecated - migrate to <code>.mapToScalar(attributeType).findOne()</code>.
-   * <pre>{@code
-   *
-   *    .mapToScalar(BigDecimal.class)
-   *    .findOne();
-   * }
-   */
-  @Deprecated
-  <T> T findSingleAttribute(Class<T> attributeType);
-
-  /**
-   * Deprecated - migrate to <code>.mapToScalar(BigDecimal.class).findOne()</code>.
-   * <pre>{@code
-   *
-   *    .mapToScalar(BigDecimal.class)
-   *    .findOne();
-   * }
-   */
-  @Deprecated
-  BigDecimal findSingleDecimal();
-
-  /**
-   * Deprecated - migrate to <code>.mapToScalar(Long.class).findOne()</code>.
-   * <pre>{@code
-   *
-   *    .mapToScalar(Long.class)
-   *    .findOne();
-   * }
-   */
-  @Deprecated
-  Long findSingleLong();
-
-  /**
-   * Deprecated - migrate to <code>.mapToScalar(Long.class).findList()</code>.
-   * <pre>{@code
-   *
-   *    .mapToScalar(Long.class)
-   *    .findList();
-   * }
-   */
-  @Deprecated
-  <T> List<T> findSingleAttributeList(Class<T> attributeType);
-
  /**
   * Set one of more positioned parameters.
   * <p>
@@ -194,12 +138,6 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   */
  SqlQuery setParameters(Object... values);

-  /**
-   * Deprecated migrate to setParameters(Object... values)
-   */
-  @Deprecated
-  SqlQuery setParams(Object... values);
-
  /**
   * Set the next bind parameter by position.
   * <pre>{@code
@@ -246,6 +184,16 @@ public interface SqlQuery extends Serializable, CancelableQuery {
   */
  SqlQuery setParameter(Object value);

+  /**
+   * Set a null parameter by position.
+   */
+  SqlQuery setNullParameter(int position, int jdbcType);
+
+  /**
+   * Set a null parameter by name.
+   */
+  SqlQuery setNullParameter(String name, int jdbcType);
+
  /**
   * Bind the parameter by its index position (1 based like JDBC).
   * <p>
@@ -287,12 +287,6 @@ public interface SqlUpdate {
   */
  SqlUpdate setParameters(Object... values);

-  /**
-   * Deprecated migrate to setParameters(Object... values).
-   */
-  @Deprecated
-  SqlUpdate setParams(Object... values);
-
  /**
   * Set the next bind parameter by position.
   *
@@ -300,12 +294,6 @@ public interface SqlUpdate {
   */
  SqlUpdate setParameter(Object value);

-  /**
-   * Deprecated migrate to setParameter(value).
-   */
-  @Deprecated
-  SqlUpdate setNextParameter(Object value);
-
  /**
   * Set a parameter via its index position.
   */
@@ -11,7 +11,7 @@ import java.util.ServiceLoader;
 /**
 * Lookup internal services.
 */
-class XServiceProvider {
+final class XServiceProvider {

  private static SpiRawSqlService rawSqlService = initRawSql();

@@ -829,7 +829,7 @@ public final class EntityBeanIntercept implements Serializable {
  /**
   * Load the bean when it is a reference.
   */
-  protected void loadBean(int loadProperty) {
+  void loadBean(int loadProperty) {
    lock.lock();
    try {
      if (beanLoader == null) {
@@ -886,7 +886,7 @@ public final class EntityBeanIntercept implements Serializable {
   * Helper method to check if two objects are equal.
   */
  @SuppressWarnings({"unchecked", "rawtypes"})
-  protected static boolean notEqual(Object obj1, Object obj2) {
+  static boolean notEqual(Object obj1, Object obj2) {
    if (obj1 == null) {
      return (obj2 != null);
    }
@@ -23,14 +23,6 @@ public interface ServerCacheManager {
   */
  boolean localL2Caching();

-  /**
-   * Deprecated migrate to localL2Caching().
-   */
-  @Deprecated
-  default boolean isLocalL2Caching() {
-    return localL2Caching();
-  }
-
  /**
   * Return all the cache regions.
   */
@@ -46,77 +38,36 @@ public interface ServerCacheManager {
   */
  void enabledRegions(String regions);

-  /**
-   * Deprecated migrate to enabledRegions().
-   */
-  @Deprecated
-  default void setEnabledRegions(String regions) {
-    enabledRegions(regions);
-  }
-
  /**
   * Enable or disable all the cache regions.
   */
  void allRegionsEnabled(boolean enabled);

-  /**
-   * Deprecated migrate to allRegionsEnabled().
-   */
-  @Deprecated
-  default void setAllRegionsEnabled(boolean enabled) {
-    allRegionsEnabled(enabled);
-  }
-
  /**
   * Return the cache region by name. Typically, to enable or disable the region.
   */
  ServerCacheRegion region(String name);

-  @Deprecated
-  default ServerCacheRegion getRegion(String name) {
-    return region(name);
-  }
-
  /**
   * Return the cache for mapping natural keys to id values.
   */
  ServerCache naturalKeyCache(Class<?> beanType);

-  @Deprecated
-  default ServerCache getNaturalKeyCache(Class<?> beanType) {
-    return naturalKeyCache(beanType);
-  }
-
  /**
   * Return the cache for beans of a particular type.
   */
  ServerCache beanCache(Class<?> beanType);

-  @Deprecated
-  default ServerCache getBeanCache(Class<?> beanType) {
-    return beanCache(beanType);
-  }
-
  /**
   * Return the cache for associated many properties of a bean type.
   */
  ServerCache collectionIdsCache(Class<?> beanType, String propertyName);

-  @Deprecated
-  default ServerCache getCollectionIdsCache(Class<?> beanType, String propertyName) {
-    return collectionIdsCache(beanType, propertyName);
-  }
-
  /**
   * Return the cache for query results of a particular type of bean.
   */
  ServerCache queryCache(Class<?> beanType);

-  @Deprecated
-  default ServerCache getQueryCache(Class<?> beanType) {
-    return queryCache(beanType);
-  }
-
  /**
   * This clears both the bean and query cache for a given type.
   */
@@ -10,14 +10,6 @@ public interface ServerCacheRegion {
   */
  String name();

-  /**
-   * Deprecated migrate to name().
-   */
-  @Deprecated
-  default String getName() {
-    return name();
-  }
-
  /**
   * Return true if the cache region is enabled.
   */
@@ -0,0 +1,42 @@
+package io.ebean.config;
+
+import java.util.concurrent.Callable;
+
+/**
+ * BackgroundExecutorWrapper that can be used to wrap tasks that are sent to background (i.e. another thread).
+ * It should copy all necessary thread-local variables. See {@link MdcBackgroundExecutorWrapper} for implementation details.
+ *
+ * @author Roland Praml, FOCONIS AG
+ */
+public interface BackgroundExecutorWrapper {
+
+  /**
+   * Wrap the task with MDC context if defined.
+   */
+  <T> Callable<T> wrap(Callable<T> task);
+
+  /**
+   * Wrap the task with MDC context if defined.
+   */
+  Runnable wrap(Runnable task);
+
+  /**
+   * Combines two wrappers by nesting them.
+   */
+  default BackgroundExecutorWrapper with(BackgroundExecutorWrapper inner) {
+    return new BackgroundExecutorWrapper() {
+
+      @Override
+      public Runnable wrap(Runnable task) {
+        return BackgroundExecutorWrapper.this.wrap(inner.wrap(task));
+      }
+
+      @Override
+      public <T> Callable<T> wrap(Callable<T> task) {
+        return BackgroundExecutorWrapper.this.wrap(inner.wrap(task));
+      }
+    };
+
+  }
+
+}
@@ -445,6 +445,7 @@ public class DatabaseConfig {

  private int backgroundExecutorSchedulePoolSize = 1;
  private int backgroundExecutorShutdownSecs = 30;
+  private BackgroundExecutorWrapper backgroundExecutorWrapper = new MdcBackgroundExecutorWrapper();

  // defaults for the L2 bean caching

@@ -1463,6 +1464,20 @@ public class DatabaseConfig {
    this.backgroundExecutorShutdownSecs = backgroundExecutorShutdownSecs;
  }

+  /**
+   * Return the background executor wrapper.
+   */
+  public BackgroundExecutorWrapper getBackgroundExecutorWrapper() {
+    return backgroundExecutorWrapper;
+  }
+
+  /**
+   * Sets the background executor wrapper. The wrapper is used when a task is sent to background and should copy the thread-locals.
+   */
+  public void setBackgroundExecutorWrapper(BackgroundExecutorWrapper backgroundExecutorWrapper) {
+    this.backgroundExecutorWrapper = backgroundExecutorWrapper;
+  }
+
  /**
   * Return the L2 cache default max size.
   */
@@ -2884,6 +2899,7 @@ public class DatabaseConfig {

    backgroundExecutorSchedulePoolSize = p.getInt("backgroundExecutorSchedulePoolSize", backgroundExecutorSchedulePoolSize);
    backgroundExecutorShutdownSecs = p.getInt("backgroundExecutorShutdownSecs", backgroundExecutorShutdownSecs);
+    backgroundExecutorWrapper = p.createInstance(BackgroundExecutorWrapper.class, "backgroundExecutorWrapper", backgroundExecutorWrapper);
    disableClasspathSearch = p.getBoolean("disableClasspathSearch", disableClasspathSearch);
    currentUserProvider = p.createInstance(CurrentUserProvider.class, "currentUserProvider", currentUserProvider);
    databasePlatform = p.createInstance(DatabasePlatform.class, "databasePlatform", databasePlatform);
@@ -184,17 +184,4 @@ public class DbConstraintNaming {
    return normalise.normaliseColumn(tableName);
  }

-  /**
-   * Lower case the table name checking for quoted identifiers.
-   */
-  public String lowerTableName(String tableName) {
-    return normalise.lowerTableName(tableName);
-  }
-
-  /**
-   * Lower case the column name checking for quoted identifiers.
-   */
-  public String lowerColumnName(String name) {
-    return normalise.lowerColumnName(name);
-  }
 }
@@ -55,53 +55,19 @@ public class DbConstraintNormalise {
    return value.replace("(","").replace(")","");
  }

-  /**
-   * Lower case the table name checking for quoted identifiers.
-   */
-  public String lowerTableName(String tableName) {
-    if (lowerCaseTables && notQuoted(tableName)) {
-      return tableName.toLowerCase();
-    }
-    return tableName;
-  }
-
-  /**
-   * Lower case the column name checking for quoted identifiers.
-   */
-  public String lowerColumnName(String name) {
-    if (lowerCaseColumns && notQuoted(name)) {
-      return name.toLowerCase();
-    }
-    return name;
-  }
-
  /**
   * Trim off the platform quoted identifier quotes like [ ' and ".
   */
-  public boolean notQuoted(String tableName) {
+  public String trimQuotes(String identifier) {

-    // remove quoted identifier characters
-    for (String quotedIdentifier : quotedIdentifiers) {
-      if (tableName.contains(quotedIdentifier)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Trim off the platform quoted identifier quotes like [ ' and ".
-   */
-  public String trimQuotes(String tableName) {
-
-    if (tableName == null) {
+    if (identifier == null) {
      return "";
    }
    // remove quoted identifier characters
    for (String quotedIdentifier : quotedIdentifiers) {
-      tableName = tableName.replace(quotedIdentifier, "");
+      identifier = identifier.replace(quotedIdentifier, "");
    }
-    return tableName;
+    return identifier;
  }


@@ -0,0 +1,52 @@
+package io.ebean.config;
+
+import org.slf4j.MDC;
+
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+/**
+ * Propagates MDC context for tasks executed in the background.
+ */
+public final class MdcBackgroundExecutorWrapper implements BackgroundExecutorWrapper {
+
+  /**
+   * Wrap the task with MDC context if defined.
+   */
+  @Override
+  public <T> Callable<T> wrap(Callable<T> task) {
+    final Map<String, String> map = MDC.getCopyOfContextMap();
+    if (map == null) {
+      return task;
+    } else {
+      return () -> {
+        MDC.setContextMap(map);
+        try {
+          return task.call();
+        } finally {
+          MDC.clear();
+        }
+      };
+    }
+  }
+
+  /**
+   * Wrap the task with MDC context if defined.
+   */
+  @Override
+  public Runnable wrap(Runnable task) {
+    final Map<String, String> map = MDC.getCopyOfContextMap();
+    if (map == null) {
+      return task;
+    } else {
+      return () -> {
+        MDC.setContextMap(map);
+        try {
+          task.run();
+        } finally {
+          MDC.clear();
+        }
+      };
+    }
+  }
+}
@@ -25,14 +25,6 @@ public class QueryPlanCapture {
    return database;
  }

-  /**
-   * Deprecated migrate to database().
-   */
-  @Deprecated
-  public Database getDatabase() {
-    return database;
-  }
-
  /**
   * Return the captured query plans.
   */
@@ -40,11 +32,4 @@ public class QueryPlanCapture {
    return plans;
  }

-  /**
-   * Deprecated migrate to plans().
-   */
-  @Deprecated
-  public List<MetaQueryPlan> getPlans() {
-    return plans;
-  }
 }
@@ -165,7 +165,7 @@ public class DatabasePlatform {
   * want to use quoted identifiers for. The backticks get converted to the
   * appropriate characters in convertQuotedIdentifiers
   */
-  private static final char BACK_TICK = '`';
+  private static final char[] QUOTED_IDENTIFIERS = new char[] { '"', '\'', '[', ']', '`' };

  /**
   * The non-escaped like clause (to stop slash being escaped on some platforms).
@@ -662,8 +662,8 @@ public class DatabasePlatform {
  public String convertQuotedIdentifiers(String dbName) {
    // Ignore null values e.g. schema name or catalog
    if (dbName != null && !dbName.isEmpty()) {
-      if (dbName.charAt(0) == BACK_TICK) {
-        if (dbName.charAt(dbName.length() - 1) == BACK_TICK) {
+      if (isQuote(dbName.charAt(0))) {
+        if (isQuote(dbName.charAt(dbName.length() - 1))) {
          return openQuote + dbName.substring(1, dbName.length() - 1) + closeQuote;
        } else {
          log.error("Missing backquote on [" + dbName + "]");
@@ -675,6 +675,15 @@ public class DatabasePlatform {
    return dbName;
  }

+  private boolean isQuote(char ch) {
+    for (char identifer : QUOTED_IDENTIFIERS) {
+      if (identifer == ch) {
+        return true;
+      }
+    }
+    return false;
+  }
+
  /**
   * Remove quoted identifier quotes from the table or column name if present.
   */
@@ -0,0 +1,46 @@
+package io.ebean.config.dbplatform;
+
+import io.ebean.annotation.Platform;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+
+/**
+ * Provides DatabasePlatform matching by name, JDBC product name and specific platform enum.
+ * <p>
+ * DatabasePlatformProvider implementations are service loaded and custom implementations
+ * can be added and used via the service loading mechanism.
+ */
+public interface DatabasePlatformProvider {
+
+  /**
+   * Match on the lower case platform name.
+   */
+  boolean match(String name);
+
+  /**
+   * Create the platform based on the lower case platform name.
+   */
+  DatabasePlatform create(String name);
+
+  /**
+   * Match on the lower case JDBC metadata product name.
+   */
+  boolean matchByProductName(String productName);
+
+  /**
+   * Create the platform based on the lower case JDBC metadata product name.
+   */
+  DatabasePlatform create(int majorVersion, int minorVersion, DatabaseMetaData meta, Connection connection);
+
+  /**
+   * Match on the specific platform.
+   */
+  boolean matchPlatform(Platform platform);
+
+  /**
+   * Create the specific platform.
+   */
+  DatabasePlatform create(Platform platform);
+
+}
@@ -1,4 +0,0 @@
-/**
- * Clickhouse DB specific support.
- */
-package io.ebean.config.dbplatform.clickhouse;
@@ -1,4 +0,0 @@
-/**
- * Cockroach DB specific support.
- */
-package io.ebean.config.dbplatform.cockroach;
@@ -1,4 +0,0 @@
-/**
- * DB2 specific support.
- */
-package io.ebean.config.dbplatform.db2;
@@ -1,4 +0,0 @@
-/**
- * H2 specific support.
- */
-package io.ebean.config.dbplatform.h2;
@@ -1,4 +0,0 @@
-/**
- * SAP HANA specific support.
- */
-package io.ebean.config.dbplatform.hana;
@@ -1,4 +0,0 @@
-/**
- * Hsqldb specific support.
- */
-package io.ebean.config.dbplatform.hsqldb;
@@ -1,4 +0,0 @@
-/**
- * MySql specific support.
- */
-package io.ebean.config.dbplatform.mysql;
@@ -1,4 +0,0 @@
-/**
- * NuoDB specific support.
- */
-package io.ebean.config.dbplatform.nuodb;
@@ -1,4 +0,0 @@
-/**
- * Oracle specific support.
- */
-package io.ebean.config.dbplatform.oracle;
@@ -1,4 +0,0 @@
-/**
- * Postgres specific support.
- */
-package io.ebean.config.dbplatform.postgres;
@@ -1,4 +0,0 @@
-/**
- * SqlAnywhere specific support.
- */
-package io.ebean.config.dbplatform.sqlanywhere;
@@ -1,4 +0,0 @@
-/**
- * Sqlite specific support.
- */
-package io.ebean.config.dbplatform.sqlite;
@@ -1,4 +0,0 @@
-/**
- * SqlServer specific support.
- */
-package io.ebean.config.dbplatform.sqlserver;
@@ -1,12 +0,0 @@
-package io.ebean.config.dbplatform.yugabyte;
-
-import io.ebean.annotation.Platform;
-import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-
-public class YugabytePlaform extends PostgresPlatform {
-
-  public YugabytePlaform() {
-    super();
-    this.platform = Platform.YUGABYTE;
-  }
-}
@@ -10,11 +10,4 @@ public interface MetaCountMetric extends MetaMetric {
   */
  long count();

-  /**
-   * Migrate to count()
-   */
-  @Deprecated
-  default long getCount() {
-    return count();
-  }
 }
@@ -10,11 +10,4 @@ public interface MetaMetric {
   */
  String name();

-  /**
-   * Migrate to name().
-   */
-  @Deprecated
-  default String getName() {
-    return name();
-  }
 }
@@ -10,40 +10,16 @@ public interface MetaQueryMetric extends MetaTimedMetric {
   */
  Class<?> type();

-  /**
-   * Migrate to type().
-   */
-  @Deprecated
-  default Class<?> getType() {
-    return type();
-  }
-
  /**
   * The label for the query (can be null).
   */
  String label();

-  /**
-   * Migrate to label().
-   */
-  @Deprecated
-  default String getLabel() {
-    return label();
-  }
-
  /**
   * The actual SQL of the query.
   */
  String sql();

-  /**
-   * Migrate to sql().
-   */
-  @Deprecated
-  default String getSql() {
-    return sql();
-  }
-
  /**
   * Return the hash of the plan.
   */
@@ -11,67 +11,26 @@ public interface MetaTimedMetric extends MetaMetric {
   */
  String location();

-  /**
-   * Migrate to location()
-   */
-  @Deprecated
-  default String getLocation() {
-    return location();
-  }
-
  /**
   * Return the total count.
   */
  long count();

-  /**
-   * Migrate to count()
-   */
-  @Deprecated
-  default long getCount() {
-    return count();
-  }
-
  /**
   * Return the total execution time in micros.
   */
  long total();

-  /**
-   * Migrate to total()
-   */
-  @Deprecated
-  default long getTotal() {
-    return total();
-  }
-
  /**
   * Return the max execution time in micros.
   */
  long max();

-  /**
-   * Migrate to max()
-   */
-  @Deprecated
-  default long getMax() {
-    return max();
-  }
-
  /**
   * Return the mean execution time in micros.
   */
  long mean();

-
-  /**
-   * Migrate to mean()
-   */
-  @Deprecated
-  default long getMean() {
-    return mean();
-  }
-
  /**
   * Return true if this is the first metrics collection for this query.
   * <p>
@@ -12,37 +12,14 @@ public interface ServerMetrics {
   */
  List<MetaTimedMetric> timedMetrics();

-  /**
-   * Migrate to timedMetrics().
-   */
-  @Deprecated
-  default List<MetaTimedMetric> getTimedMetrics() {
-    return timedMetrics();
-  }
-
  /**
   * Return the query metrics.
   */
  List<MetaQueryMetric> queryMetrics();

-  /**
-   * Migrate to queryMetrics().
-   */
-  @Deprecated
-  default List<MetaQueryMetric> getQueryMetrics() {
-    return queryMetrics();
-  }
-
  /**
   * Return the Counter metrics.
   */
  List<MetaCountMetric> countMetrics();

-  /**
-   * Migrate to countMetrics().
-   */
-  @Deprecated
-  default List<MetaCountMetric> getCountMetrics() {
-    return countMetrics();
-  }
 }
@@ -19,6 +19,7 @@ public interface ServerMetricsAsJson {

  /**
   * Set the sort property - see SortMetric
+   *
   * @see SortMetric
   */
  ServerMetricsAsJson withSort(Comparator<MetaTimedMetric> sortBy);
@@ -35,9 +36,9 @@ public interface ServerMetricsAsJson {
   */
  ServerMetricsAsJson withHeader(boolean withHeader);

-    /**
-     * Collect and write metrics as JSON to the given buffer.
-     */
+  /**
+   * Collect and write metrics as JSON to the given buffer.
+   */
  void write(Appendable buffer);

  /**
@@ -5,7 +5,7 @@ import java.util.Comparator;
 /**
 * Comparator for timed metrics sorted by name and then count.
 */
-public class SortMetric {
+public final class SortMetric {

  public static final Comparator<MetaCountMetric> COUNT_NAME = new CountName();

@@ -6,7 +6,7 @@ import java.util.ServiceLoader;
 /**
 * Lookup MetricFactory service.
 */
-class MetricServiceProvider {
+final class MetricServiceProvider {

  private static final MetricFactory metricFactory = init();

@@ -12,14 +12,6 @@ public interface QueryPlanMetric {
   */
  TimedMetric metric();

-  /**
-   * Deprecated migrate to metric().
-   */
-  @Deprecated
-  default TimedMetric getMetric() {
-    return metric();
-  }
-
  /**
   * Visit the underlying metric.
   */
@@ -16,28 +16,12 @@ public interface BeanDocType<T> {
  /**
   * Return the doc store index type for this bean type.
   */
-  default String indexType() {
-    return getIndexType();
-  }
-
-  /**
-   * Deprecated migrate to indexType().
-   */
-  @Deprecated
-  String getIndexType();
+  String indexType();

  /**
   * Return the doc store index name for this bean type.
   */
-  default String indexName() {
-    return getIndexName();
-  }
-
-  /**
-   * Deprecated migrate to indexName().
-   */
-  @Deprecated
-  String getIndexName();
+  String indexName();

  /**
   * Apply the appropriate fetch path to the query such that the query returns beans matching
@@ -48,29 +32,13 @@ public interface BeanDocType<T> {
  /**
   * Return the FetchPath for the embedded document.
   */
-  default FetchPath embedded(String path) {
-    return getEmbedded(path);
-  }
-
-  /**
-   * Deprecated migrate to embedded().
-   */
-  @Deprecated
-  FetchPath getEmbedded(String path);
+  FetchPath embedded(String path);

  /**
   * For embedded 'many' properties we need a FetchPath relative to the root which is used to
   * build and replace the embedded list.
   */
-  default FetchPath embeddedManyRoot(String path) {
-    return getEmbeddedManyRoot(path);
-  }
-
-  /**
-   * Deprecated migrate to embeddedManyRoot().
-   */
-  @Deprecated
-  FetchPath getEmbeddedManyRoot(String path);
+  FetchPath embeddedManyRoot(String path);

  /**
   * Return a 'raw' property mapped for the given property.
@@ -22,53 +22,21 @@ public interface BeanType<T> {
   */
  String name();

-  /**
-   * Deprecated migrate to name().
-   */
-  @Deprecated
-  default String getName() {
-    return name();
-  }
-
  /**
   * Return the full name of the bean type.
   */
  String fullName();

-  /**
-   * Deprecated migrate to fullName().
-   */
-  @Deprecated
-  default String getFullName() {
-    return fullName();
-  }
-
  /**
   * Return the class type this BeanDescriptor describes.
   */
  Class<T> type();

-  /**
-   * Deprecated migrate to type().
-   */
-  @Deprecated
-  default Class<T> getBeanType() {
-    return type();
-  }
-
  /**
   * Return the type bean for an OneToMany or ManyToOne or ManyToMany property.
   */
  BeanType<?> beanTypeAtPath(String propertyName);

-  /**
-   * Deprecated migrate to beanTypeAtPath().
-   */
-  @Deprecated
-  default BeanType<?> getBeanTypeAtPath(String propertyName) {
-    return beanTypeAtPath(propertyName);
-  }
-
  /**
   * Return all the properties for this bean type.
   */
@@ -79,53 +47,21 @@ public interface BeanType<T> {
   */
  Property idProperty();

-  /**
-   * Deprecated migrate to idProperty().
-   */
-  @Deprecated
-  default Property getIdProperty() {
-    return idProperty();
-  }
-
  /**
   * Return the when modified property if there is one defined.
   */
  Property whenModifiedProperty();

-  /**
-   * Deprecated migrate to idProperty().
-   */
-  @Deprecated
-  default Property getWhenModifiedProperty() {
-    return whenModifiedProperty();
-  }
-
  /**
   * Return the when created property if there is one defined.
   */
  Property whenCreatedProperty();

-  /**
-   * Deprecated migrate to idProperty().
-   */
-  @Deprecated
-  default Property getWhenCreatedProperty() {
-    return whenCreatedProperty();
-  }
-
  /**
   * Return the Property to read values from a bean.
   */
  Property property(String propertyName);

-  /**
-   * Deprecated migrate to property().
-   */
-  @Deprecated
-  default Property getProperty(String propertyName) {
-    return property(propertyName);
-  }
-
  /**
   * Return the ExpressionPath for a given property path.
   * <p>
@@ -134,14 +70,6 @@ public interface BeanType<T> {
   */
  ExpressionPath expressionPath(String path);

-  /**
-   * Deprecated migrate to expressionPath().
-   */
-  @Deprecated
-  default ExpressionPath getExpressionPath(String path) {
-    return expressionPath(path);
-  }
-
  /**
   * Return true if the property is a valid known property or path for the given bean type.
   */
@@ -177,14 +105,6 @@ public interface BeanType<T> {
   */
  String baseTable();

-  /**
-   * Deprecated migrate to baseTable().
-   */
-  @Deprecated
-  default String getBaseTable() {
-    return baseTable();
-  }
-
  /**
   * Create a new instance of the bean.
   */
@@ -195,98 +115,36 @@ public interface BeanType<T> {
   */
  Object id(Object bean);

-  /**
-   * Deprecated migrate to id()
-   */
-  @Deprecated
-  default Object beanId(Object bean) {
-    return id(bean);
-  }
-
-  /**
-   * Deprecated migrate to id()
-   */
-  @Deprecated
-  Object getBeanId(T bean);
-
  /**
   * Set the id value to the bean.
   */
  void setId(T bean, Object idValue);

-  /**
-   * Deprecated migrate to setId()
-   */
-  @Deprecated
-  default void setBeanId(T bean, Object idValue) {
-    setId(bean, idValue);
-  }
-
  /**
   * Return the bean persist controller.
   */
  BeanPersistController persistController();

-  /**
-   * Deprecated migrate to persistController()
-   */
-  @Deprecated
-  default BeanPersistController getPersistController() {
-    return persistController();
-  }
-
  /**
   * Return the bean persist listener.
   */
  BeanPersistListener persistListener();

-  /**
-   * Deprecated migrate to persistListener()
-   */
-  @Deprecated
-  default BeanPersistListener getPersistListener() {
-    return persistListener();
-  }
-
  /**
   * Return the beanFinder. Usually null unless overriding the finder.
   */
  BeanFindController findController();

-  /**
-   * Deprecated migrate to findController()
-   */
-  @Deprecated
-  default BeanFindController getFindController() {
-    return findController();
-  }
-
  /**
   * Return the BeanQueryAdapter or null if none is defined.
   */
  BeanQueryAdapter queryAdapter();

-  /**
-   * Deprecated migrate to queryAdapter()
-   */
-  @Deprecated
-  default BeanQueryAdapter getQueryAdapter() {
-    return queryAdapter();
-  }
-
  /**
   * Return the identity generation type.
   */
  IdType idType();

-  /**
-   * Deprecated migrate to idType()
-   */
-  @Deprecated
-  default IdType getIdType() {
-    return idType();
-  }
-
  /**
   * Return true if this bean type has doc store backing.
   */
@@ -301,27 +159,11 @@ public interface BeanType<T> {
   */
  DocMapping docMapping();

-  /**
-   * Deprecated migrate to docMapping()
-   */
-  @Deprecated
-  default DocMapping getDocMapping() {
-    return docMapping();
-  }
-
  /**
   * Return the doc store queueId for this bean type.
   */
  String docStoreQueueId();

-  /**
-   * Deprecated migrate to docStoreQueueId()
-   */
-  @Deprecated
-  default String getDocStoreQueueId() {
-    return docStoreQueueId();
-  }
-
  /**
   * Return the doc store support for this bean type.\
   */
@@ -353,27 +195,11 @@ public interface BeanType<T> {
   */
  List<BeanType<?>> inheritanceChildren();

-  /**
-   * Deprecated migrate to inheritanceChildren()
-   */
-  @Deprecated
-  default List<BeanType<?>> getInheritanceChildren() {
-    return inheritanceChildren();
-  }
-
  /**
   * Returns the parent in inheritance hierarchy
   */
  BeanType<?> inheritanceParent();

-  /**
-   * Deprecated migrate to inheritanceParent()
-   */
-  @Deprecated
-  default BeanType<?> getInheritanceParent() {
-    return inheritanceParent();
-  }
-
  /**
   * Visit all children recursively
   */
@@ -384,14 +210,6 @@ public interface BeanType<T> {
   */
  String discColumn();

-  /**
-   * Deprecated migrate to discColumn()
-   */
-  @Deprecated
-  default String getDiscColumn() {
-    return discColumn();
-  }
-
  /**
   * Create a bean given the discriminator value.
   */
@@ -39,14 +39,6 @@ public interface ExpressionPath {
   */
  StringParser stringParser();

-  /**
-   * Deprecated migrate to stringParser().
-   */
-  @Deprecated
-  default StringParser getStringParser() {
-    return stringParser();
-  }
-
  /**
   * For DateTime capable scalar types convert the long systemTimeMillis into
   * an appropriate java time (Date,Timestamp,Time,Calendar, JODA type etc).
@@ -64,14 +56,6 @@ public interface ExpressionPath {
   */
  int jdbcType();

-  /**
-   * Deprecated migrate to jdbcType().
-   */
-  @Deprecated
-  default int getJdbcType() {
-    return jdbcType();
-  }
-
  /**
   * Return true if this is an ManyToOne or OneToOne associated bean property.
   */
@@ -85,50 +69,19 @@ public interface ExpressionPath {
   */
  String assocIdExpression(String propName, String bindOperator);

-  /**
-   * Deprecated migrate to assocIdExpression().
-   */
-  @Deprecated
-  default String getAssocIdExpression(String propName, String bindOperator) {
-    return assocIdExpression(propName, bindOperator);
-  }
-
  /**
   * Return the Id values for the given bean value.
   */
  Object[] assocIdValues(EntityBean bean);

-  /**
-   * Deprecated migrate to assocIdValues().
-   */
-  @Deprecated
-  default Object[] getAssocIdValues(EntityBean bean) {
-    return assocIdValues(bean);
-  }
-
  /**
   * Return the underlying bean property.
   */
  Property property();

-  /**
-   * Deprecated migrate to property().
-   */
-  @Deprecated
-  default Property getProperty() {
-    return property();
-  }
-
  /**
   * The ElPrefix plus name.
   */
  String elName();

-  /**
-   * Deprecated migrate to elName().
-   */
-  @Deprecated
-  default String getElName() {
-    return elName();
-  }
 }
@@ -10,40 +10,16 @@ public interface Property {
   */
  String name();

-  /**
-   * Deprecated migrate to name().
-   */
-  @Deprecated
-  default String getName() {
-    return name();
-  }
-
  /**
   * Return the type of the property.
   */
  Class<?> type();

-  /**
-   * Deprecated migrate to type().
-   */
-  @Deprecated
-  default Class<?> getPropertyType() {
-    return type();
-  }
-
  /**
   * Return the value of the property on the given bean.
   */
  Object value(Object bean);

-  /**
-   * Deprecated migrate to value().
-   */
-  @Deprecated
-  default Object getVal(Object bean) {
-    return value(bean);
-  }
-
  /**
   * Return true if this is a OneToMany or ManyToMany property.
   */
@@ -12,11 +12,18 @@ import io.ebean.bean.PersistenceContext;
 */
 public interface JsonBeanReader<T> {

+  /**
+   * Read the JSON into given bean. Will update existing properties.
+   */
+  T read(T target);
+
  /**
   * Read the JSON returning a bean.
   */
-  T read();
-
+  default T read() {
+    return read(null);
+  }
+  
  /**
   * Create a new reader taking the context from the existing one but using a new JsonParser.
   */
@@ -58,12 +58,60 @@ public interface JsonContext {
   */
  <T> T toBean(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException;

+  /**
+   * Read json parser input into a given Bean. <br>
+   * Note: This is a kind of "update". Only properties in the json will be modified. Embedded Lists and Maps will become new
+   * instances, so the object identity will not be preserved here.
+   *
+   * @throws JsonIOException When IOException occurs
+   */
+  <T> void toBean(T target, JsonParser parser) throws JsonIOException;
+
+  /**
+   * Read json parser input into a given Bean additionally using JsonReadOptions.<br>
+   * See {@link #toBean(Class, JsonParser)} for details modified.
+   *
+   * @throws JsonIOException When IOException occurs
+   */
+  <T> void toBean(T target, JsonParser parser, JsonReadOptions options) throws JsonIOException;
+
+  /**
+   * Read json reader input into a given Bean.<br>
+   * See {@link #toBean(Class, JsonParser)} for details
+   *
+   * @throws JsonIOException When IOException occurs
+   */
+  <T> void toBean(T target, Reader json) throws JsonIOException;
+
+  /**
+   * Read json reader input into a given Bean additionally using JsonReadOptions.<br>
+   * See {@link #toBean(Class, JsonParser)} for details modified.
+   *
+   * @throws JsonIOException When IOException occurs
+   */
+  <T> void toBean(T target, Reader json, JsonReadOptions options) throws JsonIOException;
+
+  /**
+   * Read json string input into a given Bean.<br>
+   * See {@link #toBean(Class, JsonParser)} for details
+   *
+   * @throws JsonIOException When IOException occurs
+   */
+  <T> void toBean(T target, String json) throws JsonIOException;
+
+  /**
+   * Read json string input into a given Bean additionally using JsonReadOptions.<br>
+   * See {@link #toBean(Class, JsonParser)} for details
+   *
+   * @throws JsonIOException When IOException occurs
+   */
+  <T> void toBean(T target, String json, JsonReadOptions options) throws JsonIOException;
+
  /**
   * Create and return a new bean reading for the bean type given the JSON options and source.
   * <p>
-   * Note that JsonOption provides an option for setting a persistence context and also enabling
-   * further lazy loading. Further lazy loading requires a persistence context so if that is set
-   * on then a persistence context is created if there is not one set.
+   * Note that JsonOption provides an option for setting a persistence context and also enabling further lazy loading. Further lazy
+   * loading requires a persistence context so if that is set on then a persistence context is created if there is not one set.
   */
  <T> JsonBeanReader<T> createBeanReader(Class<T> cls, JsonParser parser, JsonReadOptions options) throws JsonIOException;

--- a/Show More
+++ b/Show More