Bump to 13.14.0

- ebean-core as provided dependency
- ebean-h2 as test dependency

.editorconfig

@@ -0,0 +1,13 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+spaces_around_operators = true
+max_line_length = 130

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2012 Authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,3 +1,6 @@
+[![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-spring-txn/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-spring-txn)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ebean-orm/ebean-spring-txn/blob/master/LICENSE)
+
 ebean-spring-txn
 =====================
 
@@ -9,21 +12,34 @@ to integrate with Springs JDBC Transaction manager.
 ## To use
 
 ```java
-ServerConfig serverConfig = new ServerConfig();
+DatabaseConfig config = new DatabaseConfig();
 
 // set SpringJdbcTransactionManager ... as the external transaction manager
-serverConfig.setExternalTransactionManager(new SpringJdbcTransactionManager());
+config.setExternalTransactionManager(new SpringJdbcTransactionManager());
 
 ...
-EbeanServer server = EbeanServerFactory.create(serverConfig);
+Database database = DatabaseFactory.create(config);
 
 ```
 
 ## Notes
 
 You can use Ebean in Spring/Spring Boot *without* this and that case Ebean
-manages the Transactions itself. With Ebean managing the transactions there 
+manages the Transactions itself. With Ebean managing the transactions there
 are some benefits with more control over JDBC batch, getGeneratedKeys
 and a simpler abstraction (as Spring transactions is designed to manage
 multiple resources such as JDBC Transactions and JPA EntityManager and Ebean
-only needs to manage JDBC Transactions).
+only needs to manage JDBC Transactions).
+
+
+## Java modules
+
+Add `requires io.ebean.spring.txn` to module-info.
+
+```java
+module foo {
+
+  requires io.ebean.spring.txn;
+  ...
+}
+```

pom.xml

@@ -4,45 +4,66 @@
 
   <parent>
     <groupId>org.avaje</groupId>
-    <artifactId>java8-parent</artifactId>
-    <version>1.3</version>
+    <artifactId>java11-oss</artifactId>
+    <version>3.9</version>
   </parent>
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean-spring-txn</artifactId>
-  <version>11.10.4</version>
+  <version>13.14.0</version>
 
   <name>ebean-spring-txn</name>
   <packaging>jar</packaging>
   <description>Ebean support for Spring transactions</description>
 
   <properties>
-    <spring.framework.version>4.3.4.RELEASE</spring.framework.version>
-    <spring.boot.version>1.4.2.RELEASE</spring.boot.version>
+    <spring.framework.version>5.3.25</spring.framework.version>
+    <spring.boot.version>2.7.3</spring.boot.version>
+    <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
 
-  <url>http://ebean-orm.github.io/</url>
-
+  <url>https://ebean.io/</url>
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean-spring-txn.git</developerConnection>
-    <tag>ebean-spring-txn-11.10.4</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.32</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean</artifactId>
-      <version>11.10.3</version>
+      <artifactId>ebean-core</artifactId>
+      <version>13.14.0</version>
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-h2</artifactId>
+      <version>13.14.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-ddl-generator</artifactId>
+      <version>13.14.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.14.1</version>
+      <scope>test</scope>
+    </dependency>
+
     <!-- Provided: Spring, Spring Boot -->
     <dependency>
       <groupId>org.springframework</groupId>
@@ -81,35 +102,35 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.1.0</version>
+      <version>3.23.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>1.4.196</version>
+      <version>2.1.214</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.11</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>[1.7,)</version>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -120,11 +141,11 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.8</version>
+        <version>2.24</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <tile>io.ebean.tile:enhancement:5.2</tile>
+            <tile>io.ebean.tile:enhancement:13.14.0</tile>
           </tiles>
         </configuration>
       </plugin>

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

@@ -1,36 +1,15 @@
-/**
- * Copyright (C) 2009 the original author or authors
- * <p>
- * This file is part of Ebean.
- * <p>
- * Ebean is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- * <p>
- * Ebean is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * <p>
- * You should have received a copy of the GNU Lesser General Public License
- * along with Ebean; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
 package io.ebean.spring.txn;
 
-import org.springframework.jdbc.datasource.ConnectionHolder;
-
 import io.ebeaninternal.server.transaction.ExternalJdbcTransaction;
 import io.ebeaninternal.server.transaction.TransactionManager;
+import org.springframework.jdbc.datasource.ConnectionHolder;
 
-public class SpringJdbcTransaction extends ExternalJdbcTransaction {
+final class SpringJdbcTransaction extends ExternalJdbcTransaction {
 
   private final ConnectionHolder holder;
 
-  public SpringJdbcTransaction(ConnectionHolder holder, TransactionManager manager) {
-    super("s" + holder.hashCode(), true, holder.getConnection(), manager);
+  SpringJdbcTransaction(ConnectionHolder holder, TransactionManager manager) {
+    super(true, holder.getConnection(), manager);
     this.holder = holder;
   }
 
@@ -38,8 +17,4 @@ public class SpringJdbcTransaction extends ExternalJdbcTransaction {
   public boolean isActive() {
     return holder.isSynchronizedWithTransaction();
   }
-
-  public ConnectionHolder getConnectionHolder() {
-    return holder;
-  }
 }

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

@@ -1,41 +1,33 @@
 package io.ebean.spring.txn;
 
+import io.avaje.applog.AppLog;
 import io.ebean.TxScope;
 import io.ebean.config.ExternalTransactionManager;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.transaction.TransactionManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.datasource.ConnectionHolder;
 import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.util.List;
 
+import static java.lang.System.Logger.Level.DEBUG;
+
 /**
  * A Spring-aware {@link ExternalTransactionManager}.
  * <p>
  * Will look for Spring transactions and use them if they exist.
- * </p>
  *
- * @since 18.05.2009
  * @author E Mc Greal
+ * @since 18.05.2009
  */
-public class SpringJdbcTransactionManager implements ExternalTransactionManager {
+public final class SpringJdbcTransactionManager implements ExternalTransactionManager {
 
-  private static final Logger log = LoggerFactory.getLogger(SpringJdbcTransactionManager.class);
+  private static final System.Logger log = AppLog.getLogger(SpringJdbcTransactionManager.class);
 
-  /**
-   * The data source.
-   */
   private DataSource dataSource;
-
-  /**
-   * The Ebean transaction manager.
-   */
   private TransactionManager transactionManager;
 
   /**
@@ -49,28 +41,24 @@ 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;
-    this.dataSource = transactionManager.getDataSource();
+    this.dataSource = transactionManager.dataSource();
   }
 
   /**
    * Looks for a current Spring managed transaction and wraps/returns that as a Ebean transaction.
    * <p>
-   * Returns null if there is no current spring transaction (lazy loading outside a spring txn etc).
-   * </p>
+   * Returns null if there is no current spring transaction (lazy loading outside a spring txn).
    */
   @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();
+      SpiTransaction currentEbeanTransaction = transactionManager.inScope();
       if (currentEbeanTransaction == null || !currentEbeanTransaction.isActive()) {
         return null;
       } else {
@@ -78,19 +66,18 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
       }
     }
 
-    SpringTxnListener springTxnLister = getSpringTxnListener();
+    SpringTxnListener springTxnLister = listener();
     if (springTxnLister != null) {
       // we have already seen this transaction
-      return springTxnLister.getTransaction();
+      return springTxnLister.transaction();
     } else {
       // This is a new spring transaction that we have not seen before.
       // "wrap" it in a SpringJdbcTransaction for use with Ebean
       SpringJdbcTransaction newTrans = new SpringJdbcTransaction(holder, transactionManager);
 
       // Create and register a Spring TransactionSynchronization for this transaction
-      springTxnLister = createSpringTxnListener(newTrans);
+      springTxnLister = createListener(newTrans);
       TransactionSynchronizationManager.registerSynchronization(springTxnLister);
-
       return transactionManager.externalBeginTransaction(newTrans, TxScope.required());
     }
   }
@@ -99,47 +86,35 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
    * Search for our specific transaction listener.
    * <p>
    * If it exists then we have already seen and "wrapped" this transaction.
-   * </p>
    */
-  private SpringTxnListener getSpringTxnListener() {
-
+  private SpringTxnListener listener() {
     if (TransactionSynchronizationManager.isSynchronizationActive()) {
       List<TransactionSynchronization> synchronizations = TransactionSynchronizationManager.getSynchronizations();
-      if (synchronizations != null) {
-        // search for our specific listener
-        for (TransactionSynchronization synchronization : synchronizations) {
-          if (synchronization instanceof SpringTxnListener) {
-            return (SpringTxnListener) synchronization;
-          }
+      // search for our specific listener
+      for (TransactionSynchronization synchronization : synchronizations) {
+        if (synchronization instanceof SpringTxnListener) {
+          return (SpringTxnListener) synchronization;
         }
       }
     }
-
     return null;
   }
 
   /**
-   * Create a listener to register with Spring to enable Ebean to be
-   * notified when transactions commit and rollback.
-   * <p>
-   * This is used by Ebean to notify it's appropriate listeners and maintain it's server
-   * cache etc.
-   * </p>
+   * Create a listener to enable Ebean to be notified when transactions commit and rollback.
    */
-  private SpringTxnListener createSpringTxnListener(SpringJdbcTransaction t) {
-    return new SpringTxnListener(transactionManager, t);
+  private SpringTxnListener createListener(SpringJdbcTransaction transaction) {
+    return new SpringTxnListener(transactionManager, transaction);
   }
 
   /**
-   * A Spring TransactionSynchronization that we register with Spring to get
-   * notified when a Spring managed transaction has been committed or rolled
-   * back.
+   * A Spring TransactionSynchronization that we register with Spring to get notified when
+   * a Spring managed transaction has been committed or rolled back.
    * <p>
-   * When Ebean is notified (of the commit/rollback) it can then manage its
-   * cache, notify BeanPersistListeners etc.
-   * </p>
+   * When Ebean is notified (of the commit/rollback) it can then manage its cache, notify
+   * BeanPersistListeners etc.
    */
-  private static class SpringTxnListener extends TransactionSynchronizationAdapter {
+  private static class SpringTxnListener implements TransactionSynchronization {
 
     private final TransactionManager transactionManager;
 
@@ -150,36 +125,33 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
       this.transaction = t;
     }
 
-    /**
-     * Return the associated Ebean wrapped transaction.
-     */
-    SpringJdbcTransaction getTransaction() {
+    private SpringJdbcTransaction transaction() {
       return transaction;
     }
 
     @Override
     public void flush() {
-      transaction.flushBatch();
+      transaction.flush();
     }
 
     @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);
+          log.log(DEBUG, "Spring Txn [{0}] committed", transaction.getId());
+          transaction.postCommit();
           break;
 
         case STATUS_ROLLED_BACK:
-          log.debug("Spring Txn [{}] rollback", transaction.getId());
-          transactionManager.notifyOfRollback(transaction, null);
+          log.log(DEBUG, "Spring Txn [{0}] rollback", transaction.getId());
+          transaction.postRollback(null);
           break;
 
         default:

src/main/java/module-info.java

@@ -0,0 +1,9 @@
+module io.ebean.spring.txn {
+
+    exports io.ebean.spring.txn;
+
+    requires io.ebean.api;
+    requires io.ebean.core;
+    requires spring.jdbc;
+    requires spring.tx;
+}

src/test/java/org/example/Account.java

@@ -3,7 +3,9 @@ package org.example;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
+import javax.persistence.Table;
 
+@Table(name="o_account")
 @Entity
 public class Account {
 

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

@@ -1,29 +1,29 @@
 package org.example;
 
+import io.ebean.Database;
+import io.ebean.DatabaseFactory;
+import io.ebean.annotation.PersistBatch;
+import io.ebean.config.DatabaseConfig;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
-import io.ebean.EbeanServer;
-import io.ebean.EbeanServerFactory;
-import io.ebean.config.ServerConfig;
-
 /**
  * A Spring FactoryBean for constructing EbeanServer instances.
  *
  * @since 18.05.2009
  * @author E Mc Greal
  */
-public class EbeanServerFactoryBean implements InitializingBean, FactoryBean<EbeanServer> {
+public class EbeanServerFactoryBean implements InitializingBean, FactoryBean<Database> {
 
   /**
    * The Ebean server configuration.
    */
-  private ServerConfig serverConfig;
+  private DatabaseConfig serverConfig;
 
   /**
    * The EbeanServer instance.
    */
-  private EbeanServer ebeanServer;
+  private Database ebeanServer;
 
   public void afterPropertiesSet() throws Exception {
 
@@ -31,16 +31,17 @@ 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);
+    this.ebeanServer = DatabaseFactory.create(serverConfig);
   }
 
-  public EbeanServer getObject() throws Exception {
+  public Database getObject() throws Exception {
     return ebeanServer;
   }
 
-  public Class<? extends EbeanServer> getObjectType() {
-    return EbeanServer.class;
+  public Class<? extends Database> getObjectType() {
+    return Database.class;
   }
 
   /**
@@ -53,14 +54,14 @@ public class EbeanServerFactoryBean implements InitializingBean, FactoryBean<Ebe
   /**
    * Return the server configuration.
    */
-  public ServerConfig getServerConfig() {
+  public DatabaseConfig getServerConfig() {
     return serverConfig;
   }
 
   /**
    * Set the server configuration.
    */
-  public void setServerConfig(ServerConfig serverConfig) {
+  public void setServerConfig(DatabaseConfig serverConfig) {
     this.serverConfig = serverConfig;
   }
 }

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

@@ -1,6 +1,6 @@
 package org.example;
 
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.Transaction;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,6 +10,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;
 
@@ -42,12 +43,12 @@ public class EbeanSpringModuleTest {
   @Test
   public void testInactiveTransaction() {
 
-    Transaction transaction = Ebean.beginTransaction();
+    Transaction transaction = DB.beginTransaction();
     long id;
     try {
       User user = new User();
       user.setName("save with txn 1");
-      Ebean.save(user);
+      DB.save(user);
       transaction.commit();
       id = user.getOid();
     } finally {
@@ -55,15 +56,19 @@ public class EbeanSpringModuleTest {
       //transaction.end();
     }
 
-    Ebean.delete(User.class, id);
+    DB.delete(User.class, id);
   }
 
   @Test
   public void testBatchInsert() {
-
     userService.batchInsert();
   }
 
+  @Test
+  public void testRequiresNew() {
+    userService.requiresNew();
+  }
+
   /**
    * Test app.
    */
@@ -74,6 +79,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();
   }
 
   /**

src/test/java/org/example/Role.java

@@ -4,7 +4,9 @@ import java.util.Set;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
+import javax.persistence.Table;
 
+@Table(name="o_role")
 @Entity
 public class Role {
 

src/test/java/org/example/User.java

@@ -1,13 +1,13 @@
 package org.example;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToOne;
+import io.ebean.Model;
+
+import javax.persistence.*;
 import java.util.Set;
 
+@Table(name="o_user")
 @Entity
-public class User {
+public class User extends Model {
 
 	@Id
 	long oid;

src/test/java/org/example/UserService.java

@@ -14,4 +14,6 @@ public interface UserService {
 	void nonTransactional();
 
 	void batchInsert();
+
+	void requiresNew();
 }

src/test/java/org/example/UserServiceImpl.java

@@ -1,78 +1,98 @@
 package org.example;
 
+import io.ebean.Database;
 import io.ebean.Transaction;
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import io.ebean.EbeanServer;
-
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * The Class UserServiceImpl.
  *
- * @since 18.05.2009
  * @author E Mc Greal
+ * @since 18.05.2009
  */
-public class UserServiceImpl implements UserService {
+public class UserServiceImpl implements UserService, ApplicationContextAware {
 
-	/** The ebean server. */
-	@Autowired
-	private EbeanServer ebeanServer;
+    private ApplicationContext applicationContext;
 
-	@Transactional(propagation = Propagation.REQUIRED, rollbackFor=Throwable.class)
-	public void save(User user) {
-		ebeanServer.save(user);
-	}
+    /**
+     * The ebean server.
+     */
+    @Autowired
+    private Database ebeanServer;
 
-	@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
-	public User find(long id) {
-		return ebeanServer.find(User.class, id);
-	}
-
-	public void nonTransactional() {
-		ebeanServer.currentTransaction();
-	}
-
-	public User findNoCurrentTransaction(long id) {
-		return ebeanServer.find(User.class, id);
-	}
-
-  @Transactional(propagation = Propagation.REQUIRED)
-  public void batchInsert() {
-
-    List<User> users = new ArrayList<>();
-    for(int i=0 ;i<25;i++){
-      User user = new User();
-      user.setName("user"+i);
-      users.add(user);
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+    public void save(User user) {
+        ebeanServer.save(user);
     }
 
-    System.out.println("---------before batch-------");
+    @Transactional(readOnly = true, propagation = Propagation.REQUIRED)
+    public User find(long id) {
+        return ebeanServer.find(User.class, id);
+    }
 
-    Transaction tx = ebeanServer.currentTransaction();
-    tx.setBatchSize(20);
-    ebeanServer.saveAll(users);
+    public void nonTransactional() {
+        ebeanServer.currentTransaction();
+    }
 
-    System.out.println("---------after batch-------");
-  }
+    public User findNoCurrentTransaction(long id) {
+        return ebeanServer.find(User.class, id);
+    }
+
+    @Transactional(propagation = Propagation.REQUIRED)
+    public void batchInsert() {
+
+        List<User> users = new ArrayList<>();
+        for (int i = 0; i < 25; i++) {
+            User user = new User();
+            user.setName("user" + i);
+            users.add(user);
+        }
+
+        System.out.println("---------before batch-------");
+
+        Transaction tx = ebeanServer.currentTransaction();
+        tx.setBatchSize(20);
+        ebeanServer.saveAll(users);
+
+        System.out.println("---------after batch-------");
+
+        applicationContext.getBean(UserService.class).requiresNew();
+    }
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void requiresNew() {
+        User user = new User();
+        user.setName("user_x0");
+        user.insert();
+        //ebeanServer.save(user);
+    }
 
 
-	/**
-	 * Return the ebean server.
-	 */
-	public EbeanServer getEbeanServer() {
-		return ebeanServer;
-	}
+    /**
+     * Return the ebean server.
+     */
+    public Database getEbeanServer() {
+        return ebeanServer;
+    }
 
-	/**
-	 * Sets the ebean server.
-	 */
-	public void setEbeanServer(EbeanServer ebeanServer) {
-		this.ebeanServer = ebeanServer;
-	}
+    /**
+     * Sets the ebean server.
+     */
+    public void setEbeanServer(Database ebeanServer) {
+        this.ebeanServer = ebeanServer;
+    }
 
 
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
 }

src/test/resources/default-ebean-server.xml

@@ -4,7 +4,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
 
 	<!-- Default abstract Ebean Server configuration -->
-	<bean id="defaultEbeanServerConfig" class="io.ebean.config.ServerConfig" abstract="true">
+	<bean id="defaultEbeanServerConfig" class="io.ebean.config.DatabaseConfig" abstract="true">
 		<property name="externalTransactionManager">
 			<bean class="io.ebean.spring.txn.SpringJdbcTransactionManager"/>
 		</property>

src/test/resources/logback-test.xml

@@ -1,8 +1,5 @@
 <configuration scan="true" scanPeriod="10 seconds">
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>TRACE</level>
-    </filter>
     <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
     </encoder>
@@ -29,4 +26,4 @@
   <!-- elasticSearch query logging -->
   <!--<logger name="io.ebean.ELA" level="TRACE"/>-->
 
-</configuration>
+</configuration>