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.5.30.Final 

Closes gh-10004
This commit is contained in:
Gytis Trikleris 2017-08-14 10:36:09 +02:00 committed by Stephane Nicoll
parent 4956829ba9
commit 4d42d89d71
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,7 @@
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<mongodb.version>3.4.2</mongodb.version> <mongodb.version>3.4.2</mongodb.version>
<mysql.version>5.1.43</mysql.version> <mysql.version>5.1.43</mysql.version>
<narayana.version>5.5.28.Final</narayana.version> <narayana.version>5.5.30.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version> <nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>2.1.3</neo4j-ogm.version> <neo4j-ogm.version>2.1.3</neo4j-ogm.version>
<postgresql.version>9.4.1212.jre7</postgresql.version> <postgresql.version>9.4.1212.jre7</postgresql.version>
@ -2752,4 +2752,4 @@
<id>integration-test</id> <id>integration-test</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

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); Connection mockConnection = mock(Connection.class);
XAConnection mockXaConnection = mock(XAConnection.class); XAConnection mockXaConnection = mock(XAConnection.class);
given(mockXaConnection.getConnection()).willReturn(mockConnection); given(mockXaConnection.getConnection()).willReturn(mockConnection);
given(this.dataSource.getXAConnection("", "")).willReturn(mockXaConnection); given(this.dataSource.getXAConnection()).willReturn(mockXaConnection);
Properties properties = new Properties(); Properties properties = new Properties();
properties.put(TransactionalDriver.XADataSource, this.dataSource); properties.put(TransactionalDriver.XADataSource, this.dataSource);
@ -93,7 +93,7 @@ public class NarayanaDataSourceBeanTests {
connection.commit(); connection.commit();
verify(this.dataSource, times(1)).getXAConnection("", ""); verify(this.dataSource, times(1)).getXAConnection();
verify(mockXaConnection, times(1)).getConnection(); verify(mockXaConnection, times(1)).getConnection();
verify(mockConnection, times(1)).commit(); verify(mockConnection, times(1)).commit();
} }