diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index fac00bf442..057d75517e 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -49,7 +49,7 @@ 5.14.3 2.7.7 1.9.48 - 1.5.1 + 1.5.2 1.8.9 2.6.0 3.9.3 @@ -82,7 +82,7 @@ 2.8.0 1.4.193 1.3 - 3.7.4 + 3.7.5 1.1.3 5.2.5.Final 5.3.4.Final @@ -108,7 +108,7 @@ 7.5.0.Final 2.0.6 2.9.0 - 2.25 + 2.25.1 2.0.4 9.4.1.v20170120 2.2.0.v201112011158 @@ -117,7 +117,7 @@ 4.2.2 2.9.7 1.3.5 - 3.9.0 + 3.9.1 20140107 1.4.0 2.2.0 @@ -128,13 +128,13 @@ 2.7 1.1.9 1.16.12 - 1.5.6 + 1.5.7 6.1.0.jre8 2.5.4 1.2.0 3.4.1 5.1.40 - 5.5.0.Final + 5.5.1.Final 1.9.22 2.1.1 9.4.1212.jre7 diff --git a/spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java index fada25acca..b6b59dd6bb 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java @@ -83,7 +83,7 @@ public class NarayanaDataSourceBeanTests { Connection mockConnection = mock(Connection.class); XAConnection mockXaConnection = mock(XAConnection.class); given(mockXaConnection.getConnection()).willReturn(mockConnection); - given(this.dataSource.getXAConnection()).willReturn(mockXaConnection); + given(this.dataSource.getXAConnection("", "")).willReturn(mockXaConnection); Properties properties = new Properties(); properties.put(TransactionalDriver.XADataSource, this.dataSource); @@ -93,7 +93,7 @@ public class NarayanaDataSourceBeanTests { connection.commit(); - verify(this.dataSource, times(1)).getXAConnection(); + verify(this.dataSource, times(1)).getXAConnection("", ""); verify(mockXaConnection, times(1)).getConnection(); verify(mockConnection, times(1)).commit(); }