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

"internal" meaning that in terms of module-path they are not in a properly exported package. For example,
they are in a subpackage of io.ebeaninternal

composites/ebean-clickhouse/pom.xml

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

composites/ebean-cockroach/pom.xml

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

composites/ebean-db2/pom.xml

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

composites/ebean-h2/pom.xml

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

composites/ebean-hana/pom.xml

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

composites/ebean-mariadb/pom.xml

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

composites/ebean-mysql/pom.xml

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

composites/ebean-nuodb/pom.xml

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

composites/ebean-oracle/pom.xml

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

composites/ebean-postgres/pom.xml

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

composites/ebean-sqlite/pom.xml

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

composites/ebean-sqlserver/pom.xml

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

composites/ebean-yugabyte/pom.xml

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

composites/ebean/pom.xml

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

composites/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.10.2</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.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <name>ebean api</name>

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

@@ -129,6 +129,11 @@ public interface DtoQuery<T> extends CancelableQuery {
    */
   DtoQuery<T> setParameter(String name, Object value);
 
+  /**
+   * Bind the named parameter to SQL NULL.
+   */
+  DtoQuery<T> setNullParameter(String name, int jdbcType);
+
   /**
    * Bind the named multi-value array parameter which we would use with Postgres ANY.
    * <p>
@@ -141,6 +146,11 @@ public interface DtoQuery<T> extends CancelableQuery {
    */
   DtoQuery<T> setParameter(int position, Object value);
 
+  /**
+   * Set a positioned parameter to SQL NULL.
+   */
+  DtoQuery<T> setNullParameter(int position, int jdbcType);
+
   /**
    * Set the index of the first row of the results to return.
    */

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

@@ -6,7 +6,6 @@ import java.util.Set;
  * Notification event that dependent tables have been modified.
  * <p>
  * This is sent to other interested servers (in the cluster).
- * </p>
  */
 public class ServerCacheNotification {
 

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

@@ -6,7 +6,6 @@ import io.ebean.config.DatabaseConfig;
  * Plugin that provides a ServerCacheNotify implementation.
  * <p>
  * Is supplied this will be used to send the ServerCacheNotification event to other cluster members.
- * </p>
  */
 public interface ServerCacheNotifyPlugin {
 

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

@@ -32,13 +32,11 @@ import java.util.function.Function;
  * <p>
  * Used to programmatically construct an Database and optionally register it
  * with the DB singleton.
- * </p>
  * <p>
  * If you just use DB thout this programmatic configuration Ebean will read
  * the application.properties file and take the configuration from there. This usually
  * includes searching the class path and automatically registering any entity
  * classes and listeners etc.
- * </p>
  * <pre>{@code
  *
  * DatabaseConfig config = new DatabaseConfig();
@@ -58,7 +56,6 @@ import java.util.function.Function;
  * <p>
  * Note that DatabaseConfigProvider provides a standard Java ServiceLoader mechanism that can
  * be used to apply configuration to the DatabaseConfig.
- * </p>
  *
  * @author emcgreal
  * @author rbygrave
@@ -615,7 +612,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Put a service object into configuration such that it can be passed to a plugin.
+   * Put a service object into configuration such that it can be used by ebean or a plugin.
    * <p>
    * For example, put IgniteConfiguration in to be passed to the Ignite plugin.
    */
@@ -623,6 +620,23 @@ public class DatabaseConfig {
     serviceObject.put(key, configObject);
   }
 
+  /**
+   * Put a service object into configuration such that it can be used by ebean or a plugin.
+   * <p>
+   * For example, put IgniteConfiguration in to be passed to the Ignite plugin.
+   * You can also override some SPI objects that should be used for that Database. Currently, the following
+   * objects are possible.
+   * <ul>
+   *   <li>DataSourceAlertFactory (e.g. add different alert factories for different ebean instances)</li>
+   *   <li>DocStoreFactory</li>
+   *   <li>SlowQueryListener (e.g. add custom query listener for a certain ebean instance)</li>
+   *   <li>ServerCacheNotifyPlugin</li>
+   * </ul>
+   */
+  public <T> void putServiceObject(Class<T> iface, T configObject) {
+    serviceObject.put(serviceObjectKey(iface), configObject);
+  }
+
   /**
    * Return the service object given the key.
    */
@@ -631,7 +645,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Put a service object into configuration such that it can be passed to a plugin.
+   * Put a service object into configuration such that it can be used by ebean or a plugin.
    *
    * <pre>{@code
    *
@@ -656,7 +670,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Used by plugins to obtain service objects.
+   * Used by ebean or plugins to obtain service objects.
    *
    * <pre>{@code
    *

ebean-autotune/pom.xml

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

ebean-core-type/pom.xml

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

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.10.2</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.1</tag>
+    <tag>ebean-parent-13.10.2</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
     </dependency>
 
     <dependency>
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
     </dependency>
 
     <dependency>
@@ -143,21 +143,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-sqlserver</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 

ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java

@@ -759,6 +759,11 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
    */
   BindParams getBindParams();
 
+  /**
+   * Return the bind parameters ensuring it is initialised.
+   */
+  BindParams initBindParams();
+
   /**
    * Replace the query detail. This is used by the AutoTune feature to as a
    * fast way to set the query properties and joins.

ebean-core/src/main/java/io/ebeaninternal/server/bind/DataBind.java

@@ -115,88 +115,88 @@ public class DataBind implements DataBinder {
   }
 
   @Override
-  public void setString(String s) throws SQLException {
-    pstmt.setString(++pos, s);
+  public void setString(String value) throws SQLException {
+    pstmt.setString(++pos, value);
   }
 
   @Override
-  public final void setInt(int i) throws SQLException {
-    pstmt.setInt(++pos, i);
+  public final void setInt(int value) throws SQLException {
+    pstmt.setInt(++pos, value);
   }
 
   @Override
-  public final void setLong(long i) throws SQLException {
-    pstmt.setLong(++pos, i);
+  public final void setLong(long value) throws SQLException {
+    pstmt.setLong(++pos, value);
   }
 
   @Override
-  public final void setShort(short i) throws SQLException {
-    pstmt.setShort(++pos, i);
+  public final void setShort(short value) throws SQLException {
+    pstmt.setShort(++pos, value);
   }
 
   @Override
-  public final void setFloat(float i) throws SQLException {
-    pstmt.setFloat(++pos, i);
+  public final void setFloat(float value) throws SQLException {
+    pstmt.setFloat(++pos, value);
   }
 
   @Override
-  public final void setDouble(double i) throws SQLException {
-    pstmt.setDouble(++pos, i);
+  public final void setDouble(double value) throws SQLException {
+    pstmt.setDouble(++pos, value);
   }
 
   @Override
-  public final void setBigDecimal(BigDecimal v) throws SQLException {
-    pstmt.setBigDecimal(++pos, v);
+  public final void setBigDecimal(BigDecimal value) throws SQLException {
+    pstmt.setBigDecimal(++pos, value);
   }
 
   @Override
-  public final void setDate(java.sql.Date v) throws SQLException {
+  public final void setDate(java.sql.Date value) throws SQLException {
     Calendar timeZone = dataTimeZone.getTimeComponentTimeZone();
     if (timeZone != null) {
-      pstmt.setDate(++pos, v, timeZone);
+      pstmt.setDate(++pos, value, timeZone);
     } else {
-      pstmt.setDate(++pos, v);
+      pstmt.setDate(++pos, value);
     }
   }
 
   @Override
-  public final void setTimestamp(Timestamp v) throws SQLException {
+  public final void setTimestamp(Timestamp value) throws SQLException {
     Calendar timeZone = dataTimeZone.getTimeZone();
     if (timeZone != null) {
-      pstmt.setTimestamp(++pos, v, timeZone);
+      pstmt.setTimestamp(++pos, value, timeZone);
     } else {
-      pstmt.setTimestamp(++pos, v);
+      pstmt.setTimestamp(++pos, value);
     }
   }
 
   @Override
-  public final void setTime(Time v) throws SQLException {
+  public final void setTime(Time value) throws SQLException {
     Calendar timeZone = dataTimeZone.getTimeComponentTimeZone();
     if (timeZone != null) {
-      pstmt.setTime(++pos, v, timeZone);
+      pstmt.setTime(++pos, value, timeZone);
     } else {
-      pstmt.setTime(++pos, v);
+      pstmt.setTime(++pos, value);
     }
   }
 
   @Override
-  public void setBoolean(boolean v) throws SQLException {
-    pstmt.setBoolean(++pos, v);
+  public void setBoolean(boolean value) throws SQLException {
+    pstmt.setBoolean(++pos, value);
   }
 
   @Override
-  public void setBytes(byte[] v) throws SQLException {
-    pstmt.setBytes(++pos, v);
+  public void setBytes(byte[] value) throws SQLException {
+    pstmt.setBytes(++pos, value);
   }
 
   @Override
-  public void setByte(byte v) throws SQLException {
-    pstmt.setByte(++pos, v);
+  public void setByte(byte value) throws SQLException {
+    pstmt.setByte(++pos, value);
   }
 
   @Override
-  public void setChar(char v) throws SQLException {
-    pstmt.setString(++pos, String.valueOf(v));
+  public void setChar(char value) throws SQLException {
+    pstmt.setString(++pos, String.valueOf(value));
   }
 
   @Override
@@ -215,20 +215,17 @@ public class DataBind implements DataBinder {
 
   @Override
   public void setBlob(byte[] bytes) throws SQLException {
-    ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-    pstmt.setBinaryStream(++pos, is, bytes.length);
+    pstmt.setBinaryStream(++pos, new ByteArrayInputStream(bytes), bytes.length);
   }
 
   @Override
   public void setClob(String content) throws SQLException {
-    Reader reader = new StringReader(content);
-    pstmt.setCharacterStream(++pos, reader, content.length());
+    pstmt.setCharacterStream(++pos, new StringReader(content), content.length());
   }
 
   @Override
   public void setArray(String arrayType, Object[] elements) throws SQLException {
-    Array array = connection.createArrayOf(arrayType, elements);
-    pstmt.setArray(++pos, array);
+    pstmt.setArray(++pos, connection.createArrayOf(arrayType, elements));
   }
 
 }

ebean-core/src/main/java/io/ebeaninternal/server/bind/capture/BindCaptureStatement.java

@@ -33,87 +33,87 @@ public final class BindCaptureStatement extends BindCaptureStatementBase impleme
   }
 
   @Override
-  public void setBoolean(int parameterIndex, boolean x) {
-    capture.add(new BindCaptureTypes.Boolean(parameterIndex, x));
+  public void setBoolean(int parameterIndex, boolean value) {
+    capture.add(new BindCaptureTypes.Boolean(parameterIndex, value));
   }
 
   @Override
-  public void setByte(int parameterIndex, byte x) {
-    capture.add(new BindCaptureTypes.Byte(parameterIndex, x));
+  public void setByte(int parameterIndex, byte value) {
+    capture.add(new BindCaptureTypes.Byte(parameterIndex, value));
   }
 
   @Override
-  public void setShort(int parameterIndex, short x) {
-    capture.add(new BindCaptureTypes.TShort(parameterIndex, x));
+  public void setShort(int parameterIndex, short value) {
+    capture.add(new BindCaptureTypes.TShort(parameterIndex, value));
   }
 
   @Override
-  public void setInt(int parameterIndex, int x) {
-    capture.add(new BindCaptureTypes.TInt(parameterIndex, x));
+  public void setInt(int parameterIndex, int value) {
+    capture.add(new BindCaptureTypes.TInt(parameterIndex, value));
   }
 
   @Override
-  public void setLong(int parameterIndex, long x) {
-    capture.add(new BindCaptureTypes.TLong(parameterIndex, x));
+  public void setLong(int parameterIndex, long value) {
+    capture.add(new BindCaptureTypes.TLong(parameterIndex, value));
   }
 
   @Override
-  public void setFloat(int parameterIndex, float x) {
-    capture.add(new BindCaptureTypes.TFloat(parameterIndex, x));
+  public void setFloat(int parameterIndex, float value) {
+    capture.add(new BindCaptureTypes.TFloat(parameterIndex, value));
   }
 
   @Override
-  public void setDouble(int parameterIndex, double x) {
-    capture.add(new BindCaptureTypes.TDouble(parameterIndex, x));
+  public void setDouble(int parameterIndex, double value) {
+    capture.add(new BindCaptureTypes.TDouble(parameterIndex, value));
   }
 
   @Override
-  public void setBigDecimal(int parameterIndex, BigDecimal x) {
-    capture.add(new BindCaptureTypes.TBigDecimal(parameterIndex, x));
+  public void setBigDecimal(int parameterIndex, BigDecimal value) {
+    capture.add(new BindCaptureTypes.TBigDecimal(parameterIndex, value));
   }
 
   @Override
-  public void setString(int parameterIndex, String x) {
-    capture.add(new BindCaptureTypes.TString(parameterIndex, x));
+  public void setString(int parameterIndex, String value) {
+    capture.add(new BindCaptureTypes.TString(parameterIndex, value));
   }
 
   @Override
-  public void setBytes(int parameterIndex, byte[] x) {
-    capture.add(new BindCaptureTypes.Bytes(parameterIndex, x));
+  public void setBytes(int parameterIndex, byte[] value) {
+    capture.add(new BindCaptureTypes.Bytes(parameterIndex, value));
   }
 
   @Override
-  public void setDate(int parameterIndex, Date x) {
-    capture.add(new BindCaptureTypes.TDate(parameterIndex, x));
+  public void setDate(int parameterIndex, Date value) {
+    capture.add(new BindCaptureTypes.TDate(parameterIndex, value));
   }
 
   @Override
-  public void setTime(int parameterIndex, Time x) {
-    capture.add(new BindCaptureTypes.TTime(parameterIndex, x));
+  public void setTime(int parameterIndex, Time value) {
+    capture.add(new BindCaptureTypes.TTime(parameterIndex, value));
   }
 
   @Override
-  public void setTimestamp(int parameterIndex, Timestamp x) {
-    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, x, null));
+  public void setTimestamp(int parameterIndex, Timestamp value) {
+    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, value, null));
   }
 
   @Override
-  public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) {
-    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, x, cal));
+  public void setTimestamp(int parameterIndex, Timestamp value, Calendar cal) {
+    capture.add(new BindCaptureTypes.TTimestamp(parameterIndex, value, cal));
   }
 
   @Override
-  public void setObject(int parameterIndex, Object x) {
-    capture.add(new BindCaptureTypes.TObject(parameterIndex, x));
+  public void setObject(int parameterIndex, Object value) {
+    capture.add(new BindCaptureTypes.TObject(parameterIndex, value));
   }
 
   @Override
-  public void setBinaryStream(int parameterIndex, InputStream x, int length) {
+  public void setBinaryStream(int parameterIndex, InputStream value, int length) {
     capture.add(new BindCaptureTypes.BinaryStream(parameterIndex));
   }
 
   @Override
-  public void setCharacterStream(int parameterIndex, Reader reader, int length) {
+  public void setCharacterStream(int parameterIndex, Reader value, int length) {
     capture.add(new BindCaptureTypes.CharacterStream(parameterIndex));
   }
 

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

@@ -307,7 +307,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   public void start() {
     if (config.isRunMigration() && TenantMode.DB != config.getTenantMode()) {
-      final AutoMigrationRunner migrationRunner = ServiceUtil.service(AutoMigrationRunner.class);
+      AutoMigrationRunner migrationRunner = config.getServiceObject(AutoMigrationRunner.class);
+      if (migrationRunner == null) {
+        migrationRunner = ServiceUtil.service(AutoMigrationRunner.class);
+      }
       if (migrationRunner == null) {
         throw new IllegalStateException("No AutoMigrationRunner found. Probably ebean-migration is not in the classpath?");
       }

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

@@ -117,7 +117,10 @@ final class InitDataSource {
    * Attach DataSourceAlert via service loader if present.
    */
   private void attachAlert(DataSourceConfig dsConfig) {
-    DataSourceAlertFactory alertFactory = ServiceUtil.service(DataSourceAlertFactory.class);
+    DataSourceAlertFactory alertFactory = config.getServiceObject(DataSourceAlertFactory.class);
+    if (alertFactory == null) {
+      alertFactory = ServiceUtil.service(DataSourceAlertFactory.class);
+    }
     if (alertFactory != null) {
       dsConfig.setAlert(alertFactory.createAlert());
     }

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

@@ -144,7 +144,12 @@ public final class InternalConfiguration {
   }
 
   private <S> S service(Class<S> cls) {
-    return ServiceUtil.service(cls);
+    S service = config.getServiceObject(cls);
+    if (service != null) {
+      return service;
+    } else {
+      return ServiceUtil.service(cls);
+    }
   }
 
   private List<XmapEbean> readExternalMapping() {

ebean-core/src/main/java/io/ebeaninternal/server/expression/InExpression.java

@@ -14,17 +14,13 @@ import java.util.*;
 
 public final class InExpression extends AbstractExpression implements IdInCommon {
 
-  private final boolean not;
-
   /**
    * Set to true when adding "1=1" predicate (due to null or empty sourceValues).
    */
   private final boolean empty;
-
+  private final boolean not;
   private final Collection<?> sourceValues;
-
   private List<Object> bindValues;
-
   private boolean multiValueSupported;
 
   InExpression(String propertyName, Collection<?> sourceValues, boolean not) {
@@ -95,7 +91,7 @@ public final class InExpression extends AbstractExpression implements IdInCommon
   public void prepareExpression(BeanQueryRequest<?> request) {
     initBindValues();
     if (bindValues.size() > 0) {
-      multiValueSupported = request.isMultiValueSupported((bindValues.get(0)).getClass());
+      multiValueSupported = request.isMultiValueSupported(bindValues.get(0).getClass());
     }
   }
 
@@ -117,7 +113,6 @@ public final class InExpression extends AbstractExpression implements IdInCommon
       }
     }
     ElPropertyValue prop = getElProp(request);
-
     List<Object> values = bindValues;
     if (prop != null && prop.isAssocId()) {
       values = new ArrayList<>();
@@ -132,24 +127,23 @@ public final class InExpression extends AbstractExpression implements IdInCommon
     if (values.isEmpty()) {
       // nothing in in-query
       return;
-    } else if (prop.isDbEncrypted()) {
-      // bind the key as well as the value
-      String encryptKey = prop.beanProperty().encryptKey().getStringValue();
-      request.addBindEncryptKey(encryptKey);
-    } else if (prop.isLocalEncrypted()) {
-      List<Object> encValues = new ArrayList<>(values.size());
-      for (Object value : values) {
-        encValues.add(prop.localEncrypt(value));
-      }
-      // this is most likely binary garbage, so don't add it to the bind log
-      request.addBindEncryptKey(new MultiValueWrapper(encValues));
-      return;
     }
-
-    // if we have no property, we wrap them in a multi value wrapper.
-    // later the binder will decide, which bind strategy to use.
+    if (prop != null) {
+      if (prop.isDbEncrypted()) {
+        // bind the key as well as the value
+        request.addBindEncryptKey(prop.beanProperty().encryptKey().getStringValue());
+      } else if (prop.isLocalEncrypted()) {
+        List<Object> encValues = new ArrayList<>(values.size());
+        for (Object value : values) {
+          encValues.add(prop.localEncrypt(value));
+        }
+        // this is most likely binary garbage, so don't add it to the bind log
+        request.addBindEncryptKey(new MultiValueWrapper(encValues));
+        return;
+      }
+    }
+    // wrap in a multi value wrapper, later the binder will decide the bind strategy to use
     request.addBindValue(new MultiValueWrapper(values));
-
   }
 
   @Override
@@ -164,7 +158,6 @@ public final class InExpression extends AbstractExpression implements IdInCommon
     }
 
     ElPropertyValue prop = getElProp(request);
-
     if (prop != null) {
       if (prop.isAssocId()) {
         request.append(prop.assocIdInExpr(propName));
@@ -172,15 +165,13 @@ public final class InExpression extends AbstractExpression implements IdInCommon
         return;
       }
       if (prop.isDbEncrypted()) {
-        String dsql = prop.beanProperty().decryptProperty(propName);
-        request.append(dsql);
+        request.append(prop.beanProperty().decryptProperty(propName));
         request.appendInExpression(not, bindValues);
         return;
       }
     }
     request.append(propName);
     request.appendInExpression(not, bindValues);
-
   }
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/AbstractMultiValueBind.java

@@ -7,25 +7,7 @@ import io.ebeaninternal.server.bind.DataBind;
 import java.sql.SQLException;
 import java.util.Collection;
 
-import static java.sql.Types.BIGINT;
-import static java.sql.Types.BIT;
-import static java.sql.Types.BOOLEAN;
-import static java.sql.Types.CHAR;
-import static java.sql.Types.DATE;
-import static java.sql.Types.DECIMAL;
-import static java.sql.Types.DOUBLE;
-import static java.sql.Types.FLOAT;
-import static java.sql.Types.INTEGER;
-import static java.sql.Types.NCHAR;
-import static java.sql.Types.NUMERIC;
-import static java.sql.Types.NVARCHAR;
-import static java.sql.Types.REAL;
-import static java.sql.Types.SMALLINT;
-import static java.sql.Types.TIMESTAMP;
-import static java.sql.Types.TIMESTAMP_WITH_TIMEZONE;
-import static java.sql.Types.TIME_WITH_TIMEZONE;
-import static java.sql.Types.TINYINT;
-import static java.sql.Types.VARCHAR;
+import static java.sql.Types.*;
 
 /**
  * Base MultiValueBind for platform specific support.
@@ -86,6 +68,8 @@ abstract class AbstractMultiValueBind extends MultiValueBind {
       case ExtraDbTypes.UUID: // Postgres cast to uuid[]
       case ExtraDbTypes.INET: // Postgres cast to inet[]
         return "varchar";
+      case VARBINARY:
+        return "bytea";
 
       default:
         return null;

ebean-core/src/main/java/io/ebeaninternal/server/persist/platform/MultiValueBind.java

@@ -17,7 +17,7 @@ public class MultiValueBind {
   }
 
   Object[] toArray(Collection<?> values, ScalarType<?> type) {
-    Object[] array = new Object[values.size()];
+    Object[] array = type.binary() ? new byte[values.size()][] : new Object[values.size()];
     int i = 0;
     for (Object value : values) {
       array[i++] = type.toJdbcType(value);

ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java

@@ -396,7 +396,7 @@ final class CQueryBuilder {
       sql = nativeQueryPaging(query, sql);
     }
     query.setGeneratedSql(sql);
-    Connection connection = request.transaction().connection();
+    Connection connection = request.transaction().getInternalConnection();
     BeanDescriptor<?> desc = request.descriptor();
     try {
       // For SqlServer we need either "selectMethod=cursor" in the connection string or fetch explicitly a cursorable

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java

@@ -129,6 +129,26 @@ public final class DefaultDtoQuery<T> extends AbstractQuery implements SpiDtoQue
     return Optional.ofNullable(findOne());
   }
 
+  @Override
+  public DtoQuery<T> setNullParameter(String name, int jdbcType) {
+    if (ormQuery != null) {
+      ormQuery.initBindParams().setNullParameter(name, jdbcType);
+    } else {
+      bindParams.setNullParameter(name, jdbcType);
+    }
+    return this;
+  }
+
+  @Override
+  public DtoQuery<T> setNullParameter(int position, int jdbcType) {
+    if (ormQuery != null) {
+      ormQuery.initBindParams().setNullParameter(position, jdbcType);
+    } else {
+      bindParams.setNullParameter(position, jdbcType);
+    }
+    return this;
+  }
+
   @Override
   public DtoQuery<T> setParameter(int position, Object value) {
     if (ormQuery != null) {

ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -1544,19 +1544,13 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
 
   @Override
   public final Query<T> setParameter(Object value) {
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setNextParameter(value);
+    initBindParams().setNextParameter(value);
     return this;
   }
 
   @Override
   public final Query<T> setParameters(Object... values) {
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setNextParameters(values);
+    initBindParams().setNextParameters(values);
     return this;
   }
 
@@ -1567,10 +1561,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
    */
   @Override
   public final Query<T> setParameter(int position, Object value) {
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setParameter(position, value);
+    initBindParams().setParameter(position, value);
     return this;
   }
 
@@ -1586,10 +1577,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
         return this;
       }
     }
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setParameter(name, value);
+    initBindParams().setParameter(name, value);
     return this;
   }
 
@@ -1598,10 +1586,7 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     if (namedParams != null) {
       throw new IllegalStateException("setArrayParameter() not supported when EQL parsed query");
     }
-    if (bindParams == null) {
-      bindParams = new BindParams();
-    }
-    bindParams.setArrayParameter(name, values);
+    initBindParams().setArrayParameter(name, values);
   }
 
   @Override
@@ -1789,6 +1774,14 @@ public class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<T> {
     return bindParams;
   }
 
+  @Override
+  public BindParams initBindParams() {
+    if (bindParams == null) {
+      bindParams = new BindParams();
+    }
+    return bindParams;
+  }
+
   @Override
   public final Query<T> where(Expression expression) {
     where().add(expression);

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

@@ -35,7 +35,7 @@ abstract class TransactionFactory {
    */
   final SpiTransaction setIsolationLevel(SpiTransaction t, boolean explicit, int isolationLevel) {
     if (isolationLevel > -1) {
-      Connection connection = t.connection();
+      Connection connection = t.getInternalConnection();
       try {
         connection.setTransactionIsolation(isolationLevel);
       } catch (SQLException e) {

ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java

@@ -111,7 +111,10 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private void loadGeoTypeBinder(DatabaseConfig config) {
-    final GeoTypeProvider provider = ServiceUtil.service(GeoTypeProvider.class);
+    GeoTypeProvider provider = config.getServiceObject(GeoTypeProvider.class);
+    if (provider == null) {
+      provider = ServiceUtil.service(GeoTypeProvider.class);
+    }
     if (provider != null) {
       geoTypeBinder = provider.createBinder(config);
     }

ebean-core/src/test/java/io/ebeaninternal/server/type/BasePlatformArrayTypeFactoryTest.java

@@ -65,8 +65,8 @@ class BasePlatformArrayTypeFactoryTest {
     }
 
     @Override
-    public void setString(String s) {
-      setEmptyString = "[]".equals(s);
+    public void setString(String value) {
+      setEmptyString = "[]".equals(value);
     }
 
     @Override

ebean-csv-reader/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <artifactId>ebean-csv-reader</artifactId>
@@ -14,21 +14,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</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.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</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.1</version>
+    <version>13.10.2</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.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-13.10.1</tag>
+    <tag>ebean-parent-13.10.2</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.1</version>
+      <version>13.10.2</version>
     </dependency>
 
     <dependency>
@@ -54,21 +54,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</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.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <artifactId>ebean-jackson-jsonnode</artifactId>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</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.1</version>
+    <version>13.10.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</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.1</version>
+    <version>13.10.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</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.1-SNAPSHOT</version>
+    <version>13.10.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-kotlin</artifactId>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.1-SNAPSHOT</version>
+      <version>13.10.2-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.1-SNAPSHOT</version>
+      <version>13.10.2-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.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <name>ebean postgis</name>
@@ -22,14 +22,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-postgres</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
     </dependency>
 
     <!-- provided scope -->
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</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.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <name>ebean querybean</name>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -63,21 +63,21 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 

ebean-redis/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>13.10.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-querybean</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>querybean-generator</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</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.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <name>ebean test</name>
@@ -28,20 +28,20 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-h2</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
     </dependency>
 
     <dependency>
@@ -105,28 +105,28 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-joda-time</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-jsonnode</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-jackson-mapper</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-platform-all</artifactId>
-      <version>13.10.1</version>
+      <version>13.10.2</version>
       <scope>test</scope>
     </dependency>
 

ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java

@@ -18,6 +18,7 @@ import org.tests.model.basic.Customer;
 import org.tests.model.basic.EBasicLog;
 import org.tests.model.basic.ResetBasicData;
 
+import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -366,6 +367,38 @@ class DtoQueryTest extends BaseTestCase {
     assertThat(list).isNotEmpty();
   }
 
+  @ForPlatform(Platform.H2)
+  @Test
+  void dto3_setNullByPosition() {
+    ResetBasicData.reset();
+
+    List<DCust3> robs = server().findDto(DCust3.class, "select id, name, nvl(cast(? as int), 42) as totalOrders from o_customer where name like ?")
+      .setNullParameter(1, Types.INTEGER)
+      .setParameter(2, "Rob")
+      .setMaxRows(10)
+      .findList();
+
+    log.info(robs.toString());
+    assertThat(robs).isNotEmpty();
+    assertThat(robs.get(0).getTotalOrders()).isEqualTo(42);
+  }
+
+  @ForPlatform(Platform.H2)
+  @Test
+  void dto3_setNullByName() {
+    ResetBasicData.reset();
+
+    List<DCust3> robs = server().findDto(DCust3.class, "select id, name, nvl(cast(:foo as int), 42) as totalOrders from o_customer where name like :bar")
+      .setNullParameter("foo", Types.INTEGER)
+      .setParameter("bar", "Rob")
+      .setMaxRows(10)
+      .findList();
+
+    log.info(robs.toString());
+    assertThat(robs).isNotEmpty();
+    assertThat(robs.get(0).getTotalOrders()).isEqualTo(42);
+  }
+
   @Test
   void dto3_findList_constructorMatch() {
     ResetBasicData.reset();

ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java

@@ -4,13 +4,53 @@ import io.ebean.Database;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.event.ServerConfigStartup;
+import io.ebeaninternal.api.SpiLogger;
+import io.ebeaninternal.api.SpiLoggerFactory;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.UTDetail;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class EbeanServerFactory_ServerConfigStart_Test {
 
+
+  /**
+   * Demo, how to intercept logging for a certain database.
+   * In conjunction to ServiceLoader, you can add different loggers to different databases
+   */
+  private static class MySpiLoggerFactory implements SpiLoggerFactory {
+    Set<String> loggers = new HashSet<>();
+
+    @Override
+    public SpiLogger create(String name) {
+      loggers.add(name);
+      // just return a dummy here
+      return new SpiLogger() {
+        @Override
+        public boolean isDebug() {
+          return false;
+        }
+
+        @Override
+        public boolean isTrace() {
+          return false;
+        }
+
+        @Override
+        public void debug(String msg) {
+        }
+
+        @Override
+        public void trace(String msg) {
+        }
+      };
+
+    }
+  }
+
   @Test
   public void test() throws InterruptedException {
 
@@ -30,9 +70,13 @@ public class EbeanServerFactory_ServerConfigStart_Test {
     // act - register an instance
     OnStartup onStartup = new OnStartup();
     config.addServerConfigStartup(onStartup);
+    MySpiLoggerFactory loggerFactory = new MySpiLoggerFactory();
+    config.putServiceObject(SpiLoggerFactory.class, loggerFactory);
 
     Database db = DatabaseFactory.create(config);
 
+    assertThat(loggerFactory.loggers).containsExactlyInAnyOrder("io.ebean.SQL", "io.ebean.SUM", "io.ebean.TXN");
+
     assertThat(onStartup.calledWithConfig).isSameAs(config);
     assertThat(OnStartupViaClass.calledWithConfig).isSameAs(config);
 

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

@@ -3,6 +3,8 @@ package org.tests.cache;
 import io.ebean.CacheMode;
 import io.ebean.DB;
 import io.ebean.ExpressionList;
+import io.ebean.annotation.Transactional;
+import io.ebean.annotation.TxIsolation;
 import io.ebean.bean.BeanCollection;
 import io.ebean.cache.ServerCache;
 import io.ebean.test.LoggedSql;
@@ -159,6 +161,30 @@ public class TestQueryCache extends BaseTestCase {
     assertThat(count2).isEqualTo(count1);
     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);
+  }
+
+  private void findCountNoTxn() {
+    DB.find(EColAB.class)
+      .setUseQueryCache(CacheMode.ON)
+      .where()
+      .eq("columnB", "count")
+      .findCount();
+  }
+
+  @Transactional(isolation = TxIsolation.READ_UNCOMMITTED)
+  private void findCountTxn() {
+    findCountNoTxn();
   }
 
   @Test

kotlin-querybean-generator/pom.xml

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

platforms/all/pom.xml

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

platforms/clickhouse/pom.xml

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

platforms/db2/pom.xml

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

platforms/h2/pom.xml

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

platforms/hana/pom.xml

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

platforms/hsqldb/pom.xml

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

platforms/mariadb/pom.xml

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

platforms/mysql/pom.xml

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

platforms/nuodb/pom.xml

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

platforms/oracle/pom.xml

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

platforms/pom.xml

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

platforms/postgres/pom.xml

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

platforms/sqlanywhere/pom.xml

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

platforms/sqlite/pom.xml

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

platforms/sqlserver/pom.xml

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

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-parent</artifactId>
-  <version>13.10.1</version>
+  <version>13.10.2</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.1</tag>
+    <tag>ebean-parent-13.10.2</tag>
   </scm>
 
   <licenses>
@@ -39,7 +39,7 @@
 
   <properties>
     <nexus.staging.autoReleaseAfterClose>false</nexus.staging.autoReleaseAfterClose>
-    <jackson.version>2.13.3</jackson.version>
+    <jackson.version>2.14.0</jackson.version>
     <h2database.version>2.1.214</h2database.version>
     <ebean-persistence-api.version>3.0</ebean-persistence-api.version>
     <ebean-types.version>3.0</ebean-types.version>
@@ -48,9 +48,9 @@
     <ebean-migration-auto.version>1.2</ebean-migration-auto.version>
     <ebean-migration.version>13.6.0</ebean-migration.version>
     <ebean-test-containers.version>6.3</ebean-test-containers.version>
-    <ebean-datasource.version>8.2</ebean-datasource.version>
-    <ebean-agent.version>13.10.1</ebean-agent.version>
-    <ebean-maven-plugin.version>13.10.1</ebean-maven-plugin.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>
     <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.1</version>
+    <version>13.10.2</version>
   </parent>
 
   <name>querybean generator</name>

tests/test-java16/pom.xml

@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>13.10.1-SNAPSHOT</version>
+      <version>13.10.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-test</artifactId>
-      <version>13.10.1-SNAPSHOT</version>
+      <version>13.10.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -53,7 +53,7 @@
             <path>
               <groupId>io.ebean</groupId>
               <artifactId>querybean-generator</artifactId>
-              <version>13.10.1-SNAPSHOT</version>
+              <version>13.10.2-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.1-SNAPSHOT</version>
+      <version>13.10.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>13.10.1-SNAPSHOT</version>
+      <version>13.10.2-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>