Merge pull request spring-projects#10004 from gytis:1.5.x

* pr/10004:
  Upgrade to Narayana 5.5.30.Final

Author: snicoll

spring-boot-dependencies/pom.xml

@@ -135,7 +135,7 @@
 		<mockito.version>1.10.19</mockito.version>
 		<mongodb.version>3.4.2</mongodb.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>
 		<neo4j-ogm.version>2.1.3</neo4j-ogm.version>
 		<postgresql.version>9.4.1212.jre7</postgresql.version>
@@ -2752,4 +2752,4 @@
 			<id>integration-test</id>
 		</profile>
 	</profiles>
-</project>
+</project>

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

@@ -83,7 +83,7 @@ public void shouldGetConnectionAndCommit() throws SQLException {
 		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 void shouldGetConnectionAndCommit() throws SQLException {
 
 		connection.commit();
 
-		verify(this.dataSource, times(1)).getXAConnection("", "");
+		verify(this.dataSource, times(1)).getXAConnection();
 		verify(mockXaConnection, times(1)).getConnection();
 		verify(mockConnection, times(1)).commit();
 	}