[maven-release-plugin] prepare release ebean-spring-txn-12.6.3

Bump junit from 4.12 to 4.13.1

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.avaje</groupId>
     <artifactId>java8-oss</artifactId>
-    <version>2.1</version>
+    <version>2.3</version>
   </parent>
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-spring-txn</artifactId>
-  <version>12.1.1</version>
+  <version>12.6.3</version>
 
   <name>ebean-spring-txn</name>
   <packaging>jar</packaging>
@@ -25,24 +25,31 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean-spring-txn.git</developerConnection>
-    <tag>ebean-spring-txn-12.1.1</tag>
+    <tag>ebean-spring-txn-12.6.3</tag>
   </scm>
 
   <dependencies>
     <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.1.1</version>
+      <version>12.6.3</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>
@@ -81,7 +88,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -120,11 +127,11 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.15</version>
+        <version>2.18</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:12.1.1</tile>
+            <tile>io.ebean.tile:enhancement:12.6.1</tile>
           </tiles>
         </configuration>
       </plugin>

src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java

@@ -49,7 +49,6 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
    */
   @Override
   public void setTransactionManager(Object txnMgr) {
-
     // RB: At this stage not exposing TransactionManager to
     // the public API and hence the Object type and casting here
     this.transactionManager = (TransactionManager) txnMgr;
@@ -64,10 +63,8 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
    */
   @Override
   public Object getCurrentTransaction() {
-
     // Get the current Spring ConnectionHolder associated to the current spring managed transaction
     ConnectionHolder holder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource);
-
     if (holder == null || !holder.isSynchronizedWithTransaction()) {
       // no current Spring transaction
       SpiTransaction currentEbeanTransaction = transactionManager.getInScope();
@@ -90,7 +87,6 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
       // Create and register a Spring TransactionSynchronization for this transaction
       springTxnLister = createSpringTxnListener(newTrans);
       TransactionSynchronizationManager.registerSynchronization(springTxnLister);
-
       return transactionManager.externalBeginTransaction(newTrans, TxScope.required());
     }
   }
@@ -102,7 +98,6 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
    * </p>
    */
   private SpringTxnListener getSpringTxnListener() {
-
     if (TransactionSynchronizationManager.isSynchronizationActive()) {
       List<TransactionSynchronization> synchronizations = TransactionSynchronizationManager.getSynchronizations();
       if (synchronizations != null) {
@@ -114,7 +109,6 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
         }
       }
     }
-
     return null;
   }
 
@@ -164,22 +158,22 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
 
     @Override
     public void beforeCommit(boolean readOnly) {
-      // Future note: for JPA2 locking we will
-      // have beforeCommit events to fire
+      if (!readOnly) {
+        transaction.preCommit();
+      }
     }
 
     @Override
     public void afterCompletion(int status) {
-
       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:

src/test/java/org/example/EbeanServerFactoryBean.java

@@ -1,5 +1,6 @@
 package org.example;
 
+import io.ebean.annotation.PersistBatch;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
@@ -31,6 +32,7 @@ public class EbeanServerFactoryBean implements InitializingBean, FactoryBean<Ebe
       throw new Exception("No ServerConig set. You must define a ServerConfig bean");
     }
 
+    serverConfig.setPersistBatch(PersistBatch.ALL);
     // Create the new EbeanServer using the configuration
     this.ebeanServer = EbeanServerFactory.create(serverConfig);
   }

src/test/java/org/example/EbeanSpringModuleTest.java

@@ -1,5 +1,6 @@
 package org.example;
 
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Transaction;
 import org.junit.Test;
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -74,6 +76,10 @@ public class EbeanSpringModuleTest {
     user.setName("ebean");
     userService.save(user);
     logger.info("Saved new User");
+    assertThat(user.getOid()).isGreaterThan(0);
+
+    final User found = DB.find(User.class, user.getOid());
+    assertThat(found).isNotNull();
   }
 
   /**