Skip to content

Commit 2b2e0b4

Browse files
wilkinsonaphilwebb
wilkinsona
authored and
philwebb
committed
Reduce dependencies of spring-boot-actuator
1 parent 4d2e851 commit 2b2e0b4

File tree

65 files changed

+16356
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+16356
-82
lines changed

‎settings.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ include "spring-boot-project:spring-boot-actuator"
4545
include "spring-boot-project:spring-boot-actuator-autoconfigure"
4646
include "spring-boot-project:spring-boot-actuator-autoconfigure-all"
4747
include "spring-boot-project:spring-boot-actuator-docs"
48+
include "spring-boot-project:spring-boot-actuator-integration-tests"
4849
include "spring-boot-project:spring-boot-amqp"
4950
include "spring-boot-project:spring-boot-artemis"
5051
include "spring-boot-project:spring-boot-autoconfigure"

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.micrometer.core.instrument.binder.tomcat.TomcatMetrics;
2121
import org.apache.catalina.Manager;
2222

23-
import org.springframework.boot.actuate.metrics.web.tomcat.TomcatMetricsBinder;
2423
import org.springframework.boot.autoconfigure.AutoConfiguration;
2524
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2625
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -29,6 +28,7 @@
2928
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
3029
import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
3130
import org.springframework.boot.tomcat.TomcatWebServer;
31+
import org.springframework.boot.tomcat.actuate.metrics.TomcatMetricsBinder;
3232
import org.springframework.context.annotation.Bean;
3333

3434
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/mappings/MappingsEndpointAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
2121
import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;
2222
import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
23-
import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider;
24-
import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletsMappingDescriptionProvider;
2523
import org.springframework.boot.actuate.web.mappings.servlet.FiltersMappingDescriptionProvider;
2624
import org.springframework.boot.actuate.web.mappings.servlet.ServletsMappingDescriptionProvider;
2725
import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -30,6 +28,8 @@
3028
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3129
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
3230
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
31+
import org.springframework.boot.webflux.actuate.mappings.DispatcherHandlersMappingDescriptionProvider;
32+
import org.springframework.boot.webmvc.actuate.mappings.DispatcherServletsMappingDescriptionProvider;
3333
import org.springframework.context.ApplicationContext;
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/tomcat/TomcatMetricsAutoConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import org.junit.jupiter.api.Test;
2727

2828
import org.springframework.boot.SpringApplication;
29-
import org.springframework.boot.actuate.metrics.web.tomcat.TomcatMetricsBinder;
3029
import org.springframework.boot.autoconfigure.AutoConfigurations;
3130
import org.springframework.boot.context.event.ApplicationStartedEvent;
3231
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3332
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3433
import org.springframework.boot.tomcat.TomcatWebServer;
34+
import org.springframework.boot.tomcat.actuate.metrics.TomcatMetricsBinder;
3535
import org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration;
3636
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3737
import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;

‎spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/web/mappings/MappingsEndpointReactiveDocumentationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import org.springframework.boot.actuate.docs.AbstractEndpointDocumentationTests;
2929
import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;
3030
import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
31-
import org.springframework.boot.actuate.web.mappings.reactive.DispatcherHandlersMappingDescriptionProvider;
3231
import org.springframework.boot.reactor.netty.NettyReactiveWebServerFactory;
3332
import org.springframework.boot.test.context.SpringBootTest;
3433
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3534
import org.springframework.boot.web.server.test.LocalServerPort;
35+
import org.springframework.boot.webflux.actuate.mappings.DispatcherHandlersMappingDescriptionProvider;
3636
import org.springframework.context.ConfigurableApplicationContext;
3737
import org.springframework.context.annotation.Bean;
3838
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/web/mappings/MappingsEndpointServletDocumentationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
import org.springframework.boot.actuate.docs.AbstractEndpointDocumentationTests;
2929
import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;
3030
import org.springframework.boot.actuate.web.mappings.MappingsEndpoint;
31-
import org.springframework.boot.actuate.web.mappings.servlet.DispatcherServletsMappingDescriptionProvider;
3231
import org.springframework.boot.actuate.web.mappings.servlet.FiltersMappingDescriptionProvider;
3332
import org.springframework.boot.actuate.web.mappings.servlet.ServletsMappingDescriptionProvider;
3433
import org.springframework.boot.test.context.SpringBootTest;
3534
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3635
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
3736
import org.springframework.boot.web.server.test.LocalServerPort;
37+
import org.springframework.boot.webmvc.actuate.mappings.DispatcherServletsMappingDescriptionProvider;
3838
import org.springframework.context.ConfigurableApplicationContext;
3939
import org.springframework.context.annotation.Bean;
4040
import org.springframework.context.annotation.Configuration;

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
plugins {
2+
id "java-library"
3+
id "java-test-fixtures"
4+
}
5+
6+
description = "Spring Boot Actuator Integration Tests"
7+
8+
9+
dependencies {
10+
testFixturesImplementation(project(":spring-boot-project:spring-boot-actuator"))
11+
testFixturesImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
12+
testFixturesImplementation(project(":spring-boot-project:spring-boot-http-converter"))
13+
testFixturesImplementation(project(":spring-boot-project:spring-boot-jackson"))
14+
testFixturesImplementation(project(":spring-boot-project:spring-boot-jersey"))
15+
testFixturesImplementation(project(":spring-boot-project:spring-boot-reactor-netty"))
16+
testFixturesImplementation(project(":spring-boot-project:spring-boot-test"))
17+
testFixturesImplementation(project(":spring-boot-project:spring-boot-tomcat"))
18+
testFixturesImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
19+
testFixturesImplementation(project(":spring-boot-project:spring-boot-webflux"))
20+
testFixturesImplementation(project(":spring-boot-project:spring-boot-webmvc"))
21+
testFixturesImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
22+
testImplementation(project(":spring-boot-project:spring-boot-actuator"))
23+
testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
24+
testImplementation(project(":spring-boot-project:spring-boot-http-converter"))
25+
testImplementation(project(":spring-boot-project:spring-boot-jackson"))
26+
testImplementation(project(":spring-boot-project:spring-boot-jersey"))
27+
testImplementation(project(":spring-boot-project:spring-boot-reactor-netty"))
28+
testImplementation(project(":spring-boot-project:spring-boot-test"))
29+
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
30+
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
31+
testImplementation(project(":spring-boot-project:spring-boot-web-server"))
32+
testImplementation(project(":spring-boot-project:spring-boot-webflux"))
33+
testImplementation(project(":spring-boot-project:spring-boot-webmvc"))
34+
testImplementation("io.micrometer:micrometer-registry-prometheus")
35+
testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
36+
testImplementation("net.minidev:json-smart")
37+
testImplementation("org.springframework.security:spring-security-web")
38+
testRuntimeOnly("ch.qos.logback:logback-classic")
39+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"groups": [],
3+
"properties": []
4+
}

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

Whitespace-only changes.

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java renamed to spring-boot-project/spring-boot-actuator-integration-tests/src/test/java/org/springframework/boot/actuate/audit/AuditEventsEndpointWebIntegrationTests.java

File renamed without changes.

0 commit comments

Comments
 (0)