From 8e12cd74327a59a5574d29ca322235c556de9b1c Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 8 May 2018 16:38:18 -0400 Subject: [PATCH] Upgrade to SI 4.3.16, SF 4.3.17 --- .../samples/jpa/EclipseLinkAutoConfiguration.java | 10 +++++++--- .../samples/jpa/OpenJpaAutoConfiguration.java | 10 +++++++--- build.gradle | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/EclipseLinkAutoConfiguration.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/EclipseLinkAutoConfiguration.java index 7205fd7a..227727ff 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/EclipseLinkAutoConfiguration.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/EclipseLinkAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ package org.springframework.integration.samples.jpa; import java.util.HashMap; import java.util.Map; + import javax.persistence.EntityManager; import javax.sql.DataSource; @@ -29,6 +30,7 @@ import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; 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.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -45,6 +47,7 @@ import org.springframework.util.ClassUtils; /** * @author Artem Bilan + * @author Gary Russell * @since 4.2 */ @Configuration @@ -56,8 +59,9 @@ import org.springframework.util.ClassUtils; public class EclipseLinkAutoConfiguration extends JpaBaseConfiguration { public EclipseLinkAutoConfiguration(DataSource dataSource, JpaProperties properties, - ObjectProvider jtaTransactionManagerProvider) { - super(dataSource, properties, jtaTransactionManagerProvider); + ObjectProvider jtaTransactionManagerProvider, + ObjectProvider transactionManagerCustomizers) { + super(dataSource, properties, jtaTransactionManagerProvider, transactionManagerCustomizers); } @Override diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/OpenJpaAutoConfiguration.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/OpenJpaAutoConfiguration.java index 91d3a52b..f4cf2477 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/OpenJpaAutoConfiguration.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/OpenJpaAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ package org.springframework.integration.samples.jpa; import java.util.HashMap; import java.util.Map; + import javax.persistence.EntityManager; import javax.sql.DataSource; @@ -29,6 +30,7 @@ import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; 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.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -45,6 +47,7 @@ import org.springframework.util.ClassUtils; /** * @author Artem Bilan + * @author Gary Russell * @since 4.2 */ @Configuration @@ -56,8 +59,9 @@ import org.springframework.util.ClassUtils; public class OpenJpaAutoConfiguration extends JpaBaseConfiguration { public OpenJpaAutoConfiguration(DataSource dataSource, JpaProperties properties, - ObjectProvider jtaTransactionManagerProvider) { - super(dataSource, properties, jtaTransactionManagerProvider); + ObjectProvider jtaTransactionManagerProvider, + ObjectProvider transactionManagerCustomizers) { + super(dataSource, properties, jtaTransactionManagerProvider, transactionManagerCustomizers); } @Override diff --git a/build.gradle b/build.gradle index c8c2ea25..2bfdf33f 100644 --- a/build.gradle +++ b/build.gradle @@ -196,12 +196,12 @@ subprojects { subproject -> postgresVersion = '9.1-901-1.jdbc4' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '4.3.15.RELEASE' + springIntegrationVersion = '4.3.16.RELEASE' springIntegrationDslVersion = '1.2.3.RELEASE' springIntegrationKafkaVersion = '2.3.0.RELEASE' springIntegrationSplunkVersion = '1.1.0.RELEASE' springKafkaVersion = '1.3.0.RELEASE' - springVersion = '4.3.15.RELEASE' + springVersion = '4.3.17.RELEASE' springSecurityVersion = '4.1.4.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1'