From c108da9d535a6db19596905d0bbf7378540a2e88 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 21 Sep 2016 14:09:23 +0100 Subject: [PATCH] Upgrade to Spring Data Ingalls M1 Closes gh-6785 Closes gh-5835 --- .../autoconfigure/SpringApplicationHierarchyTests.java | 7 +++++-- .../data/neo4j/Neo4jRepositoriesAutoConfiguration.java | 4 ++-- .../neo4j/Neo4jRepositoriesAutoConfigureRegistrar.java | 4 ++-- spring-boot-dependencies/pom.xml | 10 +++++----- .../spring-boot-sample-data-cassandra/pom.xml | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java index c36d8bb3af..24a881ab45 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java +++ b/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 { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfiguration.java index 263db1d51c..fedbca7345 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfiguration.java +++ b/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) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigureRegistrar.java index fc3585a381..b00d6f7709 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigureRegistrar.java +++ b/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 diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index fc744d43e2..3e127d80f2 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -52,7 +52,7 @@ 3.9.3 2.1.4 2.3.3 - 2.1.9 + 3.1.0 1.3.1 1.9.2 3.2.2 @@ -104,7 +104,7 @@ 3.3.0.Final 7.3.4.Final 2.0.6 - 2.8.1 + 2.9.0 2.23.2 2.0.3 9.3.11.v20160721 @@ -148,8 +148,8 @@ 1.6.2.RELEASE 1.2.3.RELEASE 3.0.7.RELEASE - Hopper-SR3 - 0.20.0.RELEASE + Ingalls-M1 + 0.21.0.RELEASE 4.3.2.RELEASE 1.1.3.RELEASE 1.2.6.RELEASE @@ -2636,4 +2636,4 @@ integration-test - \ No newline at end of file + diff --git a/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml b/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml index f2d2d2e41a..c16ea8f200 100644 --- a/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml @@ -35,7 +35,7 @@ org.cassandraunit cassandra-unit-spring - 2.1.9.2 + 3.0.0.1 test