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

Closes gh-8801
spring-projects · Apr 4, 2017 · 6c6b9c2 · 6c6b9c2
1 parent f892363
commit 6c6b9c2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/...main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesRegistrar.java b/...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 @@ protected RepositoryConfigurationExtension getRepositoryConfigurationExtension()
 		return new SolrRepositoryConfigExtension();
 	}
 
-	@EnableSolrRepositories(multicoreSupport = true)
+	@EnableSolrRepositories
 	private static class EnableSolrRepositoriesConfiguration {
 
 	}

diff --git a/...gure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java b/...gure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
@@ -56,9 +56,10 @@ public SolrClient solrClient() {
 
 	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/.../springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java b/.../springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java
@@ -101,7 +101,7 @@ static class EmptyConfiguration {
 
 	@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
@@ -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>