Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Upgrade to Solr 9.0.0"

Browse Source 
It requires Jetty 9.4.x but we're using Jetty 11.

This reverts commit b2bd3dee5e.

See gh-31054
This commit is contained in:
Andy Wilkinson
2022-05-16 13:00:51 +01:00
parent 08768b5821
commit 5ffe4598f5
2 changed files with 9 additions and 10 deletions
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.Http2SolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
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({ Http2SolrClient.class, CloudSolrClient.class })
@ConditionalOnClass({ HttpSolrClient.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 Http2SolrClient.Builder(properties.getHost()).build();
return new HttpSolrClient.Builder(properties.getHost()).build();
}
}