Merge branch '2.5.x'

Closes gh-28381
3 years ago · 356554311f
parent 4839f0eec0 dfb349e9ca
commit 356554311f
1 changed files with 0 additions and 3 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/spring-integration.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/spring-integration.adoc
@ -46,6 +46,3 @@ Spring Boot can also auto-configure an `ClientRSocketConnector` using configurat
 ----

 See the {spring-boot-autoconfigure-module-code}/integration/IntegrationAutoConfiguration.java[`IntegrationAutoConfiguration`] and {spring-boot-autoconfigure-module-code}/integration/IntegrationProperties.java[`IntegrationProperties`] classes for more details.
-
-By default, if a Micrometer `meterRegistry` bean is present, Spring Integration metrics will be managed by Micrometer.
-If you wish to use legacy Spring Integration metrics, add a `DefaultMetricsFactory` bean to the application context.