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

This reverts commit 62ed5a9f

composites/ebean-clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-cockroach/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-db2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-h2</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-hana</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean-yugabyte/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -35,18 +35,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/ebean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>composites</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean (all platforms)</name>
@@ -16,31 +16,31 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -53,18 +53,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>composites</artifactId>

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean api</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>2.2</version>
+      <version>2.4</version>
     </dependency>
 
     <!--

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

@@ -1,20 +1,16 @@
-package io.ebean.platform.db2;
+package io.ebean.config.dbplatform;
 
-import io.ebean.config.dbplatform.SqlLimitRequest;
-import io.ebean.config.dbplatform.SqlLimitResponse;
-import io.ebean.config.dbplatform.SqlLimiter;
-
-public class Db2SqlLimiter implements SqlLimiter {
+public final class AnsiSqlRowsLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-
-    StringBuilder sb = new StringBuilder(512);
+    String dbSql = request.getDbSql();
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
     sb.append("select ");
     if (request.isDistinct()) {
       sb.append("distinct ");
     }
-    sb.append(request.getDbSql());
+    sb.append(dbSql);
     int firstRow = request.getFirstRow();
     if (firstRow > 0) {
       sb.append(" offset ").append(firstRow).append(" rows");
@@ -23,7 +19,6 @@ public class Db2SqlLimiter implements SqlLimiter {
     if (maxRows > 0) {
       sb.append(" fetch next ").append(maxRows).append(" rows only");
     }
-
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
     return new SqlLimitResponse(sql);
   }

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

@@ -3,42 +3,25 @@ package io.ebean.config.dbplatform;
 /**
  * Adds LIMIT OFFSET clauses to a SQL query.
  */
-public class LimitOffsetSqlLimiter implements SqlLimiter {
-
-  /**
-   * LIMIT keyword.
-   */
-  private static final String LIMIT = "limit";
-
-  /**
-   * OFFSET keyword.
-   */
-  private static final String OFFSET = "offset";
+public final class LimitOffsetSqlLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-
     String dbSql = request.getDbSql();
-
     StringBuilder sb = new StringBuilder(50 + dbSql.length());
     sb.append("select ");
     if (request.isDistinct()) {
       sb.append("distinct ");
     }
-
     sb.append(dbSql);
-
-    int firstRow = request.getFirstRow();
     int maxRows = request.getMaxRows();
-
-    if (maxRows > 0 || firstRow > 0) {
-      sb.append(" ").append(LIMIT).append(" ").append(maxRows);
-      if (firstRow > 0) {
-        sb.append(" ").append(OFFSET).append(" ");
-        sb.append(firstRow);
-      }
+    if (maxRows > 0) {
+      sb.append(" limit ").append(maxRows);
+    }
+    int firstRow = request.getFirstRow();
+    if (firstRow > 0) {
+      sb.append(" offset ").append(firstRow);
     }
-
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
     return new SqlLimitResponse(sql);
   }

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

@@ -5,14 +5,6 @@ package io.ebean.config.dbplatform;
  */
 public interface SqlLimiter {
 
-  /**
-   * the new line character used.
-   * <p>
-   * Note that this is removed for logging sql to the transaction log.
-   * </p>
-   */
-  char NEW_LINE = '\n';
-
   /**
    * Add the SQL limiting statements around the query.
    */

ebean-autotune/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -89,192 +89,192 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-joda-time</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-jsonnode</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-jackson-mapper</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
-      
+
       <!-- platforms -->
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-all</artifactId>
-        <version>13.10.2-SNAPSHOT</version>
+        <version>13.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-clickhouse</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-db2</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-h2</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hana</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-hsqldb</artifactId>
-        <version>13.10.2-SNAPSHOT</version>
+        <version>13.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mariadb</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-mysql</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-nuodb</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-oracle</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgres</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlanywhere</artifactId>
-        <version>13.10.2-SNAPSHOT</version>
+        <version>13.11.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlite</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-sqlserver</artifactId>
-        <version>13.10.2</version>
+        <version>13.11.0</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.4.1</version>
+      <version>42.4.3</version>
       <optional>true</optional>
     </dependency>
 

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,14 +15,14 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.5.0</version>
+      <version>42.5.1</version>
       <optional>true</optional>
     </dependency>
 
@@ -143,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java

@@ -1123,7 +1123,7 @@ public class DeployBeanProperty {
 
   private boolean matchPlatform(Platform[] platforms, Platform match) {
     for (Platform platform : platforms) {
-      if (platform == match) {
+      if (platform == match || platform == match.base()) {
         return true;
       }
     }

ebean-csv-reader/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-ddl-generator/pom.xml

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

ebean-externalmapping-api/pom.xml

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

ebean-externalmapping-xml/pom.xml

@@ -4,12 +4,12 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 
   <name>ebean external mapping xml</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-jackson-jsonnode/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-jackson-jsonnode</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>provided</scope>
     </dependency>
 

ebean-jackson-mapper/pom.xml

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

ebean-joda-time/pom.xml

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

ebean-kotlin/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2-SNAPSHOT</version>
+    <version>13.11.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2-SNAPSHOT</version>
+      <version>13.11.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.2-SNAPSHOT</version>
+      <version>13.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 

ebean-postgis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.5.0</version>
+      <version>42.5.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-querybean/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-querybean/src/test/java/org/example/domain/Contact.java

@@ -3,6 +3,8 @@ package org.example.domain;
 import io.ebean.annotation.DbArray;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,7 +18,11 @@ import java.util.Map;
 public class Contact extends BaseModel {
 
   @DbArray
-  List<String> phoneNumbers = new ArrayList<>();
+  List<@Size(max=20) String> phoneNumbers = new ArrayList<>();
+
+  @ElementCollection
+  @Size(max=10)
+  List<@Size(max=20) String> paths;
 
   @Column(length = 50)
   String firstName;
@@ -36,7 +42,7 @@ public class Contact extends BaseModel {
   Customer customer;
 
   @OneToMany(mappedBy = "contact")
-  List<ContactNote> notes;
+  List<@NotNull ContactNote> notes;
 
   @OneToMany(cascade = CascadeType.PERSIST)
   @MapKey(name = "key")

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

@@ -6,8 +6,8 @@ datasource.default=h2
 
 datasource.h2.username=sa
 datasource.h2.password=
-datasource.h2.url=jdbc:h2:mem:tests;NON_KEYWORDS=KEY
+datasource.h2.url=jdbc:h2:mem:tests;NON_KEYWORDS=KEY,VALUE
 
 datasource.pg.username=sa
 datasource.pg.password=
-datasource.pg.url=jdbc:h2:mem:tests;NON_KEYWORDS=KEY
+datasource.pg.url=jdbc:h2:mem:tests;NON_KEYWORDS=KEY,VALUE

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -105,28 +105,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -183,7 +183,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.5.0</version>
+      <version>42.5.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.checkerframework</groupId>

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

@@ -1,8 +1,10 @@
 package org.tests.basic;
 
+import io.ebean.annotation.Platform;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
+import io.ebean.xtest.IgnorePlatform;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
@@ -22,6 +24,7 @@ public class TestLimitQuery extends BaseTestCase {
     rob();
   }
 
+  @IgnorePlatform({Platform.MYSQL, Platform.MARIADB})
   @Test
   public void testMaxRowsZeroWithFirstRow() {
 
@@ -40,7 +43,7 @@ public class TestLimitQuery extends BaseTestCase {
     String sql = query.getGeneratedSql();
     if (isH2()) {
       assertThat(sql).contains("offset 3");
-      assertThat(sql).contains("limit 0");
+      assertThat(sql).doesNotContain("limit");
     }
   }
 

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

@@ -5,6 +5,7 @@ import io.ebean.xtest.BaseTestCase;
 import io.ebean.xtest.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.test.LoggedSql;
+import io.ebean.xtest.IgnorePlatform;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasic;
@@ -19,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.*;
 public class TestQueryForUpdate extends BaseTestCase {
 
   @Test
-  @ForPlatform({Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB})
   public void testForUpdate() {
 
     ResetBasicData.reset();
@@ -35,13 +35,35 @@ public class TestQueryForUpdate extends BaseTestCase {
 
     if (isSqlServer()) {
       assertThat(sqlOf(query)).contains("with (updlock)");
-    } else {
+    } else if (!isDb2()){
       assertThat(sqlOf(query)).contains("for update");
     }
   }
 
   @Test
-  @ForPlatform({ Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB})
+  public void testForUpdate_withLimit() {
+    ResetBasicData.reset();
+
+    Query<Customer> query;
+    try (final Transaction transaction = DB.beginTransaction()) {
+      query = DB.find(Customer.class)
+        .forUpdate()
+        .setMaxRows(3)
+        .order().desc("id");
+
+      query.findList();
+    }
+
+    if (isSqlServer()) {
+      assertThat(sqlOf(query)).contains("with (updlock)");
+    } else if (!isOracle() && !isDb2()) {
+      // Oracle does not support FOR UPDATE with FETCH
+      assertThat(sqlOf(query)).contains("for update");
+    }
+  }
+
+  @Test
+  @ForPlatform({Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB})
   public void testForUpdate_when_alreadyInPCAsReference() {
     ResetBasicData.reset();
     Order o0 = DB.find(Order.class).orderBy("id").setMaxRows(1).findOne();
@@ -75,7 +97,7 @@ public class TestQueryForUpdate extends BaseTestCase {
   }
 
   @Test
-  @ForPlatform({ Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB})
+  @ForPlatform({Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB})
   public void testForUpdate_when_alreadyInPCAsReference_usingLock() {
     ResetBasicData.reset();
     Order o0 = DB.find(Order.class).orderBy("id").setMaxRows(1).findOne();
@@ -110,7 +132,7 @@ public class TestQueryForUpdate extends BaseTestCase {
   }
 
   @Test
-  @ForPlatform({ Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB})
+  @ForPlatform({Platform.H2, Platform.ORACLE, Platform.POSTGRES, Platform.SQLSERVER, Platform.MYSQL, Platform.MARIADB})
   public void testForUpdate_when_alreadyInPC() {
 
     EBasic basic = new EBasic("test PC cache");
@@ -124,7 +146,7 @@ public class TestQueryForUpdate extends BaseTestCase {
       assertThat(basic0).isNotNull();
 
       EBasic basic1 = DB.find(EBasic.class)
-        .setId( basic.getId())
+        .setId(basic.getId())
         .forUpdate()
         .findOne();
 

ebean-test/src/test/java/org/tests/cache/TestQueryCache.java

@@ -162,16 +162,18 @@ public class TestQueryCache extends BaseTestCase {
     sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
 
-
     LoggedSql.start();
     findCountNoTxn();
     sql = LoggedSql.stop();
     assertThat(sql).hasSize(0);
 
-    LoggedSql.start();
-    findCountTxn();
-    sql = LoggedSql.stop();
-    assertThat(sql).hasSize(0);
+    // Oracle does not support READ_UNCOMMITTED as expected
+    if (!isOracle()) {
+      LoggedSql.start();
+      findCountTxn();
+      sql = LoggedSql.stop();
+      assertThat(sql).hasSize(0);
+    }
   }
 
   private void findCountNoTxn() {

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

@@ -1,9 +1,11 @@
 package org.tests.query;
 
+import io.ebean.annotation.Platform;
 import io.ebean.xtest.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.PagedList;
 import io.ebean.test.LoggedSql;
+import io.ebean.xtest.IgnorePlatform;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.ResetBasicData;
@@ -17,6 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
 
+  @IgnorePlatform({Platform.MYSQL, Platform.MARIADB})
   @Test
   public void test_firstRows() {
 

kotlin-querybean-generator/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
       <scope>test</scope>
     </dependency>
 

kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java

@@ -146,6 +146,15 @@ class ProcessingContext implements Constants {
     }
   }
 
+  private String trimAnnotations(String type) {
+    int pos = type.indexOf("@");
+    if (pos == -1) {
+      return type;
+    }
+    String remainder = type.substring(0, pos) + type.substring(type.indexOf(' ') + 1);
+    return trimAnnotations(remainder);
+  }
+
   /**
    * Gather all the fields (properties) for the given bean element.
    */
@@ -159,7 +168,6 @@ class ProcessingContext implements Constants {
    * Recursively gather all the fields (properties) for the given bean element.
    */
   private void gatherProperties(List<VariableElement> fields, Element element) {
-
     TypeElement typeElement = (TypeElement) element;
     TypeMirror superclass = typeElement.getSuperclass();
     Element mappedSuper = typeUtils.asElement(superclass);
@@ -253,9 +261,17 @@ class ProcessingContext implements Constants {
   }
 
   PropertyType getPropertyType(VariableElement field) {
-
-    TypeMirror typeMirror = field.asType();
-
+    if (dbJsonField(field)) {
+      return propertyTypeMap.getDbJsonType();
+    }
+    if (dbArrayField(field)) {
+      // get generic parameter type
+      DeclaredType declaredType = (DeclaredType) field.asType();
+      String fullType = typeDef(declaredType.getTypeArguments().get(0));
+      String shortName = langShortType(Split.shortName(fullType));
+      return new PropertyTypeArray(fullType, shortName);
+    }
+    final TypeMirror typeMirror = field.asType();
     TypeMirror currentType = typeMirror;
     while (currentType != null) {
       PropertyType type = propertyTypeMap.getType(typeDef(currentType));
@@ -268,18 +284,6 @@ class ProcessingContext implements Constants {
       currentType = (fieldType == null) ? null : fieldType.getSuperclass();
     }
 
-    if (dbJsonField(field)) {
-      return propertyTypeMap.getDbJsonType();
-    }
-
-    if (dbArrayField(field)) {
-      // get generic parameter type
-      DeclaredType declaredType = (DeclaredType) typeMirror;
-      String fullType = typeDef(declaredType.getTypeArguments().get(0));
-      String shortName = langShortType(Split.shortName(fullType));
-      return new PropertyTypeArray(fullType, shortName);
-    }
-
     Element fieldType = typeUtils.asElement(typeMirror);
     if (fieldType == null) {
       return null;
@@ -324,9 +328,9 @@ class ProcessingContext implements Constants {
     }
 
     if (typeInstanceOf(typeMirror, "java.lang.Comparable")) {
-      return new PropertyTypeScalarComparable(typeMirror.toString());
+      return new PropertyTypeScalarComparable(trimAnnotations(typeMirror.toString()));
     } else {
-      return new PropertyTypeScalar(typeMirror.toString());
+      return new PropertyTypeScalar(trimAnnotations(typeMirror.toString()));
     }
   }
 
@@ -383,7 +387,6 @@ class ProcessingContext implements Constants {
    * Create the QAssoc PropertyType.
    */
   private PropertyType createPropertyTypeAssoc(String fullName) {
-
     String[] split = Split.split(fullName);
     String propertyName = "QAssoc" + split[1];
     String packageName = packageAppend(split[0]);
@@ -436,7 +439,6 @@ class ProcessingContext implements Constants {
    * Register an entity with optional dbName.
    */
   void addEntity(String beanFullName, String dbName) {
-
     loaded.add(beanFullName);
     final String pkg = packageOf(beanFullName);
     if (pkg != null) {

platforms/all/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-all</artifactId>
@@ -14,72 +14,72 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-clickhouse</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-db2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hana</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-hsqldb</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mariadb</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-nuodb</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-oracle</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlanywhere</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlite</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/clickhouse/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/db2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-db2</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/db2/src/main/java/io/ebean/platform/db2/BaseDB2Platform.java

@@ -2,11 +2,7 @@ package io.ebean.platform.db2;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.annotation.Platform;
-import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.config.dbplatform.DbType;
-import io.ebean.config.dbplatform.PlatformIdGenerator;
-import io.ebean.config.dbplatform.SqlErrorCodes;
+import io.ebean.config.dbplatform.*;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -22,7 +18,7 @@ public abstract class BaseDB2Platform extends DatabasePlatform {
     this.supportsNativeJavaTime = false;
     this.truncateTable = "truncate table %s reuse storage ignore delete triggers immediate";
     this.likeClauseRaw = "like ?";
-    this.sqlLimiter = new Db2SqlLimiter();
+    this.sqlLimiter = new AnsiSqlRowsLimiter();
 
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsSequence(true);

platforms/h2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
@@ -36,6 +36,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/hana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-hana</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/hana/src/main/java/io/ebean/platform/hana/HanaPlatform.java

@@ -5,17 +5,13 @@ import io.ebean.Query.LockWait;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.config.PlatformConfig;
-import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.config.dbplatform.DbType;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.dbplatform.SqlErrorCodes;
+import io.ebean.config.dbplatform.*;
 
 public class HanaPlatform extends DatabasePlatform {
 
   public HanaPlatform() {
     this.platform = Platform.HANA;
-    this.sqlLimiter = new HanaSqlLimiter();
+    this.sqlLimiter = new LimitOffsetSqlLimiter();
     this.persistBatchOnCascade = PersistBatch.NONE;
     this.supportsResultSetConcurrencyModeUpdatable = false;
     this.historySupport = new HanaHistorySupport();

platforms/hana/src/main/java/io/ebean/platform/hana/HanaSqlLimiter.java

@@ -1,34 +0,0 @@
-package io.ebean.platform.hana;
-
-import io.ebean.config.dbplatform.SqlLimitRequest;
-import io.ebean.config.dbplatform.SqlLimitResponse;
-import io.ebean.config.dbplatform.SqlLimiter;
-
-public class HanaSqlLimiter implements SqlLimiter {
-  @Override
-  public SqlLimitResponse limit(SqlLimitRequest request) {
-    String dbSql = request.getDbSql();
-
-    StringBuilder sb = new StringBuilder(50 + dbSql.length());
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-
-    sb.append(dbSql);
-
-    int firstRow = request.getFirstRow();
-    int maxRows = request.getMaxRows();
-
-    if (maxRows > 0) {
-      sb.append(" ").append("limit ").append(maxRows);
-      if (firstRow > 0) {
-        sb.append(" ").append("offset ");
-        sb.append(firstRow);
-      }
-    }
-
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-    return new SqlLimitResponse(sql);
-  }
-}

platforms/hsqldb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/mariadb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,18 +14,18 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-mysql</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/mysql/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/nuodb/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/oracle/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/oracle/src/main/java/io/ebean/platform/oracle/OracleAnsiSqlRowsLimiter.java

@@ -7,27 +7,26 @@ import io.ebean.config.dbplatform.SqlLimiter;
 /**
  * Use ANSI offset rows syntax.
  */
-class OracleAnsiSqlRowsLimiter implements SqlLimiter {
+final class OracleAnsiSqlRowsLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-
     String dbSql = request.getDbSql();
     StringBuilder sb = new StringBuilder(50 + dbSql.length());
-    int firstRow = request.getFirstRow();
-    int maxRows = request.getMaxRows();
-
     sb.append("select ");
     if (request.isDistinct()) {
       sb.append("distinct ");
     }
     sb.append(dbSql);
+    int firstRow = request.getFirstRow();
     if (firstRow > 0) {
       sb.append(" offset ").append(firstRow).append(" rows");
     }
+    int maxRows = request.getMaxRows();
     if (maxRows > 0) {
       sb.append(" fetch next ").append(maxRows).append(" rows only");
     }
+    // Oracle does not support FOR UPDATE clause with limit offset
     return new SqlLimitResponse(sb.toString());
   }
 

platforms/oracle/src/main/java/io/ebean/platform/oracle/OracleRownumSqlLimiter.java

@@ -11,7 +11,6 @@ class OracleRownumSqlLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-
     // select *
     // from ( select /*+ FIRST_ROWS(n) */ a.*, ROWNUM rnum
     // from ( your_query_goes_here,

platforms/pom.xml

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

platforms/postgres/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.5.0</version>
+      <version>42.5.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -41,6 +41,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/sqlanywhere/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/sqlanywhere/src/main/java/io/ebean/platform/sqlanywhere/SqlAnywhereLimiter.java

@@ -7,18 +7,12 @@ import io.ebean.config.dbplatform.SqlLimiter;
 /**
  * Use top xx and start at xx to limit sql results.
  */
-public class SqlAnywhereLimiter implements SqlLimiter {
+public final class SqlAnywhereLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-
     String dbSql = request.getDbSql();
-
     StringBuilder sb = new StringBuilder(60 + dbSql.length());
-
-    int firstRow = request.getFirstRow();
-    int maxRows = request.getMaxRows();
-
     /*
      * SELECT TOP xx START AT xx ... FROM ...
      */
@@ -26,14 +20,15 @@ public class SqlAnywhereLimiter implements SqlLimiter {
     if (request.isDistinct()) {
       sb.append("distinct ");
     }
+    int maxRows = request.getMaxRows();
     if (maxRows > 0) {
       sb.append("top ").append(maxRows).append(" ");
     }
+    int firstRow = request.getFirstRow();
     if (firstRow > 0) {
       sb.append("start at ").append(firstRow + 1).append(" ");
     }
     sb.append(dbSql);
-
     String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
     return new SqlLimitResponse(sql);
   }

platforms/sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,12 +14,12 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/sqlserver/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>platforms</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.2</version>
+    <version>13.11.0</version>
   </parent>
 
   <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.2</version>
+      <version>13.11.0</version>
     </dependency>
 
     <dependency>
@@ -27,6 +27,6 @@
   </dependencies>
 
   <scm>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 </project>

platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerSqlLimiter.java

@@ -7,20 +7,14 @@ import io.ebean.config.dbplatform.SqlLimiter;
 /**
  * Use ANSI offset rows syntax or top n - SQL Server 2012 onwards.
  */
-public class SqlServerSqlLimiter implements SqlLimiter {
-
-  public SqlServerSqlLimiter() {
-  }
+public final class SqlServerSqlLimiter implements SqlLimiter {
 
   @Override
   public SqlLimitResponse limit(SqlLimitRequest request) {
-
     String dbSql = request.getDbSql();
     StringBuilder sb = new StringBuilder(50 + dbSql.length());
-
     int firstRow = request.getFirstRow();
     int maxRows = request.getMaxRows();
-
     if (firstRow < 1) {
       // just use top n
       sb.append("select ");
@@ -31,12 +25,10 @@ public class SqlServerSqlLimiter implements SqlLimiter {
       sb.append(dbSql);
       return new SqlLimitResponse(sb.toString());
     }
-
     sb.append("select ");
     if (request.isDistinct()) {
       sb.append("distinct ");
     }
-
     sb.append(dbSql);
     sb.append(" ").append("offset");
     sb.append(" ").append(firstRow).append(" rows");

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.10.2</version>
+  <version>13.11.0</version>
   <packaging>pom</packaging>
 
   <name>ebean parent</name>
@@ -18,7 +18,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.2</tag>
+    <tag>ebean-parent-13.11.0</tag>
   </scm>
 
   <licenses>
@@ -49,8 +49,8 @@
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
     <ebean-datasource.version>8.4</ebean-datasource.version>
-    <ebean-agent.version>13.10.2</ebean-agent.version>
-    <ebean-maven-plugin.version>13.10.2</ebean-maven-plugin.version>
+    <ebean-agent.version>13.11.0</ebean-agent.version>
+    <ebean-maven-plugin.version>13.11.0</ebean-maven-plugin.version>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 

querybean-generator/pom.xml

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

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

@@ -4,7 +4,6 @@ import javax.annotation.processing.Filer;
 import javax.annotation.processing.FilerException;
 import javax.annotation.processing.Messager;
 import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.SourceVersion;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
@@ -126,7 +125,6 @@ class ProcessingContext implements Constants {
    * Recursively gather all the fields (properties) for the given bean element.
    */
   private void gatherProperties(List<VariableElement> fields, Element element) {
-
     TypeElement typeElement = (TypeElement) element;
     TypeMirror superclass = typeElement.getSuperclass();
     Element mappedSuper = typeUtils.asElement(superclass);
@@ -231,10 +229,26 @@ class ProcessingContext implements Constants {
     }
   }
 
+  private String trimAnnotations(String type) {
+    int pos = type.indexOf("@");
+    if (pos == -1) {
+      return type;
+    }
+    String remainder = type.substring(0, pos) + type.substring(type.indexOf(' ') + 1);
+    return trimAnnotations(remainder);
+  }
+
   PropertyType getPropertyType(VariableElement field) {
-
-    TypeMirror typeMirror = field.asType();
-
+    if (dbJsonField(field)) {
+      return propertyTypeMap.getDbJsonType();
+    }
+    if (dbArrayField(field)) {
+      // get generic parameter type
+      DeclaredType declaredType = (DeclaredType) field.asType();
+      String fullType = typeDef(declaredType.getTypeArguments().get(0));
+      return new PropertyTypeArray(fullType, Split.shortName(fullType));
+    }
+    final TypeMirror typeMirror = field.asType();
     TypeMirror currentType = typeMirror;
     while (currentType != null) {
       PropertyType type = propertyTypeMap.getType(typeDef(currentType));
@@ -247,17 +261,6 @@ class ProcessingContext implements Constants {
       currentType = (fieldType == null) ? null : fieldType.getSuperclass();
     }
 
-    if (dbJsonField(field)) {
-      return propertyTypeMap.getDbJsonType();
-    }
-
-    if (dbArrayField(field)) {
-      // get generic parameter type
-      DeclaredType declaredType = (DeclaredType) typeMirror;
-      String fullType = typeDef(declaredType.getTypeArguments().get(0));
-      return new PropertyTypeArray(fullType, Split.shortName(fullType));
-    }
-
     Element fieldType = typeUtils.asElement(typeMirror);
     if (fieldType == null) {
       return null;
@@ -265,7 +268,6 @@ class ProcessingContext implements Constants {
 
     // workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=544288
     fieldType = elementUtils.getTypeElement(fieldType.toString());
-
     if (fieldType.getKind() == ElementKind.ENUM) {
       String fullType = typeDef(typeMirror);
       return new PropertyTypeEnum(fullType, Split.shortName(fullType));
@@ -296,9 +298,9 @@ class ProcessingContext implements Constants {
       return result;
     } else {
       if (typeInstanceOf(typeMirror, "java.lang.Comparable")) {
-        return new PropertyTypeScalarComparable(typeMirror.toString());
+        return new PropertyTypeScalarComparable(trimAnnotations(typeMirror.toString()));
       } else {
-        return new PropertyTypeScalar(typeMirror.toString());
+        return new PropertyTypeScalar(trimAnnotations(typeMirror.toString()));
       }
     }
   }
@@ -358,7 +360,6 @@ class ProcessingContext implements Constants {
    * Create the QAssoc PropertyType.
    */
   private PropertyType createPropertyTypeAssoc(String fullName) {
-
     String[] split = Split.split(fullName);
     String propertyName = "QAssoc" + split[1];
     String packageName = packageAppend(split[0]);
@@ -415,7 +416,6 @@ class ProcessingContext implements Constants {
    * Register an entity with optional dbName.
    */
   void addEntity(String beanFullName, String dbName) {
-
     loaded.add(beanFullName);
     final String pkg = packageOf(beanFullName);
     if (pkg != null) {

tests/test-java16/pom.xml

@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.10.2-SNAPSHOT</version>
+      <version>13.11.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.2-SNAPSHOT</version>
+      <version>13.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.10.2-SNAPSHOT</version>
+              <version>13.11.0-SNAPSHOT</version>
             </path>
           </annotationProcessorPaths>
         </configuration>

tests/test-kotlin/pom.xml

@@ -35,14 +35,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.2-SNAPSHOT</version>
+      <version>13.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.2-SNAPSHOT</version>
+      <version>13.11.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>