Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2017-08-18 12:08:20 +02:00

View File

@@ -52,7 +52,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
* @since 1.4.0
*/
@Configuration
@ConditionalOnClass({ SessionFactory.class, PlatformTransactionManager.class })
@ConditionalOnClass({ SessionFactory.class, Neo4jTransactionManager.class,
PlatformTransactionManager.class })
@ConditionalOnMissingBean(SessionFactory.class)
@EnableConfigurationProperties(Neo4jProperties.class)
public class Neo4jDataAutoConfiguration {