Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-04-03 10:42:41 +03:00
commit 3915f37dae
1 changed files with 2 additions and 1 deletions

View File

@ -69,7 +69,8 @@ public class TransactionAutoConfigurationTests {
@Test
public void singleTransactionManager() {
load(new Class<?>[] { DataSourceAutoConfiguration.class,
DataSourceTransactionManagerAutoConfiguration.class });
DataSourceTransactionManagerAutoConfiguration.class },
"spring.datasource.initialize:false");
PlatformTransactionManager transactionManager = this.context
.getBean(PlatformTransactionManager.class);
TransactionTemplate transactionTemplate = this.context