From 30f3d542b33582e64169f82c4ebe865b3dbac7e8 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Thu, 9 Sep 2021 13:10:13 +1200
Subject: [PATCH] Bump to 12.11.4

---
 pom.xml                                                       | 4 ++--
 .../io/ebean/spring/txn/SpringJdbcTransactionManager.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5c8ff9732..1dae4782e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,14 +39,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.4-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.1</version>
+      <version>12.11.4A</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java
index 1d9bc9030..38a88a707 100644
--- a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java
+++ b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java
@@ -52,7 +52,7 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
     // 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();
   }
 
   /**
@@ -67,7 +67,7 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager
     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 {