Skip to content

Commit 012a199

Browse files
snicollsnicoll
committed
Remove Spring Data Solr support
In preparation to the upgrade to Spring Data 2021.0, this commit removes auto-configuration for Spring Data Solr. Closes gh-24939
1 parent 287edfb commit 012a199

File tree

22 files changed

+9
-643
lines changed

22 files changed

+9
-643
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ dependencies {
6969
optional("org.apache.commons:commons-dbcp2")
7070
optional("org.apache.kafka:kafka-clients")
7171
optional("org.apache.kafka:kafka-streams")
72+
optional("org.apache.solr:solr-solrj")
7273
optional("org.apache.tomcat.embed:tomcat-embed-core")
7374
optional("org.apache.tomcat.embed:tomcat-embed-el")
7475
optional("org.apache.tomcat:tomcat-jdbc")
@@ -99,7 +100,6 @@ dependencies {
99100
optional("org.springframework.data:spring-data-mongodb")
100101
optional("org.springframework.data:spring-data-redis")
101102
optional("org.springframework.data:spring-data-elasticsearch")
102-
optional("org.springframework.data:spring-data-solr")
103103
optional("org.springframework.integration:spring-integration-core")
104104
optional("org.springframework.kafka:spring-kafka")
105105
optional("org.springframework.security:spring-security-config")

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@
3333
import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
3434
import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
3535
import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
36-
import org.springframework.boot.autoconfigure.data.solr.SolrRepositoriesAutoConfiguration;
3736
import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
3837
import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration;
3938
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
@@ -80,9 +79,8 @@ private ReactiveWebApplicationContextRunner reactiveWebRunner() {
8079
Neo4jRepositoriesAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
8180
MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
8281
RepositoryRestMvcAutoConfiguration.class, HazelcastAutoConfiguration.class,
83-
ElasticsearchDataAutoConfiguration.class, SolrRepositoriesAutoConfiguration.class,
84-
SolrAutoConfiguration.class, RedisAutoConfiguration.class, RedisRepositoriesAutoConfiguration.class,
85-
MetricsAutoConfiguration.class })
82+
ElasticsearchDataAutoConfiguration.class, SolrAutoConfiguration.class, RedisAutoConfiguration.class,
83+
RedisRepositoriesAutoConfiguration.class, MetricsAutoConfiguration.class })
8684
@SpringBootConfiguration
8785
static class WebEndpointTestApplication {
8886

‎spring-boot-project/spring-boot-actuator/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ dependencies {
3434
optional("javax.cache:cache-api")
3535
optional("javax.jms:javax.jms-api")
3636
optional("net.sf.ehcache:ehcache")
37+
optional("org.apache.solr:solr-solrj")
3738
optional("org.apache.tomcat.embed:tomcat-embed-core")
3839
optional("org.aspectj:aspectjweaver")
3940
optional("org.eclipse.jetty:jetty-server")
@@ -60,7 +61,6 @@ dependencies {
6061
optional("org.springframework.data:spring-data-mongodb")
6162
optional("org.springframework.data:spring-data-redis")
6263
optional("org.springframework.data:spring-data-rest-webmvc")
63-
optional("org.springframework.data:spring-data-solr")
6464
optional("org.springframework.integration:spring-integration-core")
6565
optional("org.springframework.security:spring-security-core")
6666
optional("org.springframework.security:spring-security-web")

‎spring-boot-project/spring-boot-autoconfigure/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ dependencies {
124124
optional("org.springframework.data:spring-data-neo4j")
125125
optional("org.springframework.data:spring-data-r2dbc")
126126
optional("org.springframework.data:spring-data-redis")
127-
optional("org.springframework.data:spring-data-solr")
128127
optional("org.springframework.hateoas:spring-hateoas")
129128
optional("org.springframework.security:spring-security-acl")
130129
optional("org.springframework.security:spring-security-config")

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfiguration.java

-53
This file was deleted.

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesRegistrar.java

-55
This file was deleted.

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/solr/package-info.java

-20
This file was deleted.

‎spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ org.springframework.boot.autoconfigure.data.neo4j.Neo4jDataAutoConfiguration,\
5454
org.springframework.boot.autoconfigure.data.neo4j.Neo4jReactiveDataAutoConfiguration,\
5555
org.springframework.boot.autoconfigure.data.neo4j.Neo4jReactiveRepositoriesAutoConfiguration,\
5656
org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesAutoConfiguration,\
57-
org.springframework.boot.autoconfigure.data.solr.SolrRepositoriesAutoConfiguration,\
5857
org.springframework.boot.autoconfigure.data.r2dbc.R2dbcDataAutoConfiguration,\
5958
org.springframework.boot.autoconfigure.data.r2dbc.R2dbcRepositoriesAutoConfiguration,\
6059
org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration,\

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/alt/solr/CitySolrRepository.java

-24
This file was deleted.

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfigurationTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@
2323
import org.springframework.boot.autoconfigure.AutoConfigurations;
2424
import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
2525
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
26+
import org.springframework.boot.autoconfigure.data.alt.elasticsearch.CityElasticsearchDbRepository;
2627
import org.springframework.boot.autoconfigure.data.alt.jpa.CityJpaRepository;
2728
import org.springframework.boot.autoconfigure.data.alt.mongo.CityMongoDbRepository;
28-
import org.springframework.boot.autoconfigure.data.alt.solr.CitySolrRepository;
2929
import org.springframework.boot.autoconfigure.data.jpa.city.City;
3030
import org.springframework.boot.autoconfigure.data.jpa.city.CityRepository;
3131
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
@@ -162,7 +162,7 @@ static class TestConfiguration {
162162
@EnableJpaRepositories(
163163
basePackageClasses = org.springframework.boot.autoconfigure.data.alt.jpa.CityJpaRepository.class,
164164
excludeFilters = { @Filter(type = FilterType.ASSIGNABLE_TYPE, value = CityMongoDbRepository.class),
165-
@Filter(type = FilterType.ASSIGNABLE_TYPE, value = CitySolrRepository.class) })
165+
@Filter(type = FilterType.ASSIGNABLE_TYPE, value = CityElasticsearchDbRepository.class) })
166166
@TestAutoConfigurationPackage(City.class)
167167
static class CustomConfiguration {
168168

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/solr/SolrRepositoriesAutoConfigurationTests.java

-115
This file was deleted.

0 commit comments

Comments
 (0)