From 1d4ec56b080ebbccfeb08c4b94e00ee22c766f0c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 3 Jul 2018 13:46:09 +0100
Subject: [PATCH] Upgrade to Solr 7.4.0

Closes gh-13667
---
 .../boot/autoconfigure/solr/SolrAutoConfiguration.java     | 7 +++++--
 spring-boot-project/spring-boot-dependencies/pom.xml       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
index 7a669b5455c..c661ae82025 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
@@ -16,6 +16,9 @@
 
 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.impl.CloudSolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -56,8 +59,8 @@ public class SolrAutoConfiguration {
 
 	private SolrClient createSolrClient() {
 		if (StringUtils.hasText(this.properties.getZkHost())) {
-			return new CloudSolrClient.Builder().withZkHost(this.properties.getZkHost())
-					.build();
+			return new CloudSolrClient.Builder(Arrays.asList(this.properties.getZkHost()),
+					Optional.empty()).build();
 		}
 		return new HttpSolrClient.Builder(this.properties.getHost()).build();
 	}
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index cf6924e2c90..ddfdc14ffcc 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -150,7 +150,7 @@
 		<servlet-api.version>4.0.1</servlet-api.version>
 		<slf4j.version>1.7.25</slf4j.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-amqp.version>2.0.4.RELEASE</spring-amqp.version>
 		<spring-batch.version>4.0.1.RELEASE</spring-batch.version>