root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Upgrade to Narayana 5.6.1.Final 

Closes gh-9479
This commit is contained in:
Andy Wilkinson 2017-06-12 12:04:35 +01:00
parent 09f0be9030
commit da211d9751
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -134,7 +134,7 @@
<mongo-driver-reactivestreams.version>1.4.0</mongo-driver-reactivestreams.version>
<mongodb.version>3.4.2</mongodb.version>
<mysql.version>5.1.42</mysql.version>
<narayana.version>5.5.24.Final</narayana.version>
<narayana.version>5.6.1.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>3.0.0-M01</neo4j-ogm.version>
<netty.version>4.1.12.Final</netty.version>

4
spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java
View File

@ -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();
}