Skip to content

Commit fa46211

Browse files
snicollsnicoll
committed
Move Servlet high-level infrastructure to spring-boot-servlet
1 parent 56f1722 commit fa46211

File tree

53 files changed

+183
-92
lines changed

Some content is hidden

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

53 files changed

+183
-92
lines changed

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ include "spring-boot-project:spring-boot-security-oauth2-client"
120120
include "spring-boot-project:spring-boot-security-oauth2-resource-server"
121121
include "spring-boot-project:spring-boot-security-saml2"
122122
include "spring-boot-project:spring-boot-sendgrid"
123+
include "spring-boot-project:spring-boot-servlet"
123124
include "spring-boot-project:spring-boot-session"
124125
include "spring-boot-project:spring-boot-session-data-mongodb"
125126
include "spring-boot-project:spring-boot-session-data-redis"

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
2828
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
2929
import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration;
30-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
3130
import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
3231
import org.springframework.boot.actuate.endpoint.invoke.ParameterValueMapper;
3332
import org.springframework.boot.actuate.endpoint.web.EndpointMapping;
@@ -51,6 +50,7 @@
5150
import org.springframework.boot.cloud.CloudPlatform;
5251
import org.springframework.boot.info.GitProperties;
5352
import org.springframework.boot.restclient.RestTemplateBuilder;
53+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
5454
import org.springframework.context.ApplicationContext;
5555
import org.springframework.context.annotation.Bean;
5656
import org.springframework.context.annotation.Configuration;

‎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,14 +20,14 @@
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.servlet.FiltersMappingDescriptionProvider;
24-
import org.springframework.boot.actuate.web.mappings.servlet.ServletsMappingDescriptionProvider;
2523
import org.springframework.boot.autoconfigure.AutoConfiguration;
2624
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2725
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2826
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2927
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
3028
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
29+
import org.springframework.boot.servlet.actuate.mappings.FiltersMappingDescriptionProvider;
30+
import org.springframework.boot.servlet.actuate.mappings.ServletsMappingDescriptionProvider;
3131
import org.springframework.boot.webflux.actuate.mappings.DispatcherHandlersMappingDescriptionProvider;
3232
import org.springframework.boot.webmvc.actuate.mappings.DispatcherServletsMappingDescriptionProvider;
3333
import org.springframework.context.ApplicationContext;

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2929
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
3030
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
31-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
3231
import org.springframework.boot.actuate.endpoint.ApiVersion;
3332
import org.springframework.boot.actuate.endpoint.EndpointId;
3433
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
@@ -43,6 +42,7 @@
4342
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4443
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
4544
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
45+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
4646
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4747
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4848
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryHealthEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
26-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2726
import org.springframework.boot.actuate.endpoint.ApiVersion;
2827
import org.springframework.boot.actuate.health.CompositeHealth;
2928
import org.springframework.boot.actuate.health.Health;
@@ -35,6 +34,7 @@
3534
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3635
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
3736
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
37+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3939
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
4040
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryInfoEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
import org.springframework.boot.actuate.autoconfigure.info.InfoContributorAutoConfiguration;
2727
import org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguration;
2828
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
29-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.AutoConfigurations;
3130
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3231
import org.springframework.boot.autoconfigure.info.ProjectInfoAutoConfiguration;
3332
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
3433
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3534
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
3635
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
36+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
3737
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3838
import org.springframework.boot.testsupport.classpath.resources.WithResource;
3939
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
2626
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
27-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2827
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3029
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
3130
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3231
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
32+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
3333
import org.springframework.boot.test.util.TestPropertyValues;
3434
import org.springframework.boot.web.context.servlet.AnnotationConfigServletWebApplicationContext;
3535
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
2222
import org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration;
2323
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
24-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2524
import org.springframework.boot.autoconfigure.AutoConfigurations;
2625
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
2726
import org.springframework.boot.jersey.actuate.autoconfigure.health.HealthEndpointJerseyExtensionAutoConfiguration;
2827
import org.springframework.boot.jersey.autoconfigure.JerseyAutoConfiguration;
28+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
2929
import org.springframework.boot.test.context.FilteredClassLoader;
3030
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3131
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
3131
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
3232
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
33-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
3433
import org.springframework.boot.autoconfigure.AutoConfigurations;
3534
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
3635
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
36+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
3737
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3939
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
26-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2726
import org.springframework.boot.autoconfigure.AutoConfigurations;
2827
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
2928
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
29+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
3030
import org.springframework.boot.test.context.runner.ContextConsumer;
3131
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3232
import org.springframework.boot.webmvc.actuate.autoconfigure.endpoint.web.WebMvcEndpointManagementContextConfiguration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
3333
import org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration;
3434
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
35-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
3635
import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
3736
import org.springframework.boot.autoconfigure.AutoConfigurations;
3837
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
3938
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
39+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
4040
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4141
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4242
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
2828
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
2929
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
30-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
3130
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
3231
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3332
import org.springframework.boot.data.rest.autoconfigure.RepositoryRestMvcAutoConfiguration;
3433
import org.springframework.boot.hateoas.autoconfigure.HypermediaAutoConfiguration;
3534
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
3635
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3736
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
37+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
3838
import org.springframework.boot.test.util.TestPropertyValues;
3939
import org.springframework.boot.web.context.servlet.AnnotationConfigServletWebApplicationContext;
4040
import org.springframework.boot.webmvc.actuate.endpoint.web.WebMvcEndpointHandlerMapping;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
2222
import org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration;
2323
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
24-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2524
import org.springframework.boot.autoconfigure.AutoConfigurations;
2625
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
2726
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
27+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
2828
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
2929
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3030
import org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatServletManagementContextAutoConfiguration;

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ChildManagementContextInitializerAotTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.springframework.aot.test.generate.TestGenerationContext;
2626
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
2727
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
28-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.AutoConfigurations;
29+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
3030
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3131
import org.springframework.boot.test.system.CapturedOutput;
3232
import org.springframework.boot.test.system.OutputCaptureExtension;

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
26-
import org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration;
2726
import org.springframework.boot.autoconfigure.AutoConfigurations;
27+
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
2828
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
2929
import org.springframework.boot.test.system.CapturedOutput;
3030
import org.springframework.boot.test.system.OutputCaptureExtension;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

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

‎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
@@ -7,4 +7,3 @@ org.springframework.boot.actuate.autoconfigure.info.InfoEndpointAutoConfiguratio
77
org.springframework.boot.actuate.autoconfigure.logging.LogFileWebEndpointAutoConfiguration
88
org.springframework.boot.actuate.autoconfigure.logging.LoggersEndpointAutoConfiguration
99
org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration
10-
org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
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.FiltersMappingDescriptionProvider;
32-
import org.springframework.boot.actuate.web.mappings.servlet.ServletsMappingDescriptionProvider;
31+
import org.springframework.boot.servlet.actuate.mappings.FiltersMappingDescriptionProvider;
32+
import org.springframework.boot.servlet.actuate.mappings.ServletsMappingDescriptionProvider;
3333
import org.springframework.boot.test.context.SpringBootTest;
3434
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3535
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ dependencies {
1111
testImplementation(project(":spring-boot-project:spring-boot-http-converter"))
1212
testImplementation(project(":spring-boot-project:spring-boot-jackson"))
1313
testImplementation(project(":spring-boot-project:spring-boot-jersey"))
14+
testImplementation(project(":spring-boot-project:spring-boot-jetty"))
1415
testImplementation(project(":spring-boot-project:spring-boot-metrics"))
1516
testImplementation(project(":spring-boot-project:spring-boot-reactor-netty"))
1617
testImplementation(project(":spring-boot-project:spring-boot-test"))
1718
testImplementation(project(":spring-boot-project:spring-boot-tomcat"))
1819
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
20+
testImplementation(project(":spring-boot-project:spring-boot-undertow"))
1921
testImplementation(project(":spring-boot-project:spring-boot-web-server"))
2022
testImplementation(project(":spring-boot-project:spring-boot-webflux"))
2123
testImplementation(project(":spring-boot-project:spring-boot-webmvc"))
@@ -27,4 +29,9 @@ dependencies {
2729
testImplementation("net.minidev:json-smart")
2830
testImplementation("org.springframework.security:spring-security-web")
2931
testRuntimeOnly("ch.qos.logback:logback-classic")
32+
testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
33+
}
34+
35+
test {
36+
jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED"
3037
}

0 commit comments

Comments
 (0)