diff --git a/pom.xml b/pom.xml index 7448cb709..821468a4b 100644 --- a/pom.xml +++ b/pom.xml @@ -33,28 +33,28 @@ org.slf4j slf4j-api - 1.7.30 + 2.0.0 provided io.ebean ebean - 13.0.0 + 13.9.2 provided io.ebean ebean-ddl-generator - 13.0.0 + 13.9.2 test com.fasterxml.jackson.core jackson-databind - 2.12.0 + 2.13.3 test @@ -96,21 +96,21 @@ junit junit - 4.13.1 + 4.13.2 test org.assertj assertj-core - 3.1.0 + 3.23.1 test com.h2database h2 - 2.1.210 + 2.1.214 test @@ -124,7 +124,7 @@ org.slf4j jcl-over-slf4j - [1.7,) + 2.0.0 test @@ -139,7 +139,7 @@ true - io.ebean.tile:enhancement:13.0.0 + io.ebean.tile:enhancement:13.9.1 diff --git a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java index 38a88a707..cb478ce16 100644 --- a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java +++ b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java @@ -1,11 +1,10 @@ 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; @@ -15,6 +14,8 @@ 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}. *

@@ -26,7 +27,7 @@ import java.util.List; */ public 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. @@ -153,7 +154,7 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager @Override public void flush() { - transaction.flushBatch(); + transaction.flush(); } @Override @@ -167,12 +168,12 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager public void afterCompletion(int status) { switch (status) { case STATUS_COMMITTED: - log.debug("Spring Txn [{}] committed", transaction.getId()); + log.log(DEBUG, "Spring Txn [{0}] committed", transaction.getId()); transaction.postCommit(); break; case STATUS_ROLLED_BACK: - log.debug("Spring Txn [{}] rollback", transaction.getId()); + log.log(DEBUG, "Spring Txn [{0}] rollback", transaction.getId()); transaction.postRollback(null); break;