diff --git a/pom.xml b/pom.xml
index f0202f23e..9b7e70a7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <version>2.3</version>
   </parent>
 
   <groupId>io.ebean</groupId>
@@ -32,17 +32,24 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.30</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>12.4.1</version>
+      <version>12.6.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.12.0</version>
+      <scope>test</scope>
+    </dependency>
+
     <!-- Provided: Spring, Spring Boot -->
     <dependency>
       <groupId>org.springframework</groupId>
@@ -120,11 +127,11 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.18</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:12.4.1</tile>
+            <tile>io.ebean.tile:enhancement:12.6.1</tile>
           </tiles>
         </configuration>
       </plugin>
diff --git a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java
index ead75c2f4..1d9bc9030 100644
--- a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java
+++ b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java
@@ -159,7 +159,7 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
     @Override
     public void beforeCommit(boolean readOnly) {
       if (!readOnly) {
-        transaction.flushBatch();
+        transaction.preCommit();
       }
     }
 
@@ -168,12 +168,12 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
       switch (status) {
         case STATUS_COMMITTED:
           log.debug("Spring Txn [{}] committed", transaction.getId());
-          transactionManager.notifyOfCommit(transaction);
+          transaction.postCommit();
           break;
 
         case STATUS_ROLLED_BACK:
           log.debug("Spring Txn [{}] rollback", transaction.getId());
-          transactionManager.notifyOfRollback(transaction, null);
+          transaction.postRollback(null);
           break;
 
         default: