Version 16.0.0-rc3

Add DatabaseBuilder.shutdownHook option (programmatic disabling registration of JVM shutdown hook)

.github/workflows/mariadb.yml

@@ -34,5 +34,5 @@ jobs:
         path:
           ~/.m2
         key: build-${{ env.cache-name }}
-    - name: mariadb 10.6
+    - name: mariadb 10.11
       run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-mariadb.properties

.github/workflows/sqlserver.yml

@@ -34,5 +34,5 @@ jobs:
         path:
           ~/.m2
         key: build-${{ env.cache-name }}
-    - name: sqlserver 2017
-      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-sqlserver17.properties
+    - name: sqlserver 2022
+      run: mvn -T 8 clean test -Dprops.file=testconfig/ebean-sqlserver.properties

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-net-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-net-postgis-types</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -47,19 +47,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-postgis-types</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -17,13 +17,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -60,13 +60,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <artifactId>composites</artifactId>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <name>ebean api</name>

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

@@ -137,6 +137,7 @@ public interface Database {
   /**
    * Return the associated read only DataSource for this Database instance (can be null).
    */
+  @Nullable
   DataSource readOnlyDataSource();
 
   /**

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

@@ -1062,6 +1062,11 @@ public interface DatabaseBuilder {
    */
   DatabaseBuilder readOnlyDatabase(boolean readOnlyDatabase);
 
+  /**
+   * Set to false such that the instance does not register a JVM shutdown hook.
+   */
+  DatabaseBuilder shutdownHook(boolean shutdownHook);
+
   /**
    * Set a DataSource.
    */
@@ -2643,6 +2648,11 @@ public interface DatabaseBuilder {
      */
     boolean readOnlyDatabase();
 
+    /**
+     * Return if a JVM shutdown hook should be registered.
+     */
+    boolean shutdownHook();
+
     /**
      * Return the DataSource.
      */

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

@@ -311,6 +311,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
   private boolean skipDataSourceCheck;
 
   private boolean readOnlyDatabase;
+  private boolean shutdownHook = true;
 
   /**
    * The data source (if programmatically provided).
@@ -1365,6 +1366,17 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
     return readOnlyDatabase;
   }
 
+  @Override
+  public DatabaseBuilder shutdownHook(boolean shutdownHook) {
+    this.shutdownHook = shutdownHook;
+    return this;
+  }
+
+  @Override
+  public boolean shutdownHook() {
+    return shutdownHook;
+  }
+
   @Override
   public DataSource getDataSource() {
     return dataSource;
@@ -2137,6 +2149,7 @@ public class DatabaseConfig implements DatabaseBuilder.Settings {
     loadDocStoreSettings(p);
 
     defaultServer = p.getBoolean("defaultServer", defaultServer);
+    shutdownHook = p.getBoolean("shutdownHook", shutdownHook);
     readOnlyDatabase = p.getBoolean("readOnlyDatabase", readOnlyDatabase);
     autoPersistUpdates = p.getBoolean("autoPersistUpdates", autoPersistUpdates);
     loadModuleInfo = p.getBoolean("loadModuleInfo", loadModuleInfo);

ebean-api/src/main/java/io/ebean/event/ShutdownManager.java

@@ -97,8 +97,7 @@ public final class ShutdownManager {
   private static void registerShutdownHook() {
     lock.lock();
     try {
-      String value = System.getProperty("ebean.registerShutdownHook");
-      if (value == null || !value.trim().equalsIgnoreCase("false")) {
+      if ("true".equalsIgnoreCase(System.getProperty("ebean.registerShutdownHook", "true"))) {
         Runtime.getRuntime().addShutdownHook(shutdownHook);
       }
     } catch (IllegalStateException ex) {

ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java

@@ -79,6 +79,7 @@ class DatabaseConfigTest {
     props.setProperty("includeLabelInSql", "false");
     props.setProperty("lazyLoadBatchSize", "50");
     props.setProperty("queryBatchSize", "60");
+    props.setProperty("shutdownHook", "false");
 
     props.setProperty("queryPlan.enable", "true");
     props.setProperty("queryPlan.thresholdMicros", "10000");
@@ -100,6 +101,7 @@ class DatabaseConfigTest {
     assertTrue(settings.isLoadModuleInfo());
     assertTrue(settings.skipDataSourceCheck());
     assertTrue(settings.readOnlyDatabase());
+    assertFalse(settings.shutdownHook());
     assertFalse(settings.isIncludeLabelInSql());
     assertThat(settings.getLengthCheck()).isEqualTo(LengthCheck.ON);
     assertThat(settings.getLazyLoadBatchSize()).isEqualTo(50);
@@ -172,6 +174,7 @@ class DatabaseConfigTest {
     DatabaseBuilder.Settings config = new DatabaseConfig().settings();
     assertTrue(config.isIdGeneratorAutomatic());
     assertTrue(config.isDefaultServer());
+    assertTrue(config.shutdownHook());
     assertFalse(config.isAutoPersistUpdates());
     assertFalse(config.skipDataSourceCheck());
 
@@ -196,6 +199,8 @@ class DatabaseConfigTest {
     assertThat(config.getLengthCheck()).isEqualTo(LengthCheck.OFF);
     assertTrue(config.isIncludeLabelInSql());
 
+    config.shutdownHook(false);
+    assertFalse(config.shutdownHook());
     config.setLoadModuleInfo(false);
     assertFalse(config.isAutoLoadModuleInfo());
     assertFalse(config.isLoadModuleInfo());

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,25 +89,25 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
@@ -125,13 +125,13 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
@@ -155,37 +155,37 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-spring-txn</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <!-- platforms -->
@@ -193,79 +193,79 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-clickhouse</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis-types</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>16.0.0-rc1</version>
+        <version>16.0.0-RC3</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -159,21 +159,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -162,8 +162,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     this.scriptRunner = new DScriptRunner(this);
 
     configureServerPlugins();
-    // Register with the JVM Shutdown hook
-    ShutdownManager.registerDatabase(this);
+    if (this.config.shutdownHook() && "true".equalsIgnoreCase(System.getProperty("ebean.registerShutdownHook", "true"))) {
+      // register with the JVM Shutdown hook
+      ShutdownManager.registerDatabase(this);
+    }
   }
 
   /**
@@ -278,6 +280,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
+  @Nullable
   public DataSource readOnlyDataSource() {
     return transactionManager.readOnlyDataSource();
   }

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java

@@ -264,6 +264,6 @@ public final class IdBinderSimple implements IdBinder {
 
   @Override
   public String idNullOr(String prefix, String filterManyExpression) {
-    return "(${" + prefix + "}" + idProperty.name() + " is null or (" + filterManyExpression + "))";
+    return "(${" + prefix + "}" + idProperty.dbColumn() + " is null or (" + filterManyExpression + "))";
   }
 }

ebean-core/src/main/java/io/ebeaninternal/server/transaction/DataSourceSupplier.java

@@ -1,5 +1,7 @@
 package io.ebeaninternal.server.transaction;
 
+import org.jspecify.annotations.Nullable;
+
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -25,6 +27,7 @@ public interface DataSourceSupplier {
    * This can return null meaning that no read only DataSource (with autoCommit)
    * is available for use so normal transactions with explicit commit should be used.
    */
+  @Nullable
   DataSource readOnlyDataSource();
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java

@@ -10,6 +10,7 @@ import io.ebean.cache.ServerCacheNotification;
 import io.ebean.cache.ServerCacheNotify;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.datasource.DataSourcePool;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeSet;
@@ -30,6 +31,8 @@ import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 
 import jakarta.persistence.PersistenceException;
+import org.jspecify.annotations.Nullable;
+
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -257,6 +260,7 @@ public class TransactionManager implements SpiTransactionManager {
   }
 
   @Override
+  @Nullable
   public final DataSource readOnlyDataSource() {
     return dataSourceSupplier.readOnlyDataSource();
   }

ebean-ddl-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java

@@ -202,7 +202,7 @@ public class DB2Ddl extends PlatformDdl {
         }
       }
       if (requiresReorg) {
-        ret.add(newRawCommand("call sysproc.admin_cmd('reorg table " + tableName() + "')"));
+        ret.add(newRawCommand("call sysproc.admin_cmd('reorg table " + tableName() + " ${reorgArgs}')"));
       }
       return ret;
     }

ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java

@@ -136,7 +136,7 @@ public class PlatformDdl_AlterColumnTest {
       + "alter table mytab alter column acol set data type varchar(50);\n"
       + "alter table mytab alter column acol set default 'hi';\n"
       + "alter table mytab alter column acol set not null;\n"
-      + "call sysproc.admin_cmd('reorg table mytab');\n");
+      + "call sysproc.admin_cmd('reorg table mytab ${reorgArgs}');\n");
 
     //
     alter.setCurrentNotnull(Boolean.TRUE);
@@ -176,7 +176,7 @@ public class PlatformDdl_AlterColumnTest {
     softly.assertThat(sql).isEqualTo("-- apply alter tables\n"
       + "alter table mytab alter column acol drop default;\n"
       + "alter table mytab alter column acol drop not null;\n"
-      + "call sysproc.admin_cmd('reorg table mytab');\n");
+      + "call sysproc.admin_cmd('reorg table mytab ${reorgArgs}');\n");
 
   }
 
@@ -218,7 +218,7 @@ public class PlatformDdl_AlterColumnTest {
       + "alter table mytab alter column acol set data type varchar(20);\n"
       // Note, this reorg may be not necessary when only length attribute is alterd
       // but this is currently not implemented.
-      + "call sysproc.admin_cmd('reorg table mytab');\n");
+      + "call sysproc.admin_cmd('reorg table mytab ${reorgArgs}');\n");
 
     alter.setType("bigint");
     sql = alterColumn(pgDdl, alter);
@@ -277,7 +277,7 @@ public class PlatformDdl_AlterColumnTest {
     sql = alterColumn(db2Ddl, alter);
     softly.assertThat(sql).isEqualTo("-- apply alter tables\n"
       + "alter table mytab alter column acol set not null;\n"
-      + "call sysproc.admin_cmd('reorg table mytab');\n");
+      + "call sysproc.admin_cmd('reorg table mytab ${reorgArgs}');\n");
 
   }
 
@@ -321,7 +321,7 @@ public class PlatformDdl_AlterColumnTest {
     sql = alterColumn(db2Ddl, alter);
     softly.assertThat(sql).isEqualTo("-- apply alter tables\n"
       + "alter table mytab alter column acol drop not null;\n"
-      + "call sysproc.admin_cmd('reorg table mytab');\n");
+      + "call sysproc.admin_cmd('reorg table mytab ${reorgArgs}');\n");
   }
 
   @Test

ebean-jackson-mapper/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 

ebean-net-postgis-types/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <name>ebean net postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
@@ -72,15 +72,21 @@
 
       <!-- for testing -->
       <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.40</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:14.10.0</tile>
-          </tiles>
-        </configuration>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-maven-plugin</artifactId>
+        <version>${ebean-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <transformArgs>debug=0</transformArgs>
+            </configuration>
+            <goals>
+              <goal>testEnhance</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
     </plugins>

ebean-postgis-types/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <name>ebean postgis types</name>
@@ -19,14 +19,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
@@ -80,15 +80,21 @@
 
       <!-- for testing -->
       <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.40</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:14.10.0</tile>
-          </tiles>
-        </configuration>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-maven-plugin</artifactId>
+        <version>${ebean-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <transformArgs>debug=0</transformArgs>
+            </configuration>
+            <goals>
+              <goal>testEnhance</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
     </plugins>

ebean-querybean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -59,14 +59,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -90,15 +90,21 @@
     <plugins>
       <!-- Enhancement -->
       <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.40</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:14.10.0</tile>
-          </tiles>
-        </configuration>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-maven-plugin</artifactId>
+        <version>${ebean-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <transformArgs>debug=0</transformArgs>
+            </configuration>
+            <goals>
+              <goal>testEnhance</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
     </plugins>

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -29,35 +29,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -66,15 +66,21 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.40</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:14.10.0</tile>
-          </tiles>
-        </configuration>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-maven-plugin</artifactId>
+        <version>${ebean-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <transformArgs>debug=0</transformArgs>
+            </configuration>
+            <goals>
+              <goal>testEnhance</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
     </plugins>

ebean-spring-txn/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <artifactId>ebean-spring-txn</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
@@ -93,15 +93,21 @@
     <plugins>
 
       <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.40</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:14.10.0</tile>
-          </tiles>
-        </configuration>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-maven-plugin</artifactId>
+        <version>${ebean-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <transformArgs>debug=0</transformArgs>
+            </configuration>
+            <goals>
+              <goal>testEnhance</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
     </plugins>

ebean-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <name>ebean test</name>
@@ -33,20 +33,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -149,14 +149,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
@@ -264,7 +264,7 @@
     <dependency>
       <groupId>com.ibm.db2</groupId>
       <artifactId>jcc</artifactId>
-      <version>11.5.6.0</version>
+      <version>12.1.0.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -301,19 +301,23 @@
 
   <build>
     <plugins>
-
       <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.40</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:14.10.0</tile>
-          </tiles>
-        </configuration>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-maven-plugin</artifactId>
+        <version>${ebean-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <transformArgs>debug=0</transformArgs>
+            </configuration>
+            <goals>
+              <goal>testEnhance</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
-
     </plugins>
   </build>
 

ebean-test/src/main/java/io/ebean/test/config/platform/Db2Setup.java

@@ -24,7 +24,7 @@ class Db2Setup implements PlatformSetup {
       return new Properties();
     }
 
-    dbConfig.setDockerVersion("11.5.6.0a");
+    dbConfig.setDockerVersion("11.5.9.0");
     return dbConfig.getDockerProperties();
   }
 

ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java

@@ -21,6 +21,7 @@ import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -40,7 +41,7 @@ public class DbMigrationTest extends BaseTestCase {
   private void runScript(String scriptName) {
     URL url = getClass().getResource("/migrationtest/dbmigration/" + server().platform().name().toLowerCase() + "/" + scriptName);
     assert url != null : scriptName +  " not found for platform [" + server().platform().name().toLowerCase() + "]";
-    server().script().run(url);
+    server().script().run(url, Map.of("reorgArgs", "use tempspace1 resetdictionary"));
   }
 
   @IgnorePlatform({

ebean-test/src/test/java/main/StartDb2.java

@@ -5,12 +5,12 @@ import io.ebean.test.containers.Db2Container;
 public class StartDb2 {
 
   public static void main(String[] args) {
-    Db2Container.builder("11.5.6.0a")
+    Db2Container.builder("11.5.9.0")
       .dbName("unit")
       .user("unit")
       .password("unit")
       // to change collation, charset and other parameters like pagesize:
-      .configOptions("USING CODESET UTF-8 TERRITORY DE COLLATE USING IDENTITY PAGESIZE 32768")
+      .createOptions("USING CODESET UTF-8 TERRITORY DE COLLATE USING IDENTITY PAGESIZE 32768")
       .configOptions("USING STRING_UNITS CODEUNITS32")
       .build()
       .startWithDropCreate();

ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java

@@ -39,7 +39,7 @@ public class TestM2MCascadeOne extends BaseTestCase {
 
     Query<MUser> query = DB.find(MUser.class)
       .select("userid")
-      .where().raw("roles.roleid in (?)", 24)
+      .where().raw("roles.roleId in (?)", 24)
       .query();
 
     query.findList();

ebean-test/src/test/java/org/tests/el/TestRawExpressionInterpolation.java

@@ -6,10 +6,10 @@ import io.ebean.Query;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 
-public class TestUnderscoreParam extends BaseTestCase {
+class TestRawExpressionInterpolation extends BaseTestCase {
 
   @Test
-  public void test() {
+  void test() {
 
     Query<Customer> query = DB.find(Customer.class)
       .where().raw("name like ?", "Rob%")
@@ -19,6 +19,13 @@ public class TestUnderscoreParam extends BaseTestCase {
 
     assertSql(query).contains("where t0.name like ?");
 
+    Query<Customer> query2 = DB.find(Customer.class)
+      .where().raw("? like concat('%', name, '%')", "Rob")
+      .query();
+
+    query2.findList();
+
+    assertSql(query2).contains("where ? like concat('%', t0.name, '%')");
   }
 
 }

ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java

@@ -39,7 +39,7 @@ public class TestM2MDeleteWithCascade extends BaseTestCase {
     assertNull(notThere);
 
     List<Object> roleIds = new ArrayList<>();
-    Collections.addAll(roleIds, r0.getRoleid(), r1.getRoleid());
+    Collections.addAll(roleIds, r0.getRoleId(), r1.getRoleId());
 
     int rc = DB.find(MRole.class).where().idIn(roleIds).findCount();
 

ebean-test/src/test/java/org/tests/model/basic/MRole.java

@@ -8,7 +8,8 @@ import java.util.List;
 public class MRole {
 
   @Id
-  Integer roleid;
+  @Column(name = "role_id")
+  Integer roleId;
 
   String roleName;
 
@@ -23,12 +24,12 @@ public class MRole {
     this.roleName = roleName;
   }
 
-  public Integer getRoleid() {
-    return roleid;
+  public Integer getRoleId() {
+    return roleId;
   }
 
-  public void setRoleid(Integer roleid) {
-    this.roleid = roleid;
+  public void setRoleId(Integer roleId) {
+    this.roleId = roleId;
   }
 
   public String getRoleName() {
@@ -61,8 +62,8 @@ public class MRole {
     // Make sure other is not null and has the same class as this
     if (other != null && getClass().equals(other.getClass())) {
       final MRole rhs = (MRole) other;
-      if (roleid.equals(rhs.roleid)) {
-        if (roleid == 0) {
+      if (roleId.equals(rhs.roleId)) {
+        if (roleId == 0) {
           return false;
         } else {
           return true;
@@ -74,8 +75,8 @@ public class MRole {
 
   @Override
   public int hashCode() {
-    if (roleid != null && roleid != 0) {
-      int rid = roleid;
+    if (roleId != null && roleId != 0) {
+      int rid = roleId;
       return (int) (rid ^ (rid >>> 32));
     }
     return super.hashCode();

ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java

@@ -10,17 +10,17 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestQueryFilterManyOnM2M extends BaseTestCase {
+class TestQueryFilterManyOnM2M extends BaseTestCase {
 
   @Test
-  public void test() {
+  void test() {
     LoggedSql.start();
 
     DB.find(MUser.class).fetch("roles").filterMany("roles").ilike("roleName", "Jim%").findList();
 
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.userid, t0.user_name, t0.user_type_id, t1.roleid, t1.role_name from muser t0 left join mrole_muser t1z_ on t1z_.muser_userid = t0.userid left join mrole t1 on t1.roleid = t1z_.mrole_roleid where (t1.roleid is null or (lower(t1.role_name) like ");
+    assertThat(sql.get(0)).contains("select t0.userid, t0.user_name, t0.user_type_id, t1.role_id, t1.role_name from muser t0 left join mrole_muser t1z_ on t1z_.muser_userid = t0.userid left join mrole t1 on t1.role_id = t1z_.mrole_role_id where (t1.role_id is null or (lower(t1.role_name) like ");
     assertThat(sql.get(0)).contains("order by t0.userid;");
   }
 

ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java

@@ -46,9 +46,9 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
 
       DB.save(u1);
 
-      queryOrExpression(r2.getRoleid());
+      queryOrExpression(r2.getRoleId());
 
-      queryDisjunction(r2.getRoleid());
+      queryDisjunction(r2.getRoleId());
 
       Query<MUser> query = DB.find(MUser.class)
         .where().disjunction()
@@ -66,19 +66,19 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
     }
   }
 
-  private void queryDisjunction(Integer roleid) {
+  private void queryDisjunction(Integer roleId) {
 
     Query<MUser> query = DB.find(MUser.class)
       .where().or()
       .eq("userName", "user0B")
-      .eq("roles.roleid", roleid)
+      .eq("roles.roleId", roleId)
       .endOr().query();
 
     query.findList();
 
     String sql = sqlOf(query);
     assertSqlOuterJoins(sql);
-    assertThat(sql).contains("where (t0.user_name = ? or u1.roleid = ?)");
+    assertThat(sql).contains("where (t0.user_name = ? or u1.role_id = ?)");
   }
 
   @Test
@@ -101,7 +101,7 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
     Query<MUser> query = DB.find(MUser.class)
       .where().or(
         Expr.eq("userName", "user0B"),
-        Expr.eq("roles.roleid", roleid)
+        Expr.eq("roles.roleId", roleid)
       )
       .query();
 
@@ -109,12 +109,12 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase {
 
     String sql = sqlOf(query);
     assertSqlOuterJoins(sql);
-    assertThat(sql).contains("where (t0.user_name = ? or u1.roleid = ?)");
+    assertThat(sql).contains("where (t0.user_name = ? or u1.role_id = ?)");
   }
 
   private void assertSqlOuterJoins(String sql) {
     assertThat(sql).contains("select distinct");
     assertThat(sql).contains("left join mrole_muser u1z_ on u1z_.muser_userid = t0.userid");
-    assertThat(sql).contains("left join mrole u1 on u1.roleid = u1z_.mrole_roleid");
+    assertThat(sql).contains("left join mrole u1 on u1.role_id = u1z_.mrole_role_id");
   }
 }

ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java

@@ -80,8 +80,8 @@ public class TestTextJsonUpdateCascade extends TransactionalTestCase {
     jsonContext.toJson(u0);
 
     String s = "{\"userid\":" + u0.getUserid()
-      + ",\"userName\":\"userj1\", \"roles\":[{\"roleid\":" + r2.getRoleid() + "},{\"roleid\":"
-      + r3.getRoleid() + "}]} ";
+      + ",\"userName\":\"userj1\", \"roles\":[{\"roleid\":" + r2.getRoleId() + "},{\"roleid\":"
+      + r3.getRoleId() + "}]} ";
 
     MUser updMUser = jsonContext.toBean(MUser.class, s);
 

ebean-test/src/test/resources/ebean.properties

@@ -141,7 +141,7 @@ datasource.mysql.url=jdbc:mysql://127.0.0.1:4306/test_ebean
 
 datasource.mariadb.username=unit
 datasource.mariadb.password=test
-datasource.mariadb.url=jdbc:mariadb://localhost:14307/unit?useLegacyDatetimeCode=false
+datasource.mariadb.url=jdbc:mariadb://localhost:14309/unit?useLegacyDatetimeCode=false
 
 datasource.cockroach.username=root
 datasource.cockroach.password=

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql

@@ -257,7 +257,7 @@ CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTE
 alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
 alter table "table" add column textfield2 varchar(255);
-call sysproc.admin_cmd('reorg table "table"');
+call sysproc.admin_cmd('reorg table "table" ${reorgArgs}');
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -274,43 +274,43 @@ alter table migtest_e_basic add column new_boolean_field smallint default 0 defa
 alter table migtest_e_basic add column new_boolean_field2 smallint default 0 default true not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history add column sys_period_start timestamp(12) not null generated always as row begin;
 alter table migtest_e_history add column sys_period_end timestamp(12) not null generated always as row end;
 alter table migtest_e_history add column sys_period_txn timestamp(12) generated always as transaction start id;
 alter table migtest_e_history add period system_time (sys_period_start,sys_period_end);
 alter table migtest_e_history alter column test_string set data type bigint;
-call sysproc.admin_cmd('reorg table migtest_e_history');
+call sysproc.admin_cmd('reorg table migtest_e_history ${reorgArgs}');
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2 add column new_column varchar(20);
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history alter column test_string set not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column new_column varchar(20);
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 alter table migtest_e_history4 alter column test_number set data type bigint;
-call sysproc.admin_cmd('reorg table migtest_e_history4');
+call sysproc.admin_cmd('reorg table migtest_e_history4 ${reorgArgs}');
 alter table migtest_e_history4_history alter column test_number set data type bigint;
-call sysproc.admin_cmd('reorg table migtest_e_history4_history');
+call sysproc.admin_cmd('reorg table migtest_e_history4_history ${reorgArgs}');
 alter table migtest_e_history5 add column test_boolean smallint default 0 default false not null;
 alter table migtest_e_history5_history add column test_boolean smallint default 0 default false not null;
 alter table migtest_e_history6 alter column test_number1 set default 42;
 alter table migtest_e_history6 alter column test_number1 set not null;
 alter table migtest_e_history6 alter column test_number2 drop not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6');
+call sysproc.admin_cmd('reorg table migtest_e_history6 ${reorgArgs}');
 alter table migtest_e_history6_history alter column test_number1 set not null;
 alter table migtest_e_history6_history alter column test_number2 drop not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6_history');
+call sysproc.admin_cmd('reorg table migtest_e_history6_history ${reorgArgs}');
 alter table migtest_e_softdelete add column deleted smallint default 0 default false not null;
 alter table migtest_oto_child add column master_id bigint;
 alter table table_history alter column textfield drop not null;
 alter table table_history add column "select" varchar(255);
 alter table table_history add column textfield2 varchar(255);
-call sysproc.admin_cmd('reorg table table_history');
+call sysproc.admin_cmd('reorg table table_history ${reorgArgs}');
 -- apply post alter
 create unique index uq_drop_ref_one_to_one_parent_id on drop_ref_one_to_one(parent_id) exclude null keys;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql

@@ -6,13 +6,13 @@ alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
 alter table migtest_e_basic drop column old_boolean2;
 alter table migtest_e_basic drop column eref_id;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history2 drop column obsolete_string1;
 alter table migtest_e_history2 drop column obsolete_string2;
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history drop column obsolete_string1;
 alter table migtest_e_history2_history drop column obsolete_string2;
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 -- apply post alter
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;
 drop table "migtest_QuOtEd";

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql

@@ -266,28 +266,28 @@ alter table migtest_e_basic add column description_file blob(64M);
 alter table migtest_e_basic add column old_boolean smallint default 0 default false not null;
 alter table migtest_e_basic add column old_boolean2 smallint default 0;
 alter table migtest_e_basic add column eref_id integer;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string drop not null;
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history alter column test_string drop not null;
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 alter table migtest_e_history4 alter column test_number set data type integer;
-call sysproc.admin_cmd('reorg table migtest_e_history4');
+call sysproc.admin_cmd('reorg table migtest_e_history4 ${reorgArgs}');
 alter table migtest_e_history4_history alter column test_number set data type integer;
-call sysproc.admin_cmd('reorg table migtest_e_history4_history');
+call sysproc.admin_cmd('reorg table migtest_e_history4_history ${reorgArgs}');
 alter table migtest_e_history6 alter column test_number1 drop default;
 alter table migtest_e_history6 alter column test_number1 drop not null;
 alter table migtest_e_history6 alter column test_number2 set default 7;
 alter table migtest_e_history6 alter column test_number2 set not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6');
+call sysproc.admin_cmd('reorg table migtest_e_history6 ${reorgArgs}');
 alter table migtest_e_history6_history alter column test_number1 drop not null;
 alter table migtest_e_history6_history alter column test_number2 set not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6_history');
+call sysproc.admin_cmd('reorg table migtest_e_history6_history ${reorgArgs}');
 -- apply post alter
 create unique index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) exclude null keys;
 alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql

@@ -8,41 +8,41 @@ alter table "table" drop versioning;
 -- apply alter tables
 alter table "table" drop column textfield;
 alter table "table" drop column textfield2;
-call sysproc.admin_cmd('reorg table "table"');
+call sysproc.admin_cmd('reorg table "table" ${reorgArgs}');
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
-call sysproc.admin_cmd('reorg table migtest_ckey_detail');
+call sysproc.admin_cmd('reorg table migtest_ckey_detail ${reorgArgs}');
 alter table migtest_ckey_parent drop column assoc_id;
-call sysproc.admin_cmd('reorg table migtest_ckey_parent');
+call sysproc.admin_cmd('reorg table migtest_ckey_parent ${reorgArgs}');
 alter table migtest_e_basic drop column new_string_field;
 alter table migtest_e_basic drop column new_boolean_field;
 alter table migtest_e_basic drop column new_boolean_field2;
 alter table migtest_e_basic drop column progress;
 alter table migtest_e_basic drop column new_integer;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history drop column sys_period_start;
 alter table migtest_e_history drop column sys_period_end;
 alter table migtest_e_history drop column sys_period_txn;
-call sysproc.admin_cmd('reorg table migtest_e_history');
+call sysproc.admin_cmd('reorg table migtest_e_history ${reorgArgs}');
 alter table migtest_e_history2 drop column test_string2;
 alter table migtest_e_history2 drop column test_string3;
 alter table migtest_e_history2 drop column new_column;
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history drop column test_string2;
 alter table migtest_e_history2_history drop column test_string3;
 alter table migtest_e_history2_history drop column new_column;
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 alter table migtest_e_history5 drop column test_boolean;
-call sysproc.admin_cmd('reorg table migtest_e_history5');
+call sysproc.admin_cmd('reorg table migtest_e_history5 ${reorgArgs}');
 alter table migtest_e_history5_history drop column test_boolean;
-call sysproc.admin_cmd('reorg table migtest_e_history5_history');
+call sysproc.admin_cmd('reorg table migtest_e_history5_history ${reorgArgs}');
 alter table migtest_e_softdelete drop column deleted;
-call sysproc.admin_cmd('reorg table migtest_e_softdelete');
+call sysproc.admin_cmd('reorg table migtest_e_softdelete ${reorgArgs}');
 alter table migtest_oto_child drop column master_id;
-call sysproc.admin_cmd('reorg table migtest_oto_child');
+call sysproc.admin_cmd('reorg table migtest_oto_child ${reorgArgs}');
 alter table table_history drop column textfield;
 alter table table_history drop column textfield2;
-call sysproc.admin_cmd('reorg table table_history');
+call sysproc.admin_cmd('reorg table table_history ${reorgArgs}');
 -- apply post alter
 drop table migtest_e_history_history;
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations

@@ -1,7 +1,7 @@
 -1467839063,    1.0__initial.sql
-638526085,      1.1.sql
--1187336846,    1.2__dropsFor_1.1.sql
-1085159289,     1.3.sql
-2087595324,     1.4__dropsFor_1.3.sql
+1478696712,     1.1.sql
+471523099,      1.2__dropsFor_1.1.sql
+-1492660695,    1.3.sql
+1942648765,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql

@@ -257,7 +257,7 @@ CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTE
 alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
 alter table "table" add column textfield2 varchar(255);
-call sysproc.admin_cmd('reorg table "table"');
+call sysproc.admin_cmd('reorg table "table" ${reorgArgs}');
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -274,43 +274,43 @@ alter table migtest_e_basic add column new_boolean_field boolean default true no
 alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history add column sys_period_start timestamp(12) not null generated always as row begin;
 alter table migtest_e_history add column sys_period_end timestamp(12) not null generated always as row end;
 alter table migtest_e_history add column sys_period_txn timestamp(12) generated always as transaction start id;
 alter table migtest_e_history add period system_time (sys_period_start,sys_period_end);
 alter table migtest_e_history alter column test_string set data type bigint;
-call sysproc.admin_cmd('reorg table migtest_e_history');
+call sysproc.admin_cmd('reorg table migtest_e_history ${reorgArgs}');
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2 add column new_column varchar(20);
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history alter column test_string set not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column new_column varchar(20);
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 alter table migtest_e_history4 alter column test_number set data type bigint;
-call sysproc.admin_cmd('reorg table migtest_e_history4');
+call sysproc.admin_cmd('reorg table migtest_e_history4 ${reorgArgs}');
 alter table migtest_e_history4_history alter column test_number set data type bigint;
-call sysproc.admin_cmd('reorg table migtest_e_history4_history');
+call sysproc.admin_cmd('reorg table migtest_e_history4_history ${reorgArgs}');
 alter table migtest_e_history5 add column test_boolean boolean default false not null;
 alter table migtest_e_history5_history add column test_boolean boolean default false not null;
 alter table migtest_e_history6 alter column test_number1 set default 42;
 alter table migtest_e_history6 alter column test_number1 set not null;
 alter table migtest_e_history6 alter column test_number2 drop not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6');
+call sysproc.admin_cmd('reorg table migtest_e_history6 ${reorgArgs}');
 alter table migtest_e_history6_history alter column test_number1 set not null;
 alter table migtest_e_history6_history alter column test_number2 drop not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6_history');
+call sysproc.admin_cmd('reorg table migtest_e_history6_history ${reorgArgs}');
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 alter table migtest_oto_child add column master_id bigint;
 alter table table_history alter column textfield drop not null;
 alter table table_history add column "select" varchar(255);
 alter table table_history add column textfield2 varchar(255);
-call sysproc.admin_cmd('reorg table table_history');
+call sysproc.admin_cmd('reorg table table_history ${reorgArgs}');
 -- apply post alter
 create unique index uq_drop_ref_one_to_one_parent_id on drop_ref_one_to_one(parent_id) exclude null keys;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql

@@ -6,13 +6,13 @@ alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
 alter table migtest_e_basic drop column old_boolean2;
 alter table migtest_e_basic drop column eref_id;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history2 drop column obsolete_string1;
 alter table migtest_e_history2 drop column obsolete_string2;
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history drop column obsolete_string1;
 alter table migtest_e_history2_history drop column obsolete_string2;
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 -- apply post alter
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;
 drop table "migtest_QuOtEd";

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql

@@ -266,28 +266,28 @@ alter table migtest_e_basic add column description_file blob(64M);
 alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string drop not null;
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history alter column test_string drop not null;
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 alter table migtest_e_history4 alter column test_number set data type integer;
-call sysproc.admin_cmd('reorg table migtest_e_history4');
+call sysproc.admin_cmd('reorg table migtest_e_history4 ${reorgArgs}');
 alter table migtest_e_history4_history alter column test_number set data type integer;
-call sysproc.admin_cmd('reorg table migtest_e_history4_history');
+call sysproc.admin_cmd('reorg table migtest_e_history4_history ${reorgArgs}');
 alter table migtest_e_history6 alter column test_number1 drop default;
 alter table migtest_e_history6 alter column test_number1 drop not null;
 alter table migtest_e_history6 alter column test_number2 set default 7;
 alter table migtest_e_history6 alter column test_number2 set not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6');
+call sysproc.admin_cmd('reorg table migtest_e_history6 ${reorgArgs}');
 alter table migtest_e_history6_history alter column test_number1 drop not null;
 alter table migtest_e_history6_history alter column test_number2 set not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6_history');
+call sysproc.admin_cmd('reorg table migtest_e_history6_history ${reorgArgs}');
 -- apply post alter
 create unique index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) exclude null keys;
 alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql

@@ -8,41 +8,41 @@ alter table "table" drop versioning;
 -- apply alter tables
 alter table "table" drop column textfield;
 alter table "table" drop column textfield2;
-call sysproc.admin_cmd('reorg table "table"');
+call sysproc.admin_cmd('reorg table "table" ${reorgArgs}');
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
-call sysproc.admin_cmd('reorg table migtest_ckey_detail');
+call sysproc.admin_cmd('reorg table migtest_ckey_detail ${reorgArgs}');
 alter table migtest_ckey_parent drop column assoc_id;
-call sysproc.admin_cmd('reorg table migtest_ckey_parent');
+call sysproc.admin_cmd('reorg table migtest_ckey_parent ${reorgArgs}');
 alter table migtest_e_basic drop column new_string_field;
 alter table migtest_e_basic drop column new_boolean_field;
 alter table migtest_e_basic drop column new_boolean_field2;
 alter table migtest_e_basic drop column progress;
 alter table migtest_e_basic drop column new_integer;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history drop column sys_period_start;
 alter table migtest_e_history drop column sys_period_end;
 alter table migtest_e_history drop column sys_period_txn;
-call sysproc.admin_cmd('reorg table migtest_e_history');
+call sysproc.admin_cmd('reorg table migtest_e_history ${reorgArgs}');
 alter table migtest_e_history2 drop column test_string2;
 alter table migtest_e_history2 drop column test_string3;
 alter table migtest_e_history2 drop column new_column;
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history drop column test_string2;
 alter table migtest_e_history2_history drop column test_string3;
 alter table migtest_e_history2_history drop column new_column;
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 alter table migtest_e_history5 drop column test_boolean;
-call sysproc.admin_cmd('reorg table migtest_e_history5');
+call sysproc.admin_cmd('reorg table migtest_e_history5 ${reorgArgs}');
 alter table migtest_e_history5_history drop column test_boolean;
-call sysproc.admin_cmd('reorg table migtest_e_history5_history');
+call sysproc.admin_cmd('reorg table migtest_e_history5_history ${reorgArgs}');
 alter table migtest_e_softdelete drop column deleted;
-call sysproc.admin_cmd('reorg table migtest_e_softdelete');
+call sysproc.admin_cmd('reorg table migtest_e_softdelete ${reorgArgs}');
 alter table migtest_oto_child drop column master_id;
-call sysproc.admin_cmd('reorg table migtest_oto_child');
+call sysproc.admin_cmd('reorg table migtest_oto_child ${reorgArgs}');
 alter table table_history drop column textfield;
 alter table table_history drop column textfield2;
-call sysproc.admin_cmd('reorg table table_history');
+call sysproc.admin_cmd('reorg table table_history ${reorgArgs}');
 -- apply post alter
 drop table migtest_e_history_history;
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations

@@ -1,8 +1,8 @@
 1307787475,     I__create_tablespaces.sql
 2058232717,     1.0__initial.sql
--1168453954,    1.1.sql
--1187336846,    1.2__dropsFor_1.1.sql
-1447146791,     1.3.sql
-2087595324,     1.4__dropsFor_1.3.sql
+-511385035,     1.1.sql
+471523099,      1.2__dropsFor_1.1.sql
+1941819734,     1.3.sql
+1942648765,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql

@@ -257,7 +257,7 @@ CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTE
 alter table "table" alter column textfield drop not null;
 alter table "table" add column "select" varchar(255);
 alter table "table" add column textfield2 varchar(255);
-call sysproc.admin_cmd('reorg table "table"');
+call sysproc.admin_cmd('reorg table "table" ${reorgArgs}');
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
@@ -274,43 +274,43 @@ alter table migtest_e_basic add column new_boolean_field boolean default true no
 alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history add column sys_period_start timestamp(12) not null generated always as row begin;
 alter table migtest_e_history add column sys_period_end timestamp(12) not null generated always as row end;
 alter table migtest_e_history add column sys_period_txn timestamp(12) generated always as transaction start id;
 alter table migtest_e_history add period system_time (sys_period_start,sys_period_end);
 alter table migtest_e_history alter column test_string set data type bigint;
-call sysproc.admin_cmd('reorg table migtest_e_history');
+call sysproc.admin_cmd('reorg table migtest_e_history ${reorgArgs}');
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2 add column new_column varchar(20);
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history alter column test_string set not null;
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2_history add column new_column varchar(20);
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 alter table migtest_e_history4 alter column test_number set data type bigint;
-call sysproc.admin_cmd('reorg table migtest_e_history4');
+call sysproc.admin_cmd('reorg table migtest_e_history4 ${reorgArgs}');
 alter table migtest_e_history4_history alter column test_number set data type bigint;
-call sysproc.admin_cmd('reorg table migtest_e_history4_history');
+call sysproc.admin_cmd('reorg table migtest_e_history4_history ${reorgArgs}');
 alter table migtest_e_history5 add column test_boolean boolean default false not null;
 alter table migtest_e_history5_history add column test_boolean boolean default false not null;
 alter table migtest_e_history6 alter column test_number1 set default 42;
 alter table migtest_e_history6 alter column test_number1 set not null;
 alter table migtest_e_history6 alter column test_number2 drop not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6');
+call sysproc.admin_cmd('reorg table migtest_e_history6 ${reorgArgs}');
 alter table migtest_e_history6_history alter column test_number1 set not null;
 alter table migtest_e_history6_history alter column test_number2 drop not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6_history');
+call sysproc.admin_cmd('reorg table migtest_e_history6_history ${reorgArgs}');
 alter table migtest_e_softdelete add column deleted boolean default false not null;
 alter table migtest_oto_child add column master_id bigint;
 alter table table_history alter column textfield drop not null;
 alter table table_history add column "select" varchar(255);
 alter table table_history add column textfield2 varchar(255);
-call sysproc.admin_cmd('reorg table table_history');
+call sysproc.admin_cmd('reorg table table_history ${reorgArgs}');
 -- apply post alter
 create unique index uq_drop_ref_one_to_one_parent_id on drop_ref_one_to_one(parent_id) exclude null keys;
 alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?'));

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql

@@ -6,13 +6,13 @@ alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
 alter table migtest_e_basic drop column old_boolean2;
 alter table migtest_e_basic drop column eref_id;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history2 drop column obsolete_string1;
 alter table migtest_e_history2 drop column obsolete_string2;
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history drop column obsolete_string1;
 alter table migtest_e_history2_history drop column obsolete_string2;
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 -- apply post alter
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;
 drop table "migtest_QuOtEd";

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql

@@ -266,28 +266,28 @@ alter table migtest_e_basic add column description_file blob(64M);
 alter table migtest_e_basic add column old_boolean boolean default false not null;
 alter table migtest_e_basic add column old_boolean2 boolean;
 alter table migtest_e_basic add column eref_id integer;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history2 alter column test_string drop default;
 alter table migtest_e_history2 alter column test_string drop not null;
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history alter column test_string drop not null;
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 alter table migtest_e_history4 alter column test_number set data type integer;
-call sysproc.admin_cmd('reorg table migtest_e_history4');
+call sysproc.admin_cmd('reorg table migtest_e_history4 ${reorgArgs}');
 alter table migtest_e_history4_history alter column test_number set data type integer;
-call sysproc.admin_cmd('reorg table migtest_e_history4_history');
+call sysproc.admin_cmd('reorg table migtest_e_history4_history ${reorgArgs}');
 alter table migtest_e_history6 alter column test_number1 drop default;
 alter table migtest_e_history6 alter column test_number1 drop not null;
 alter table migtest_e_history6 alter column test_number2 set default 7;
 alter table migtest_e_history6 alter column test_number2 set not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6');
+call sysproc.admin_cmd('reorg table migtest_e_history6 ${reorgArgs}');
 alter table migtest_e_history6_history alter column test_number1 drop not null;
 alter table migtest_e_history6_history alter column test_number2 set not null;
-call sysproc.admin_cmd('reorg table migtest_e_history6_history');
+call sysproc.admin_cmd('reorg table migtest_e_history6_history ${reorgArgs}');
 -- apply post alter
 create unique index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) exclude null keys;
 alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql

@@ -8,41 +8,41 @@ alter table "table" drop versioning;
 -- apply alter tables
 alter table "table" drop column textfield;
 alter table "table" drop column textfield2;
-call sysproc.admin_cmd('reorg table "table"');
+call sysproc.admin_cmd('reorg table "table" ${reorgArgs}');
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
-call sysproc.admin_cmd('reorg table migtest_ckey_detail');
+call sysproc.admin_cmd('reorg table migtest_ckey_detail ${reorgArgs}');
 alter table migtest_ckey_parent drop column assoc_id;
-call sysproc.admin_cmd('reorg table migtest_ckey_parent');
+call sysproc.admin_cmd('reorg table migtest_ckey_parent ${reorgArgs}');
 alter table migtest_e_basic drop column new_string_field;
 alter table migtest_e_basic drop column new_boolean_field;
 alter table migtest_e_basic drop column new_boolean_field2;
 alter table migtest_e_basic drop column progress;
 alter table migtest_e_basic drop column new_integer;
-call sysproc.admin_cmd('reorg table migtest_e_basic');
+call sysproc.admin_cmd('reorg table migtest_e_basic ${reorgArgs}');
 alter table migtest_e_history drop column sys_period_start;
 alter table migtest_e_history drop column sys_period_end;
 alter table migtest_e_history drop column sys_period_txn;
-call sysproc.admin_cmd('reorg table migtest_e_history');
+call sysproc.admin_cmd('reorg table migtest_e_history ${reorgArgs}');
 alter table migtest_e_history2 drop column test_string2;
 alter table migtest_e_history2 drop column test_string3;
 alter table migtest_e_history2 drop column new_column;
-call sysproc.admin_cmd('reorg table migtest_e_history2');
+call sysproc.admin_cmd('reorg table migtest_e_history2 ${reorgArgs}');
 alter table migtest_e_history2_history drop column test_string2;
 alter table migtest_e_history2_history drop column test_string3;
 alter table migtest_e_history2_history drop column new_column;
-call sysproc.admin_cmd('reorg table migtest_e_history2_history');
+call sysproc.admin_cmd('reorg table migtest_e_history2_history ${reorgArgs}');
 alter table migtest_e_history5 drop column test_boolean;
-call sysproc.admin_cmd('reorg table migtest_e_history5');
+call sysproc.admin_cmd('reorg table migtest_e_history5 ${reorgArgs}');
 alter table migtest_e_history5_history drop column test_boolean;
-call sysproc.admin_cmd('reorg table migtest_e_history5_history');
+call sysproc.admin_cmd('reorg table migtest_e_history5_history ${reorgArgs}');
 alter table migtest_e_softdelete drop column deleted;
-call sysproc.admin_cmd('reorg table migtest_e_softdelete');
+call sysproc.admin_cmd('reorg table migtest_e_softdelete ${reorgArgs}');
 alter table migtest_oto_child drop column master_id;
-call sysproc.admin_cmd('reorg table migtest_oto_child');
+call sysproc.admin_cmd('reorg table migtest_oto_child ${reorgArgs}');
 alter table table_history drop column textfield;
 alter table table_history drop column textfield2;
-call sysproc.admin_cmd('reorg table table_history');
+call sysproc.admin_cmd('reorg table table_history ${reorgArgs}');
 -- apply post alter
 drop table migtest_e_history_history;
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations

@@ -1,7 +1,7 @@
 2058232717,     1.0__initial.sql
--1168453954,    1.1.sql
--1187336846,    1.2__dropsFor_1.1.sql
-1447146791,     1.3.sql
-2087595324,     1.4__dropsFor_1.3.sql
+-511385035,     1.1.sql
+471523099,      1.2__dropsFor_1.1.sql
+1941819734,     1.3.sql
+1942648765,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/testconfig/ebean-db2-11.5.properties

@@ -0,0 +1,14 @@
+ebean.test.platform=db2
+ebean.test.dbName=unit
+# we need admin user to call the procedure SYSPROC.ADMIN_MOVE_TABLE
+ebean.test.username=admin
+ebean.test.password=admin
+datasource.default=db2
+ebean.db2.databasePlatformName=db2luw
+ebean.lengthCheck=utf8
+
+ebean.test.db2.version=11.5.9.0
+ebean.test.db2.containerName=ut_db2-11-5-9
+ebean.test.db2.port=50055
+
+datasource.db2.url=jdbc:db2://localhost:50055/unit

ebean-test/testconfig/ebean-db2.properties

@@ -6,3 +6,6 @@ ebean.test.password=admin
 datasource.default=db2
 ebean.db2.databasePlatformName=db2luw
 ebean.lengthCheck=utf8
+
+ebean.test.db2.version=12.1.1.0
+ebean.test.db2.containerName=ut_db2-12-1-1

ebean-test/testconfig/ebean-mariadb-10.6.properties

@@ -0,0 +1,7 @@
+ebean.test.platform=mariadb
+ebean.test.dbName=unit
+ebean.test.mariadb.version=10.6
+ebean.test.mariadb.containerName=ut_mariadb-10-6
+ebean.test.mariadb.port=14307
+datasource.default=mariadb-106
+ebean.lengthCheck=on

ebean-test/testconfig/ebean-mariadb.properties

@@ -1,7 +1,8 @@
 ebean.test.platform=mariadb
 ebean.test.dbName=unit
-ebean.test.mariadb.version=10.6
-ebean.test.mariadb.containerName=ut_mariadb-10-6
-ebean.test.mariadb.port=14307
+ebean.test.mariadb.version=10.11
+ebean.test.mariadb.containerName=ut_mariadb-10-11
+ebean.test.mariadb.port=14309
 datasource.default=mariadb
 ebean.lengthCheck=on
+

ebean-test/testconfig/ebean-sqlserver.properties

@@ -0,0 +1,14 @@
+ebean.test.platform=sqlserver
+ebean.test.dbName=test_ebean
+ebean.test.sqlserver.version=2022-latest
+ebean.test.sqlserver.containerName=local_sqlserver2022
+ebean.test.sqlserver.collation=LATIN1_GENERAL_100_CS_AS_SC_UTF8
+ebean.test.sqlserver.port=9436
+ebean.test.sqlserver.url=jdbc:sqlserver://localhost:9436;databaseName=test_ebean;sendTimeAsDateTime=false;integratedSecurity=false;trustServerCertificate=true
+datasource.default=sqlserver2022
+ebean.sqlserver2022.databasePlatformName=sqlserver17
+ebean.lengthCheck=on
+
+## A case sensitive collation example:
+#ebean.test.sqlserver.collation=LATIN1_GENERAL_100_CI_AS_SC_UTF8
+#ebean.sqlserver2022.caseSensitiveCollation=false

howto-deploy-to-central.md

@@ -12,11 +12,11 @@ mvs
 mvn -T 4 clean package
 
 ## deploy
-mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests -DskipStagingRepositoryClose=true -DstagingProgressTimeoutMinutes=9
+mvn -T 4 deploy -pl '!composites,!platforms' -Pcentral -DskipTests
 
 ## git commit, git tag, git push --tags
-git commit -am 'Version 16.0.0-rc1'
-git tag 16.0.0-rc1
+git commit -am 'Version 16.0.0-rc3'
+git tag 16.0.0-rc3
 git push --tags
 
 ## convert to javax

kotlin-querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
@@ -56,14 +56,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 

platforms/all/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,67 +15,67 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core

platforms/hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/hsqldb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,13 +15,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <artifactId>platforms</artifactId>

platforms/postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>

platforms/sqlanywhere/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

platforms/sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
   </dependencies>

pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java11-oss</artifactId>
-    <version>4.5</version>
+    <version>5.1</version>
   </parent>
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>16.0.0-rc1</version>
+  <version>16.0.0-RC3</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -17,6 +17,7 @@
   <url>https://ebean.io/</url>
 
   <scm>
+    <url>https://github.com/ebean-orm/ebean</url>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
@@ -38,10 +39,6 @@
   </developers>
 
   <properties>
-    <nexus.staging.stagingRepositoryId>ebeanCore</nexus.staging.stagingRepositoryId>
-    <nexus.staging.keepStagingRepositoryOnFailure>true</nexus.staging.keepStagingRepositoryOnFailure>
-    <nexus.staging.skipStagingRepositoryClose>true</nexus.staging.skipStagingRepositoryClose>
-    <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
     <jackson.version>2.15.0</jackson.version>
     <h2database.version>2.2.220</h2database.version>
     <ebean-persistence-api.version>3.1</ebean-persistence-api.version>
@@ -51,12 +48,11 @@
     <ebean-ddl-runner.version>2.3</ebean-ddl-runner.version>
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
     <ebean-migration.version>14.2.0</ebean-migration.version>
-    <ebean-test-containers.version>7.7</ebean-test-containers.version>
-    <ebean-datasource.version>9.5</ebean-datasource.version>
+    <ebean-test-containers.version>7.13</ebean-test-containers.version>
+    <ebean-datasource.version>10.0</ebean-datasource.version>
     <ebean-agent.version>14.12.0</ebean-agent.version>
     <ebean-maven-plugin.version>14.12.0</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
-    <maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
   </properties>
 
   <dependencies>
@@ -92,7 +88,6 @@
     <module>ebean-ddl-generator</module>
     <module>ebean-test</module>
     <module>querybean-generator</module>
-    <module>kotlin-querybean-generator</module>
     <module>ebean-querybean</module>
     <module>ebean-postgis-types</module>
     <module>ebean-net-postgis-types</module>
@@ -101,6 +96,7 @@
     <module>composites</module>
     <module>ebean-jackson-mapper</module>
     <module>ebean-spring-txn</module>
+    <module>kotlin-querybean-generator</module>
   </modules>
 
   <profiles>
@@ -113,6 +109,15 @@
         <h2database.version>1.4.199</h2database.version>
       </properties>
     </profile>
+    <profile>
+      <id>jdkKotlin</id>
+      <activation>
+        <jdk>[11,21]</jdk>
+      </activation>
+      <modules>
+        <module>kotlin-querybean-generator</module>
+      </modules>
+    </profile>
     <profile>
       <id>default</id>
       <activation>

querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <name>querybean generator</name>

querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java

@@ -105,6 +105,13 @@ class SimpleModuleInfoWriter {
             writer.write(entity);
             writer.write("\", \"allDeclaredConstructors\": true, \"allDeclaredFields\": true}");
           }
+          if (processingContext.hasOtherClasses()) {
+            for (String otherClass : processingContext.getOtherClasses()) {
+              writer.write(",\n  {\"name\": \"");
+              writer.write(otherClass);
+              writer.write("\", \"allDeclaredConstructors\": true}");
+            }
+          }
           writer.write("\n]\n");
           writer.write("\n");
           writer.close();

tests/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <artifactId>tests</artifactId>

tests/test-java16/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <artifactId>test-java16</artifactId>
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-h2</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -30,14 +30,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>provided</scope>
     </dependency>
 
@@ -46,15 +46,21 @@
     <plugins>
 
       <plugin>
-        <groupId>io.repaint.maven</groupId>
-        <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.40</version>
-        <extensions>true</extensions>
-        <configuration>
-          <tiles>
-            <tile>io.ebean.tile:enhancement:14.10.0</tile>
-          </tiles>
-        </configuration>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-maven-plugin</artifactId>
+        <version>${ebean-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <transformArgs>debug=0</transformArgs>
+            </configuration>
+            <goals>
+              <goal>testEnhance</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
     </plugins>

tests/test-kotlin/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>io.ebean</groupId>
-    <version>16.0.0-rc1</version>
+    <version>16.0.0-RC3</version>
   </parent>
 
   <artifactId>test-kotlin</artifactId>
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
     </dependency>
 
     <dependency>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>16.0.0-rc1</version>
+      <version>16.0.0-RC3</version>
       <scope>test</scope>
     </dependency>