Merge branch '2.1.x'

Closes gh-17547

spring-boot-project/spring-boot-docs/pom.xml

@@ -1466,6 +1466,7 @@
 								<spring-boot-version>${revision}</spring-boot-version>
 								<spring-docs-version>${spring-framework.version}</spring-docs-version>
 								<spring-framework-version>${spring-framework.version}</spring-framework-version>
+								<spring-integration-docs-version>${spring-integration.version}</spring-integration-docs-version>
 								<spring-security-docs-version>${spring-security.version}</spring-security-docs-version>
 								<spring-webservices-docs-version>${spring-ws.version}</spring-webservices-docs-version>
 							</attributes>

spring-boot-project/spring-boot-docs/src/main/asciidoc/attributes.adoc

@@ -49,6 +49,7 @@
 :spring-initializr-reference: https://docs.spring.io/initializr/docs/current/reference/html
 :spring-rest-docs: https://projects.spring.io/spring-restdocs/
 :spring-integration: https://projects.spring.io/spring-integration/
+:spring-integration-reference: https://docs.spring.io/spring-integration/docs/{spring-integration-docs-version}/reference/html
 :spring-session: https://projects.spring.io/spring-session/
 :spring-framework: https://projects.spring.io/spring-framework/
 :spring-security: https://projects.spring.io/spring-security/

spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -1792,7 +1792,7 @@ Spring Boot registers the following core metrics when applicable:
 application's absolute start time
 * Tomcat metrics (`server.tomcat.mbeanregistry.enabled` must be set to `true` for all
 Tomcat metrics to be registered)
-* https://docs.spring.io/spring-integration/docs/current/reference/html/system-management-chapter.html#micrometer-integration[Spring Integration] metrics
+* {spring-integration-reference}#micrometer-integration[Spring Integration] metrics