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

Remove deprecated methods in ebean-api - BeanState

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [8]
+        java_version: [11]
         os: [ubuntu-latest]
 
     steps:

.github/workflows/jdk-ea.yml

@@ -16,7 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [17,18,19,loom,valhalla,metropolis,panama]
+        ## 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:

.github/workflows/multi-jdk-build.yml

@@ -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:

README.md

@@ -18,6 +18,7 @@
 [![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

composites/ebean-clickhouse/pom.xml

@@ -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>

composites/ebean-clickhouse/src/main/java/io/ebean/clickhouse/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.clickhouse.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-clickhouse/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-cockroach/pom.xml

@@ -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>

composites/ebean-cockroach/src/main/java/io/ebean/cockroach/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.cockroach.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-cockroach/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-db2/pom.xml

@@ -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>

composites/ebean-db2/src/main/java/io/ebean/db2/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.db2.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-db2/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-h2/pom.xml

@@ -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>

composites/ebean-h2/src/main/java/io/ebean/h2/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.h2.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-h2/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-hana/pom.xml

@@ -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>

composites/ebean-hana/src/main/java/io/ebean/hana/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.hana.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-hana/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-mariadb/pom.xml

@@ -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>

composites/ebean-mariadb/src/main/java/io/ebean/mariadb/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.mariadb.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-mariadb/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-mysql/pom.xml

@@ -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>

composites/ebean-mysql/src/main/java/io/ebean/mysql/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.mysql.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-mysql/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-nuodb/pom.xml

@@ -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>

composites/ebean-nuodb/src/main/java/io/ebean/nuodb/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.nuodb.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-nuodb/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-oracle/pom.xml

@@ -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>

composites/ebean-oracle/src/main/java/io/ebean/oracle/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.oracle.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-oracle/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-postgres/pom.xml

@@ -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>

composites/ebean-postgres/src/main/java/io/ebean/postgres/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.postgres.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-postgres/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-sqlite/pom.xml

@@ -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>

composites/ebean-sqlite/src/main/java/io/ebean/sqlite/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.sqlite.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-sqlite/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-sqlserver/pom.xml

@@ -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>

composites/ebean-sqlserver/src/main/java/io/ebean/sqlserver/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.sqlserver.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-sqlserver/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean-yugabyte/pom.xml

@@ -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>

composites/ebean-yugabyte/src/main/java/io/ebean/yugabyte/assembly/Assembly.java

@@ -0,0 +1,7 @@
+package io.ebean.yugabyte.assembly;
+
+/**
+ * Nothing interesting here - required placeholder for javadoc.
+ */
+public class Assembly {
+}

composites/ebean-yugabyte/src/main/java/module-info.java

@@ -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;
+
+}

composites/ebean/pom.xml

@@ -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.16.3</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.16.3</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-core</artifactId>
-      <version>12.16.3</version>
-    </dependency>
-
     <!-- Technically optional but most expected to use query beans -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>12.16.3</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>

composites/ebean/src/main/java/module-info.java

@@ -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;
 }

composites/pom.xml

@@ -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>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.16.3</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.7</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>
@@ -112,19 +103,4 @@
 
   </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>

ebean-api/src/main/java/io/ebean/BeanState.java

@@ -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();
-  }
 }

ebean-api/src/main/java/io/ebean/DatabaseFactory.java

@@ -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;

ebean-api/src/main/java/io/ebean/DbPrimary.java

@@ -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;

ebean-api/src/main/java/io/ebean/EbeanVersion.java

@@ -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");
 

ebean-api/src/main/java/io/ebean/Expr.java

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

ebean-api/src/main/java/io/ebean/ExtendedServer.java

@@ -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>

ebean-api/src/main/java/io/ebean/FetchConfig.java

@@ -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;
 

ebean-api/src/main/java/io/ebean/Query.java

@@ -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>

ebean-api/src/main/java/io/ebean/SqlQuery.java

@@ -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

ebean-api/src/main/java/io/ebean/SqlUpdate.java

@@ -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.
    */

ebean-api/src/main/java/io/ebean/XServiceProvider.java

@@ -11,7 +11,7 @@ import java.util.ServiceLoader;
 /**
  * Lookup internal services.
  */
-class XServiceProvider {
+final class XServiceProvider {
 
   private static SpiRawSqlService rawSqlService = initRawSql();
 

ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java

@@ -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.
    */

ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java

@@ -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.
    */

ebean-api/src/main/java/io/ebean/common/BeanSet.java

@@ -117,7 +117,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     try {
       if (set == null) {
         if (!disableLazyLoad && modifyListening) {
-          lazyLoadCollection(false);
+          lazyLoadCollection(true);
         } else {
           set = new LinkedHashSet<>();
         }
@@ -134,7 +134,7 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
         if (disableLazyLoad) {
           set = new LinkedHashSet<>();
         } else {
-          lazyLoadCollection(false);
+          lazyLoadCollection(true);
         }
       }
     } finally {

ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java

@@ -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;
-  }
 }

ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatformProvider.java

@@ -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);
+
+}

ebean-api/src/main/java/io/ebean/config/dbplatform/clickhouse/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Clickhouse DB specific support.
- */
-package io.ebean.config.dbplatform.clickhouse;

ebean-api/src/main/java/io/ebean/config/dbplatform/cockroach/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Cockroach DB specific support.
- */
-package io.ebean.config.dbplatform.cockroach;

ebean-api/src/main/java/io/ebean/config/dbplatform/db2/package-info.java

@@ -1,4 +0,0 @@
-/**
- * DB2 specific support.
- */
-package io.ebean.config.dbplatform.db2;

ebean-api/src/main/java/io/ebean/config/dbplatform/h2/package-info.java

@@ -1,4 +0,0 @@
-/**
- * H2 specific support.
- */
-package io.ebean.config.dbplatform.h2;

ebean-api/src/main/java/io/ebean/config/dbplatform/hana/package-info.java

@@ -1,4 +0,0 @@
-/**
- * SAP HANA specific support.
- */
-package io.ebean.config.dbplatform.hana;

ebean-api/src/main/java/io/ebean/config/dbplatform/hsqldb/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Hsqldb specific support.
- */
-package io.ebean.config.dbplatform.hsqldb;

ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/package-info.java

@@ -1,4 +0,0 @@
-/**
- * MySql specific support.
- */
-package io.ebean.config.dbplatform.mysql;

ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/package-info.java

@@ -1,4 +0,0 @@
-/**
- * NuoDB specific support.
- */
-package io.ebean.config.dbplatform.nuodb;

ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Oracle specific support.
- */
-package io.ebean.config.dbplatform.oracle;

ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Postgres specific support.
- */
-package io.ebean.config.dbplatform.postgres;

ebean-api/src/main/java/io/ebean/config/dbplatform/sqlanywhere/package-info.java

@@ -1,4 +0,0 @@
-/**
- * SqlAnywhere specific support.
- */
-package io.ebean.config.dbplatform.sqlanywhere;

ebean-api/src/main/java/io/ebean/config/dbplatform/sqlite/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Sqlite specific support.
- */
-package io.ebean.config.dbplatform.sqlite;

ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/package-info.java

@@ -1,4 +0,0 @@
-/**
- * SqlServer specific support.
- */
-package io.ebean.config.dbplatform.sqlserver;

ebean-api/src/main/java/io/ebean/config/dbplatform/yugabyte/YugabytePlaform.java

@@ -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;
-  }
-}

ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java

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

ebean-api/src/main/java/io/ebean/meta/MetaMetric.java

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

ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java

@@ -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.
    */

ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java

@@ -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>

ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java

@@ -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();
-  }
 }

ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java

@@ -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);
 
   /**

ebean-api/src/main/java/io/ebean/meta/SortMetric.java

@@ -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();
 

ebean-api/src/main/java/io/ebean/metric/MetricServiceProvider.java

@@ -6,7 +6,7 @@ import java.util.ServiceLoader;
 /**
  * Lookup MetricFactory service.
  */
-class MetricServiceProvider {
+final class MetricServiceProvider {
 
   private static final MetricFactory metricFactory = init();
 

ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java

@@ -12,14 +12,6 @@ public interface QueryPlanMetric {
    */
   TimedMetric metric();
 
-  /**
-   * Deprecated migrate to metric().
-   */
-  @Deprecated
-  default TimedMetric getMetric() {
-    return metric();
-  }
-
   /**
    * Visit the underlying metric.
    */

ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java

@@ -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.

ebean-api/src/main/java/io/ebean/plugin/BeanType.java

@@ -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.
    */

ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java

@@ -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();
-  }
 }

ebean-api/src/main/java/io/ebean/plugin/Property.java

@@ -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.
    */

ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java

@@ -10,7 +10,7 @@ import java.util.Set;
 /**
  * Annotation utility methods to find annotations.
  */
-public class AnnotationUtil {
+public final class AnnotationUtil {
 
   /**
    * Determine if the supplied {@link Annotation} is defined in the core JDK {@code java.lang.annotation} package.

ebean-api/src/main/java/io/ebean/util/CamelCaseHelper.java

@@ -1,6 +1,6 @@
 package io.ebean.util;
 
-public class CamelCaseHelper {
+public final class CamelCaseHelper {
 
   /**
    * To underscore from camel case using digits compressed true and force upper case false.

ebean-api/src/main/java/io/ebean/util/IOUtils.java

@@ -16,7 +16,7 @@ import java.nio.charset.StandardCharsets;
  * Utilities for IO. It uses UTF-8 as encoding when reading/writing and uses
  * buffered IO for better performance.
  */
-public class IOUtils {
+public final class IOUtils {
 
   /**
    * Read from stream as UTF-8.

ebean-api/src/main/java/io/ebean/util/JdbcClose.java

@@ -11,7 +11,7 @@ import java.sql.Statement;
 /**
  * Utility for closing raw Jdbc resources.
  */
-public class JdbcClose {
+public final class JdbcClose {
 
   private static final Logger log = LoggerFactory.getLogger("io.ebean");
 

ebean-api/src/main/java/io/ebean/util/SplitName.java

@@ -3,7 +3,7 @@ package io.ebean.util;
 /**
  * Helper for dot notation property paths.
  */
-public class SplitName {
+public final class SplitName {
 
   private static final char PERIOD = '.';
 

ebean-api/src/main/java/io/ebean/util/StringHelper.java

@@ -7,7 +7,7 @@ import java.util.regex.Pattern;
 /**
  * Utility String class that supports String manipulation functions.
  */
-public class StringHelper {
+public final class StringHelper {
 
   private static final Pattern SPLIT_NAMES = Pattern.compile("[\\s,;]+");
 

ebean-api/src/main/java/module-info.java

@@ -1,6 +1,7 @@
 module io.ebean.api {
 
   uses io.ebean.config.AutoConfigure;
+  uses io.ebean.config.dbplatform.DatabasePlatformProvider;
   uses io.ebean.datasource.DataSourceAlertFactory;
   uses io.ebean.metric.MetricFactory;
   uses io.ebean.service.SpiContainerFactory;
@@ -19,7 +20,6 @@ module io.ebean.api {
   requires static io.ebean.types;
   requires static com.fasterxml.jackson.core;
   requires static javax.servlet.api;
-  requires static com.h2database;
 
   exports io.ebean;
   exports io.ebean.bean;
@@ -27,21 +27,6 @@ module io.ebean.api {
   exports io.ebean.meta;
   exports io.ebean.config;
   exports io.ebean.config.dbplatform;
-  exports io.ebean.config.dbplatform.clickhouse;
-  exports io.ebean.config.dbplatform.h2;
-  exports io.ebean.config.dbplatform.db2;
-  exports io.ebean.config.dbplatform.cockroach;
-  exports io.ebean.config.dbplatform.hana;
-  exports io.ebean.config.dbplatform.hsqldb;
-  exports io.ebean.config.dbplatform.mariadb;
-  exports io.ebean.config.dbplatform.mysql;
-  exports io.ebean.config.dbplatform.nuodb;
-  exports io.ebean.config.dbplatform.oracle;
-  exports io.ebean.config.dbplatform.postgres;
-  exports io.ebean.config.dbplatform.sqlanywhere;
-  exports io.ebean.config.dbplatform.sqlite;
-  exports io.ebean.config.dbplatform.sqlserver;
-  exports io.ebean.config.dbplatform.yugabyte;
   exports io.ebean.event;
   exports io.ebean.event.readaudit;
   exports io.ebean.event.changelog;

ebean-api/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java

@@ -1,68 +0,0 @@
-package io.ebean.config.dbplatform;
-
-import io.ebean.Query;
-import io.ebean.config.PlatformConfig;
-import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class PostgresPlatformTest {
-
-  @Test
-  public void testUuidType() {
-
-    PostgresPlatform platform = new PostgresPlatform();
-    platform.configure(new PlatformConfig(), false);
-
-    DbPlatformType dbType = platform.getDbTypeMap().get(DbPlatformType.UUID);
-    String columnDefn = dbType.renderType(0, 0);
-
-    assertThat(columnDefn).isEqualTo("uuid");
-  }
-
-  @Test
-  public void default_forUpdate_expect_noKeyUsed() {
-
-    DatabasePlatform platform = new PostgresPlatform();
-
-    PlatformConfig config = new PlatformConfig();
-    platform.configure(config);
-
-    assertThat(config.isForUpdateNoKey()).isFalse();
-    assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.DEFAULT)).isEqualTo("X for update skip locked");
-    assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.DEFAULT)).isEqualTo("X for update nowait");
-    assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.DEFAULT)).isEqualTo("X for update");
-
-    assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.UPDATE)).isEqualTo("X for update skip locked");
-    assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.NO_KEY_UPDATE)).isEqualTo("X for no key update skip locked");
-    assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.SHARE)).isEqualTo("X for share skip locked");
-    assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.KEY_SHARE)).isEqualTo("X for key share skip locked");
-
-    assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.UPDATE)).isEqualTo("X for update nowait");
-    assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.NO_KEY_UPDATE)).isEqualTo("X for no key update nowait");
-    assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.SHARE)).isEqualTo("X for share nowait");
-    assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.KEY_SHARE)).isEqualTo("X for key share nowait");
-
-    assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.UPDATE)).isEqualTo("X for update");
-    assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.NO_KEY_UPDATE)).isEqualTo("X for no key update");
-    assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.SHARE)).isEqualTo("X for share");
-    assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.KEY_SHARE)).isEqualTo("X for key share");
-  }
-
-  @Test
-  public void lockWithKey_forUpdate() {
-
-    DatabasePlatform platform = new PostgresPlatform();
-
-    PlatformConfig config = new PlatformConfig();
-    config.setForUpdateNoKey(true);
-    platform.configure(config);
-
-    assertThat(config.isForUpdateNoKey()).isTrue();
-    assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.DEFAULT)).isEqualTo("X for no key update skip locked");
-    assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.DEFAULT)).isEqualTo("X for no key update nowait");
-    assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.DEFAULT)).isEqualTo("X for no key update");
-  }
-
-}

ebean-autotune/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.16.3</version>
+    <version>13.1.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-13.1.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.16.3</version>
+      <version>13.1.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -52,6 +52,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-platform-h2</artifactId>
+      <version>13.1.0</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -63,8 +70,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:12.15.0</tile>
-            <tile>io.avaje.tile:moditech-module:1.0</tile>
+            <tile>io.ebean.tile:enhancement:13.1.0</tile>
           </tiles>
         </configuration>
       </plugin>