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,8 +39,10 @@
 		</subpackage>
 	</subpackage>
 
+	<subpackage name="actuate">
+		<allow pkg="io.micrometer" />
 		<!-- Endpoint infrastructure -->
-	<subpackage name="actuate.endpoint">
+		<subpackage name="endpoint">
 			<disallow pkg="org.springframework.http" />
 			<disallow pkg="org.springframework.web" />
 			<subpackage name="web">
@@ -54,6 +56,11 @@
 				</subpackage>
 			</subpackage>
 		</subpackage>
+	</subpackage>
+
+	<subpackage name="docs.actuate">
+		<allow pkg="io.micrometer" />
+	</subpackage>
 
 	<!-- Logging -->
 	<subpackage name="logging">