Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Solr 6.5 and align with latest Spring Data Solr snapshots

Browse Source 
Closes gh-8801
This commit is contained in:
Andy Wilkinson 2017-04-04 09:21:32 +01:00
parent f892363c0f
commit 6c6b9c284d
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesRegistrar.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -48,7 +48,7 @@ class SolrRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSup
return new SolrRepositoryConfigExtension();
}
@EnableSolrRepositories(multicoreSupport = true)
@EnableSolrRepositories
private static class EnableSolrRepositoriesConfiguration {
}

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
View File

@ -56,9 +56,10 @@ public class SolrAutoConfiguration {
private SolrClient createSolrClient() {
if (StringUtils.hasText(this.properties.getZkHost())) {
return new CloudSolrClient(this.properties.getZkHost());
return new CloudSolrClient.Builder().withZkHost(this.properties.getZkHost())
.build();
}
return new HttpSolrClient(this.properties.getHost());
return new HttpSolrClient.Builder(this.properties.getHost()).build();
}
}

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java
View File

@ -101,7 +101,7 @@ public class SolrRepositoriesAutoConfigurationTests {
@Configuration
@TestAutoConfigurationPackage(SolrRepositoriesAutoConfigurationTests.class)
@EnableSolrRepositories(basePackageClasses = CitySolrRepository.class, multicoreSupport = true)
@EnableSolrRepositories(basePackageClasses = CitySolrRepository.class)
protected static class CustomizedConfiguration {
}

2
spring-boot-dependencies/pom.xml
View File

@ -152,7 +152,7 @@
<simple-json.version>1.1.1</simple-json.version>
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.18</snakeyaml.version>
<solr.version>5.5.4</solr.version>
<solr.version>6.5.0</solr.version>
<spock.version>1.0-groovy-2.4</spock.version>
<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>2.0.0.BUILD-SNAPSHOT</spring-amqp.version>