This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch spring-boot-2 in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 97e555591f165046457011c9205a7155281570dd Author: Willem Jiang <jiangni...@huawei.com> AuthorDate: Sun Mar 25 11:01:31 2018 +0800 SCB-429 Upgraded the Spring Boot version to 1.5.9 --- pom.xml | 2 +- .../saga/persistence/jpa/EclipseLinkJpaConfiguration.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8e62bbd..235a0de 100755 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ <java.version>1.8</java.version> <kamon.version>0.6.7</kamon.version> <log4j.version>2.6.2</log4j.version> - <spring.boot.version>1.4.5.RELEASE</spring.boot.version> + <spring.boot.version>1.5.9.RELEASE</spring.boot.version> <spring.cloud.version>Camden.SR6</spring.cloud.version> <java.chassis.version>0.5.0</java.chassis.version> <spring.version>4.3.7.RELEASE</spring.version> diff --git a/saga-persistence/saga-persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java b/saga-persistence/saga-persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java index 1ad7879..2796aba 100644 --- a/saga-persistence/saga-persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java +++ b/saga-persistence/saga-persistence-jpa/src/main/java/org/apache/servicecomb/saga/persistence/jpa/EclipseLinkJpaConfiguration.java @@ -25,6 +25,7 @@ import javax.sql.DataSource; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; +import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers; import org.springframework.context.annotation.Configuration; import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter; import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter; @@ -34,8 +35,9 @@ import org.springframework.transaction.jta.JtaTransactionManager; public class EclipseLinkJpaConfiguration extends JpaBaseConfiguration { EclipseLinkJpaConfiguration(DataSource dataSource, JpaProperties properties, - ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider) { - super(dataSource, properties, jtaTransactionManagerProvider); + ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider, + ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) { + super(dataSource, properties, jtaTransactionManagerProvider, transactionManagerCustomizers); } @Override -- To stop receiving notification emails like this one, please contact ningji...@apache.org.