root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
pull/7739/head
Andy Wilkinson 8 years ago
parent 9bc77254a7 c108da9d53
commit 16a0f72df5
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File

7
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SpringApplicationHierarchyTests.java
Unescape Escape View File

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

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfiguration.java
Unescape Escape View File

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

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigureRegistrar.java
Unescape Escape View File

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

10
spring-boot-dependencies/pom.xml
Unescape Escape View File

@ -52,7 +52,7 @@
<atomikos.version>3.9.3</atomikos.version> <atomikos.version>3.9.3</atomikos.version>
<bitronix.version>2.1.4</bitronix.version> <bitronix.version>2.1.4</bitronix.version>
<caffeine.version>2.3.3</caffeine.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> <classmate.version>1.3.1</classmate.version>
<commons-beanutils.version>1.9.2</commons-beanutils.version> <commons-beanutils.version>1.9.2</commons-beanutils.version>
<commons-collections.version>3.2.2</commons-collections.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-logging.version>3.3.0.Final</jboss-logging.version>
<jboss-transaction-spi.version>7.3.4.Final</jboss-transaction-spi.version> <jboss-transaction-spi.version>7.3.4.Final</jboss-transaction-spi.version>
<jdom2.version>2.0.6</jdom2.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> <jersey.version>2.23.2</jersey.version>
<jest.version>2.0.3</jest.version> <jest.version>2.0.3</jest.version>
<jetty.version>9.3.11.v20160721</jetty.version> <jetty.version>9.3.11.v20160721</jetty.version>
@ -148,8 +148,8 @@
<spring-amqp.version>1.6.2.RELEASE</spring-amqp.version> <spring-amqp.version>1.6.2.RELEASE</spring-amqp.version>
<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version> <spring-batch.version>3.0.7.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Hopper-SR3</spring-data-releasetrain.version> <spring-data-releasetrain.version>Ingalls-M1</spring-data-releasetrain.version>
<spring-hateoas.version>0.21.0.BUILD-SNAPSHOT</spring-hateoas.version> <spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.3.2.RELEASE</spring-integration.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-integration-java-dsl.version>1.1.3.RELEASE</spring-integration-java-dsl.version>
<spring-loaded.version>1.2.6.RELEASE</spring-loaded.version> <spring-loaded.version>1.2.6.RELEASE</spring-loaded.version>
@ -2613,4 +2613,4 @@
<id>integration-test</id> <id>integration-test</id>
</profile> </profile>
</profiles> </profiles>
</project> </project>

2
spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save