From 6c6b9c284dd0ab6e73c619c559ad7e1908f3c10e Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 4 Apr 2017 09:21:32 +0100
Subject: [PATCH] Upgrade to Solr 6.5 and align with latest Spring Data Solr
 snapshots

Closes gh-8801
---
 .../autoconfigure/data/solr/SolrRepositoriesRegistrar.java   | 4 ++--
 .../boot/autoconfigure/solr/SolrAutoConfiguration.java       | 5 +++--
 .../data/solr/SolrRepositoriesAutoConfigurationTests.java    | 2 +-
 spring-boot-dependencies/pom.xml                             | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesRegistrar.java
index b0a2e467d02..8223f2bf92b 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesRegistrar.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesRegistrar.java
@@ -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 {
 
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
index c356c53b246..a6d689129e9 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
@@ -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();
 	}
 
 }
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java
index fd44a8f5a3b..89ff04a1d1d 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java
@@ -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 {
 
 	}
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index c5d5a6f326f..7409ed41901 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -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>