Restructure autoconfigure packages

Restructure modules packages so that all auto-configuration is
organized under single top-level autoconfigure package.

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/actuate/autoconfigure/exchanges/package-info.java

@@ -1,21 +0,0 @@
-/*
- * Copyright 2012-2025 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Auto-configuration for Servlet-based integration with Actuator's HTTP exchanges
- * support.
- */
-package org.springframework.boot.servlet.actuate.autoconfigure.exchanges;

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/actuate/autoconfigure/mappings/package-info.java

@@ -1,20 +0,0 @@
-/*
- * Copyright 2012-2025 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Auto-configuration for Servlet-based integration with Actuator's mappings support.
- */
-package org.springframework.boot.servlet.actuate.autoconfigure.mappings;

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/actuate/ServletHttpExchangesAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure.exchanges;
+package org.springframework.boot.servlet.autoconfigure.actuate;
 
 import org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesProperties;
 import org.springframework.boot.actuate.web.exchanges.HttpExchange;

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/actuate/ServletMappingsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure.mappings;
+package org.springframework.boot.servlet.autoconfigure.actuate;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
 import org.springframework.boot.actuate.web.mappings.MappingDescriptionProvider;

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

@@ -17,4 +17,4 @@
 /**
  * Actuator Servlet support.
  */
-package org.springframework.boot.servlet.actuate.autoconfigure;
+package org.springframework.boot.servlet.autoconfigure.actuate;

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/actuate/web/ManagementServletContext.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure;
+package org.springframework.boot.servlet.autoconfigure.actuate.web;
 
 /**
  * Provides information about the management servlet context for MVC controllers to use.

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/actuate/web/ServletEndpointManagementContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure.endpoint;
+package org.springframework.boot.servlet.autoconfigure.actuate.web;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter;
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/actuate/web/ServletManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure;
+package org.springframework.boot.servlet.autoconfigure.actuate.web;
 
 import jakarta.servlet.Filter;
 

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/actuate/web/ServletManagementContextAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure;
+package org.springframework.boot.servlet.autoconfigure.actuate.web;
 
 import jakarta.servlet.Servlet;
 

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/actuate/web/ServletManagementWebServerFactoryCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure;
+package org.springframework.boot.servlet.autoconfigure.actuate.web;
 
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;

spring-boot-project/spring-boot-servlet/src/main/java/org/springframework/boot/servlet/autoconfigure/actuate/web/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for the Actuator's servlet web endpoints.
+ * Auto-configuration for {@code jakarta.servlet} actuator web concerns.
  */
-package org.springframework.boot.servlet.actuate.autoconfigure.endpoint;
+package org.springframework.boot.servlet.autoconfigure.actuate.web;

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

@@ -1,2 +1,2 @@
-org.springframework.boot.servlet.actuate.autoconfigure.endpoint.ServletEndpointManagementContextConfiguration
-org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementChildContextConfiguration
+org.springframework.boot.servlet.autoconfigure.actuate.web.ServletEndpointManagementContextConfiguration
+org.springframework.boot.servlet.autoconfigure.actuate.web.ServletManagementChildContextConfiguration

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

@@ -1,5 +1,5 @@
-org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration
-org.springframework.boot.servlet.actuate.autoconfigure.exchanges.ServletHttpExchangesAutoConfiguration
-org.springframework.boot.servlet.actuate.autoconfigure.mappings.ServletMappingsAutoConfiguration
 org.springframework.boot.servlet.autoconfigure.HttpEncodingAutoConfiguration
-org.springframework.boot.servlet.autoconfigure.MultipartAutoConfiguration
+org.springframework.boot.servlet.autoconfigure.MultipartAutoConfiguration
+org.springframework.boot.servlet.autoconfigure.actuate.ServletHttpExchangesAutoConfiguration
+org.springframework.boot.servlet.autoconfigure.actuate.ServletMappingsAutoConfiguration
+org.springframework.boot.servlet.autoconfigure.actuate.web.ServletManagementContextAutoConfiguration

spring-boot-project/spring-boot-servlet/src/test/java/org/springframework/boot/servlet/autoconfigure/actuate/ServletHttpExchangesAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure.exchanges;
+package org.springframework.boot.servlet.autoconfigure.actuate;
 
 import java.util.EnumSet;
 import java.util.Set;

spring-boot-project/spring-boot-servlet/src/test/java/org/springframework/boot/servlet/autoconfigure/actuate/ServletMappingsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure.mappings;
+package org.springframework.boot.servlet.autoconfigure.actuate;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-servlet/src/test/java/org/springframework/boot/servlet/autoconfigure/actuate/web/ServletManagementChildContextConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure;
+package org.springframework.boot.servlet.autoconfigure.actuate.web;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-servlet/src/test/java/org/springframework/boot/servlet/autoconfigure/actuate/web/ServletManagementContextAutoConfigurationIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.servlet.actuate.autoconfigure;
+package org.springframework.boot.servlet.autoconfigure.actuate.web;
 
 import java.util.function.Consumer;
 
@@ -28,7 +28,7 @@ import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
-import org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatServletManagementContextAutoConfiguration;
+import org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatServletManagementContextAutoConfiguration;
 import org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration;
 import org.springframework.boot.web.server.servlet.context.AnnotationConfigServletWebServerApplicationContext;
 import org.springframework.util.StringUtils;