Skip to content

Commit 96c2d08

Browse files
committed
Remove support for Solr as it is not compatible with Jetty 11
Closes gh-31054
1 parent c4beca3 commit 96c2d08

File tree

23 files changed

+2
-705
lines changed

23 files changed

+2
-705
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ dependencies {
9393
}
9494
optional("org.apache.kafka:kafka-clients")
9595
optional("org.apache.kafka:kafka-streams")
96-
optional("org.apache.solr:solr-solrj") {
97-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
98-
}
9996
optional("org.apache.tomcat.embed:tomcat-embed-core")
10097
optional("org.apache.tomcat.embed:tomcat-embed-el")
10198
optional("org.apache.tomcat:tomcat-jdbc")

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/solr/SolrHealthContributorAutoConfiguration.java

Lines changed: 0 additions & 55 deletions
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/solr/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,6 @@
267267
"description": "Whether to enable Redis health check.",
268268
"defaultValue": true
269269
},
270-
{
271-
"name": "management.health.solr.enabled",
272-
"type": "java.lang.Boolean",
273-
"description": "Whether to enable Solr health check.",
274-
"defaultValue": true
275-
},
276270
{
277271
"name": "management.health.status.order",
278272
"defaultValue": [

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ org.springframework.boot.actuate.autoconfigure.scheduling.ScheduledTasksEndpoint
9191
org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration
9292
org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
9393
org.springframework.boot.actuate.autoconfigure.session.SessionsEndpointAutoConfiguration
94-
org.springframework.boot.actuate.autoconfigure.solr.SolrHealthContributorAutoConfiguration
9594
org.springframework.boot.actuate.autoconfigure.startup.StartupEndpointAutoConfiguration
9695
org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration
9796
org.springframework.boot.actuate.autoconfigure.trace.http.HttpTraceAutoConfiguration

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
4242
import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
4343
import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration;
44-
import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
4544
import org.springframework.boot.context.annotation.UserConfigurations;
4645
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
4746
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
@@ -82,7 +81,7 @@ private ReactiveWebApplicationContextRunner reactiveWebRunner() {
8281
Neo4jRepositoriesAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
8382
MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
8483
RepositoryRestMvcAutoConfiguration.class, HazelcastAutoConfiguration.class,
85-
ElasticsearchDataAutoConfiguration.class, SolrAutoConfiguration.class, RedisAutoConfiguration.class,
84+
ElasticsearchDataAutoConfiguration.class, RedisAutoConfiguration.class,
8685
RedisRepositoriesAutoConfiguration.class, MetricsAutoConfiguration.class, WavefrontAutoConfiguration.class,
8786
BraveAutoConfiguration.class, OpenTelemetryAutoConfiguration.class })
8887
@SpringBootConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/solr/SolrHealthContributorAutoConfigurationTests.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ dependencies {
3636
}
3737
optional("javax.cache:cache-api")
3838
optional("jakarta.jms:jakarta.jms-api")
39-
optional("org.apache.solr:solr-solrj") {
40-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
41-
}
4239
optional("org.apache.tomcat.embed:tomcat-embed-core")
4340
optional("org.aspectj:aspectjweaver")
4441
optional("org.cache2k:cache2k-micrometer")

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/solr/SolrHealthIndicator.java

Lines changed: 0 additions & 136 deletions
This file was deleted.

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/solr/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)