root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Upgrade to Solr 9.0.0 

Closes gh-31054
This commit is contained in:
Andy Wilkinson 2022-05-16 12:03:25 +01:00
parent 1b8ecf1957
commit b2bd3dee5e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java
View File

@ -21,7 +21,7 @@ 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;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@ -38,7 +38,7 @@ import org.springframework.util.StringUtils;
* @since 1.1.0
*/
@AutoConfiguration
@ConditionalOnClass({ HttpSolrClient.class, CloudSolrClient.class })
@ConditionalOnClass({ Http2SolrClient.class, CloudSolrClient.class })
@EnableConfigurationProperties(SolrProperties.class)
public class SolrAutoConfiguration {
@ -48,7 +48,7 @@ public class SolrAutoConfiguration {
if (StringUtils.hasText(properties.getZkHost())) {
return new CloudSolrClient.Builder(Arrays.asList(properties.getZkHost()), Optional.empty()).build();
}
return new HttpSolrClient.Builder(properties.getHost()).build();
return new Http2SolrClient.Builder(properties.getHost()).build();
}
}

13
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1312,26 +1312,27 @@ bom {
]
}
}
library("Solr", "8.11.1") {
library("Solr", "9.0.0") {
group("org.apache.solr") {
modules = [
"solr-analysis-extras",
"solr-analytics",
"solr-cell",
"solr-core",
"solr-dataimporthandler",
"solr-dataimporthandler-extras",
"solr-extraction",
"solr-gcs-repository",
"solr-hadoop-auth",
"solr-hdfs",
"solr-jaegertracer-configurator",
"solr-jwt-auth",
"solr-langid",
"solr-ltr",
"solr-prometheus-exporter",
"solr-s3-repository",
"solr-scripting",
"solr-solrj" {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
},
"solr-test-framework",
"solr-velocity"
"solr-test-framework"
]
}
}