Merge branch '2.4.x'

Closes gh-25762

src/checkstyle/import-control.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE import-control PUBLIC "-//Checkstyle//DTD ImportControl Configuration 1.4//EN" "https://checkstyle.org/dtds/import_control_1_4.dtd">
 <import-control pkg="org.springframework.boot">
+	<disallow pkg="io.micrometer" />
 	<allow pkg=".*" regex="true" />
-
 	<subpackage name="autoconfigure">
 		<disallow class="org.springframework.boot.autoconfigure.jdbc.DataSourceProperties"/>
 		<subpackage name="web">
@@ -39,22 +39,29 @@
 		</subpackage>
 	</subpackage>
 
-	<!-- Endpoint infrastructure -->
+	<subpackage name="actuate">
-	<subpackage name="actuate.endpoint">
+		<allow pkg="io.micrometer" />
-		<disallow pkg="org.springframework.http" />
+		<!-- Endpoint infrastructure -->
-		<disallow pkg="org.springframework.web" />
+		<subpackage name="endpoint">
-		<subpackage name="web">
+			<disallow pkg="org.springframework.http" />
-			<allow pkg="org.springframework.http" />
+			<disallow pkg="org.springframework.web" />
-			<allow pkg="org.springframework.web" />
+			<subpackage name="web">
-			<subpackage name="servlet">
+				<allow pkg="org.springframework.http" />
-				<disallow pkg="org.springframework.web.reactive" />
+				<allow pkg="org.springframework.web" />
-			</subpackage>
+				<subpackage name="servlet">
-			<subpackage name="reactive">
+					<disallow pkg="org.springframework.web.reactive" />
-				<disallow pkg="org.springframework.web.servlet" />
+				</subpackage>
+				<subpackage name="reactive">
+					<disallow pkg="org.springframework.web.servlet" />
+				</subpackage>
 			</subpackage>
 		</subpackage>
 	</subpackage>
 
+	<subpackage name="docs.actuate">
+		<allow pkg="io.micrometer" />
+	</subpackage>
+
 	<!-- Logging -->
 	<subpackage name="logging">
 		<disallow pkg="org.springframework.context" />