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

Upgrade to Solr 7.4.0

Browse Source 
Closes gh-13667
This commit is contained in:
Andy Wilkinson 2018-07-03 13:46:09 +01:00
parent 13d53c0a33
commit 1d4ec56b08
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,9 @@
package org.springframework.boot.autoconfigure.solr; package org.springframework.boot.autoconfigure.solr;
import java.util.Arrays;
import java.util.Optional;
import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.impl.HttpSolrClient;
@ -56,8 +59,8 @@ public class SolrAutoConfiguration {
private SolrClient createSolrClient() { private SolrClient createSolrClient() {
if (StringUtils.hasText(this.properties.getZkHost())) { if (StringUtils.hasText(this.properties.getZkHost())) {
return new CloudSolrClient.Builder().withZkHost(this.properties.getZkHost()) return new CloudSolrClient.Builder(Arrays.asList(this.properties.getZkHost()),
.build(); Optional.empty()).build();
} }
return new HttpSolrClient.Builder(this.properties.getHost()).build(); return new HttpSolrClient.Builder(this.properties.getHost()).build();
} }

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

@ -150,7 +150,7 @@
<servlet-api.version>4.0.1</servlet-api.version> <servlet-api.version>4.0.1</servlet-api.version>
<slf4j.version>1.7.25</slf4j.version> <slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.19</snakeyaml.version> <snakeyaml.version>1.19</snakeyaml.version>
<solr.version>7.2.1</solr.version> <solr.version>7.4.0</solr.version>
<spring.version>5.1.0.BUILD-SNAPSHOT</spring.version> <spring.version>5.1.0.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>2.0.4.RELEASE</spring-amqp.version> <spring-amqp.version>2.0.4.RELEASE</spring-amqp.version>
<spring-batch.version>4.0.1.RELEASE</spring-batch.version> <spring-batch.version>4.0.1.RELEASE</spring-batch.version>