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

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-01-24 21:28:42 +00:00
parent ef4f83e7b1 5ee46742be
commit 55c06fcc15
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@
<activemq.version>5.14.3</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.48</appengine-sdk.version>
<artemis.version>1.5.1</artemis.version>
<artemis.version>1.5.2</artemis.version>
<aspectj.version>1.8.9</aspectj.version>
<assertj.version>2.6.0</assertj.version>
<atomikos.version>3.9.3</atomikos.version>
@ -82,7 +82,7 @@
<gson.version>2.8.0</gson.version>
<h2.version>1.4.193</h2.version>
<hamcrest.version>1.3</hamcrest.version>
<hazelcast.version>3.7.4</hazelcast.version>
<hazelcast.version>3.7.5</hazelcast.version>
<hazelcast-hibernate5.version>1.1.3</hazelcast-hibernate5.version>
<hibernate.version>5.2.5.Final</hibernate.version>
<hibernate-validator.version>5.3.4.Final</hibernate-validator.version>
@ -108,7 +108,7 @@
<jboss-transaction-spi.version>7.5.0.Final</jboss-transaction-spi.version>
<jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.9.0</jedis.version>
<jersey.version>2.25</jersey.version>
<jersey.version>2.25.1</jersey.version>
<jest.version>2.0.4</jest.version>
<jetty.version>9.4.1.v20170120</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
@ -117,7 +117,7 @@
<jna.version>4.2.2</jna.version>
<joda-time.version>2.9.7</joda-time.version>
<jolokia.version>1.3.5</jolokia.version>
<jooq.version>3.9.0</jooq.version>
<jooq.version>3.9.1</jooq.version>
<json.version>20140107</json.version>
<jsonassert.version>1.4.0</jsonassert.version>
<json-path.version>2.2.0</json-path.version>
@ -128,13 +128,13 @@
<log4j2.version>2.7</log4j2.version>
<logback.version>1.1.9</logback.version>
<lombok.version>1.16.12</lombok.version>
<mariadb.version>1.5.6</mariadb.version>
<mariadb.version>1.5.7</mariadb.version>
<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>
<mockito.version>2.5.4</mockito.version>
<mongo-driver-reactivestreams.version>1.2.0</mongo-driver-reactivestreams.version>
<mongodb.version>3.4.1</mongodb.version>
<mysql.version>5.1.40</mysql.version>
<narayana.version>5.5.0.Final</narayana.version>
<narayana.version>5.5.1.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>2.1.1</neo4j-ogm.version>
<postgresql.version>9.4.1212.jre7</postgresql.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();
}