Upgrade to Solr 7.4.0

Closes gh-13667

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();
 	}

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>