Compare commits

..
Author SHA1 Message Date
Rob Bygrave a2c82263ee Bump to 12.12.0 2021-09-24 11:29:50 +12:00
rbygrave 30f3d542b3 Bump to 12.11.4 2021-09-09 13:10:13 +12:00
rbygrave 56cb2c69aa Bump to 12.11.1 2021-08-16 19:49:02 +12:00
rbygrave bd1dd43cbf Bump to 12.11.0 2021-08-16 19:43:28 +12:00
rob bygrave 5caae29df9 [maven-release-plugin] prepare for next development iteration 2020-12-23 20:46:33 +13:00
2 changed files with 16 additions and 9 deletions
+14 -7
View File
@@ -5,12 +5,12 @@
<parent>
<groupId>org.avaje</groupId>
<artifactId>java8-oss</artifactId>
<version>2.3</version>
<version>3.2</version>
</parent>
<groupId>io.ebean</groupId>
<artifactId>ebean-spring-txn</artifactId>
<version>12.6.4</version>
<version>12.12.0</version>
<name>ebean-spring-txn</name>
<packaging>jar</packaging>
@@ -25,7 +25,7 @@
<scm>
<developerConnection>scm:git:git@github.com:ebean-orm/ebean-spring-txn.git</developerConnection>
<tag>ebean-spring-txn-12.6.4</tag>
<tag>HEAD</tag>
</scm>
<dependencies>
@@ -39,10 +39,17 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
<version>12.6.4</version>
<version>12.12.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>12.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -102,7 +109,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.196</version>
<version>1.4.199</version>
<scope>test</scope>
</dependency>
@@ -127,11 +134,11 @@
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.18</version>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.ebean.tile:enhancement:12.6.1</tile>
<tile>io.ebean.tile:enhancement:12.12.0</tile>
</tiles>
</configuration>
</plugin>
@@ -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 {