Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	ebean-bom/pom.xml
#	ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations
#	ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java
#	ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
#	tests/test-java16/pom.xml
#	tests/test-kotlin/pom.xml

ebean-test/pom.xml

@@ -62,14 +62,14 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.14.0</version>
+      <version>3.22.0</version>
     </dependency>
 
     <!-- Including JAXB for DB Migration generation with Java 11+ -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.2</version>
+      <version>2.3.6</version>
     </dependency>
 
     <!-- Not strictly required but bring in H2 Driver because we use it so much -->
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>mod-uuid</artifactId>
-      <version>1.1</version>
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -147,7 +147,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.2.24</version>
+      <version>42.3.2</version>
       <exclusions>
         <exclusion>
           <groupId>org.checkerframework</groupId>
@@ -226,7 +226,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.9</version>
+      <version>1.2.10</version>
       <scope>test</scope>
     </dependency>
 
@@ -249,7 +249,7 @@
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:12.14.1</tile>
+            <tile>io.ebean.tile:enhancement:12.15.0</tile>
             <tile>io.avaje.tile:moditech-module:1.0</tile>
           </tiles>
         </configuration>