Merge branch '1.5.x'

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java

@@ -24,6 +24,7 @@ import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfigurati
 import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.neo4j.Neo4jDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
@@ -64,7 +65,8 @@ public class SpringApplicationHierarchyTests {
 	@EnableAutoConfiguration(exclude = { ElasticsearchDataAutoConfiguration.class,
 			ElasticsearchRepositoriesAutoConfiguration.class,
 			CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
-			Neo4jDataAutoConfiguration.class, RedisAutoConfiguration.class,
+			MongoDataAutoConfiguration.class, Neo4jDataAutoConfiguration.class,
+			RedisAutoConfiguration.class,
 			RedisRepositoriesAutoConfiguration.class }, excludeName = {
 					"org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration" })
 	public static class Child {
@@ -76,7 +78,8 @@ public class SpringApplicationHierarchyTests {
 			ElasticsearchDataAutoConfiguration.class,
 			ElasticsearchRepositoriesAutoConfiguration.class,
 			CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
-			Neo4jDataAutoConfiguration.class, RedisAutoConfiguration.class,
+			MongoDataAutoConfiguration.class, Neo4jDataAutoConfiguration.class,
+			RedisAutoConfiguration.class,
 			RedisRepositoriesAutoConfiguration.class }, excludeName = {
 					"org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration" })
 	public static class Parent {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfiguration.java

@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.neo4j.repository.GraphRepository;
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
-import org.springframework.data.neo4j.repository.config.Neo4jRepositoryConfigurationExtension;
+import org.springframework.data.neo4j.repository.config.GraphRepositoryConfigurationExtension;
 import org.springframework.data.neo4j.repository.support.GraphRepositoryFactoryBean;
 
 /**
@@ -55,7 +55,7 @@ import org.springframework.data.neo4j.repository.support.GraphRepositoryFactoryB
 @Configuration
 @ConditionalOnClass({ Neo4jSession.class, GraphRepository.class })
 @ConditionalOnMissingBean({ GraphRepositoryFactoryBean.class,
-		Neo4jRepositoryConfigurationExtension.class })
+		GraphRepositoryConfigurationExtension.class })
 @ConditionalOnProperty(prefix = "spring.data.neo4j.repositories", name = "enabled", havingValue = "true", matchIfMissing = true)
 @Import(Neo4jRepositoriesAutoConfigureRegistrar.class)
 @AutoConfigureAfter(Neo4jDataAutoConfiguration.class)

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigureRegistrar.java

@@ -21,7 +21,7 @@ import java.lang.annotation.Annotation;
 import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
-import org.springframework.data.neo4j.repository.config.Neo4jRepositoryConfigurationExtension;
+import org.springframework.data.neo4j.repository.config.GraphRepositoryConfigurationExtension;
 import org.springframework.data.repository.config.RepositoryConfigurationExtension;
 
 /**
@@ -45,7 +45,7 @@ class Neo4jRepositoriesAutoConfigureRegistrar
 
 	@Override
 	protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() {
-		return new Neo4jRepositoryConfigurationExtension();
+		return new GraphRepositoryConfigurationExtension();
 	}
 
 	@EnableNeo4jRepositories

spring-boot-dependencies/pom.xml

@@ -52,7 +52,7 @@
 		<atomikos.version>3.9.3</atomikos.version>
 		<bitronix.version>2.1.4</bitronix.version>
 		<caffeine.version>2.3.3</caffeine.version>
-		<cassandra-driver.version>2.1.9</cassandra-driver.version>
+		<cassandra-driver.version>3.1.0</cassandra-driver.version>
 		<classmate.version>1.3.1</classmate.version>
 		<commons-beanutils.version>1.9.2</commons-beanutils.version>
 		<commons-collections.version>3.2.2</commons-collections.version>
@@ -104,7 +104,7 @@
 		<jboss-logging.version>3.3.0.Final</jboss-logging.version>
 		<jboss-transaction-spi.version>7.3.4.Final</jboss-transaction-spi.version>
 		<jdom2.version>2.0.6</jdom2.version>
-		<jedis.version>2.8.1</jedis.version>
+		<jedis.version>2.9.0</jedis.version>
 		<jersey.version>2.23.2</jersey.version>
 		<jest.version>2.0.3</jest.version>
 		<jetty.version>9.3.11.v20160721</jetty.version>
@@ -148,8 +148,8 @@
 		<spring-amqp.version>1.6.2.RELEASE</spring-amqp.version>
 		<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
 		<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
-		<spring-data-releasetrain.version>Hopper-SR3</spring-data-releasetrain.version>
-		<spring-hateoas.version>0.21.0.BUILD-SNAPSHOT</spring-hateoas.version>
+		<spring-data-releasetrain.version>Ingalls-M1</spring-data-releasetrain.version>
+		<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
 		<spring-integration.version>4.3.2.RELEASE</spring-integration.version>
 		<spring-integration-java-dsl.version>1.1.3.RELEASE</spring-integration-java-dsl.version>
 		<spring-loaded.version>1.2.6.RELEASE</spring-loaded.version>
@@ -2613,4 +2613,4 @@
 			<id>integration-test</id>
 		</profile>
 	</profiles>
-</project>
\ No newline at end of file
+</project>

spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml

@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>org.cassandraunit</groupId>
 			<artifactId>cassandra-unit-spring</artifactId>
-			<version>2.1.9.2</version>
+			<version>3.0.0.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>