Skip to content

Commit 9e6374f

Browse files
philwebbphilwebb
committed
Fixup Change Tomcat autoconfigure package ordering
1 parent 5b9222e commit 9e6374f

File tree

55 files changed

+58
-58
lines changed

Some content is hidden

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

55 files changed

+58
-58
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/tomcat/TomcatReactiveManagementContextAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2929
import org.springframework.boot.tomcat.autoconfigure.TomcatWebServerConfiguration;
30-
import org.springframework.boot.tomcat.reactive.autoconfigure.TomcatReactiveWebServerAutoConfiguration;
30+
import org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration;
3131
import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
3232
import org.springframework.context.annotation.Bean;
3333

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/tomcat/TomcatServletManagementContextAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
2929
import org.springframework.boot.tomcat.autoconfigure.TomcatWebServerConfiguration;
30-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
30+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3131
import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
3232
import org.springframework.context.annotation.Bean;
3333

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/jersey/JerseyWebEndpointIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
3030
import org.springframework.boot.test.context.FilteredClassLoader;
3131
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
32-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
32+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3333
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
3434
import org.springframework.context.annotation.Bean;
3535
import org.springframework.context.annotation.Configuration;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.boot.test.context.FilteredClassLoader;
3737
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
39-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
39+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4040
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4141
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
4242
import org.springframework.http.HttpMethod;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3737
import org.springframework.boot.test.context.FilteredClassLoader;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
39-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
39+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4040
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4141
import org.springframework.context.annotation.Bean;
4242
import org.springframework.context.annotation.Configuration;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
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;
32-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
32+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3333
import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
3434
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
3535
import org.springframework.web.context.ConfigurableWebApplicationContext;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3939
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4040
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
41-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
41+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4242
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4343
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
4444
import org.springframework.http.HttpMethod;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4242
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4343
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
44-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
44+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4545
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4646
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
4747
import org.springframework.context.annotation.Bean;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3131
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3232
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
33-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
33+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3434
import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
3535
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
3636
import org.springframework.web.context.ConfigurableWebApplicationContext;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jersey/JerseyServerMetricsAutoConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
3939
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4040
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
41-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
41+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4242
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4343
import org.springframework.context.annotation.Bean;
4444
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import org.springframework.boot.test.context.SpringBootTest;
5656
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
5757
import org.springframework.boot.test.web.client.TestRestTemplate;
58-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
58+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
5959
import org.springframework.boot.web.client.RestTemplateBuilder;
6060
import org.springframework.boot.web.servlet.FilterRegistrationBean;
6161
import org.springframework.context.ApplicationContext;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
3333
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3434
import org.springframework.boot.tomcat.TomcatWebServer;
35+
import org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration;
36+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3537
import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;
36-
import org.springframework.boot.tomcat.reactive.autoconfigure.TomcatReactiveWebServerAutoConfiguration;
3738
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
38-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
3939
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
4040
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4141
import org.springframework.context.ConfigurableApplicationContext;

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementChildContextConfigurationIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.springframework.boot.test.context.runner.ContextConsumer;
4545
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
4646
import org.springframework.boot.tomcat.TomcatWebServer;
47-
import org.springframework.boot.tomcat.reactive.autoconfigure.TomcatReactiveWebServerAutoConfiguration;
47+
import org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration;
4848
import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
4949
import org.springframework.boot.web.context.WebServerInitializedEvent;
5050
import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.springframework.boot.test.system.OutputCaptureExtension;
3434
import org.springframework.boot.test.util.TestPropertyValues;
3535
import org.springframework.boot.testsupport.web.servlet.DirtiesUrlFactories;
36-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
36+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3737
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
3838
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
3939
import org.springframework.context.ApplicationContextInitializer;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
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;
33-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
33+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3434
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
3535
import org.springframework.util.StringUtils;
3636

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4646
import org.springframework.boot.test.context.runner.ContextConsumer;
4747
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
48-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
48+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4949
import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
5050
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
5151
import org.springframework.context.ConfigurableApplicationContext;

‎spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/MvcWebEndpointIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
3838
import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration;
3939
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
40+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4041
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
41-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
4242
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4343
import org.springframework.context.annotation.Bean;
4444
import org.springframework.context.annotation.Configuration;

‎spring-boot-project/spring-boot-autoconfigure-all/src/dockerTest/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfigurationIntegrationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3535
import org.springframework.boot.test.web.client.TestRestTemplate;
3636
import org.springframework.boot.testsupport.container.TestImage;
37-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
37+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3838
import org.springframework.context.annotation.Configuration;
3939
import org.springframework.context.annotation.Import;
4040
import org.springframework.pulsar.annotation.PulsarListener;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
3535
import org.springframework.boot.builder.SpringApplicationBuilder;
3636
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
37-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
37+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3838
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
3939
import org.springframework.context.ConfigurableApplicationContext;
4040
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3636
import org.springframework.boot.test.system.CapturedOutput;
3737
import org.springframework.boot.test.system.OutputCaptureExtension;
38-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
38+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3939
import org.springframework.boot.web.servlet.ServletRegistrationBean;
4040
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
4141
import org.springframework.context.ConfigurableApplicationContext;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.boot.test.context.SpringBootTest;
2929
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3030
import org.springframework.boot.test.web.client.TestRestTemplate;
31-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
31+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3232
import org.springframework.context.annotation.Bean;
3333
import org.springframework.context.annotation.Configuration;
3434
import org.springframework.context.annotation.Import;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.springframework.boot.test.context.SpringBootTest;
3636
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3737
import org.springframework.boot.test.web.client.TestRestTemplate;
38-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
38+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3939
import org.springframework.context.annotation.Configuration;
4040
import org.springframework.context.annotation.Import;
4141
import org.springframework.http.HttpStatus;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.springframework.boot.test.context.SpringBootTest;
3636
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3737
import org.springframework.boot.test.web.client.TestRestTemplate;
38-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
38+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3939
import org.springframework.context.annotation.Configuration;
4040
import org.springframework.context.annotation.Import;
4141
import org.springframework.http.HttpStatus;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomLoadOnStartupTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3030
import org.springframework.boot.test.context.SpringBootTest;
3131
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
32-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
32+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3333
import org.springframework.context.ApplicationContext;
3434
import org.springframework.context.annotation.Configuration;
3535
import org.springframework.context.annotation.Import;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomObjectMapperProviderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.springframework.boot.test.context.SpringBootTest;
3636
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3737
import org.springframework.boot.test.web.client.TestRestTemplate;
38-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
38+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3939
import org.springframework.context.annotation.Configuration;
4040
import org.springframework.context.annotation.Import;
4141
import org.springframework.http.HttpStatus;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.springframework.boot.test.context.SpringBootTest;
3636
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3737
import org.springframework.boot.test.web.client.TestRestTemplate;
38-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
38+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3939
import org.springframework.context.annotation.Configuration;
4040
import org.springframework.context.annotation.Import;
4141
import org.springframework.http.HttpStatus;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.springframework.boot.test.context.SpringBootTest;
3636
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3737
import org.springframework.boot.test.web.client.TestRestTemplate;
38-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
38+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3939
import org.springframework.context.annotation.Configuration;
4040
import org.springframework.context.annotation.Import;
4141
import org.springframework.http.HttpStatus;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.boot.test.context.SpringBootTest;
3535
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3636
import org.springframework.boot.test.web.client.TestRestTemplate;
37-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
37+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3838
import org.springframework.context.annotation.Configuration;
3939
import org.springframework.context.annotation.Import;
4040
import org.springframework.http.HttpStatus;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.boot.test.context.SpringBootTest;
3535
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3636
import org.springframework.boot.test.web.client.TestRestTemplate;
37-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
37+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
3838
import org.springframework.context.annotation.Configuration;
3939
import org.springframework.context.annotation.Import;
4040
import org.springframework.http.HttpStatus;

‎spring-boot-project/spring-boot-autoconfigure-all/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationObjectMapperProviderTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.boot.test.context.SpringBootTest;
3737
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
3838
import org.springframework.boot.test.web.client.TestRestTemplate;
39-
import org.springframework.boot.tomcat.servlet.autoconfigure.TomcatServletWebServerAutoConfiguration;
39+
import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
4040
import org.springframework.context.annotation.Configuration;
4141
import org.springframework.context.annotation.Import;
4242
import org.springframework.http.HttpStatus;

0 commit comments

Comments
 (0)