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 @@
1.1.1
1.7.25
1.18
- 5.5.4
+ 6.5.0
1.0-groovy-2.4
5.0.0.BUILD-SNAPSHOT
2.0.0.BUILD-SNAPSHOT