Merge branch '2.4.x' into 2.5.x

Closes gh-27139
spring-projects · Jul 1, 2021 · 503d50f · 503d50f
2 parents 55593a7 + 6c4273b
commit 503d50f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...ct/spring-boot-docs/src/docs/asciidoc/features/developing-web-applications.adoc b/...ct/spring-boot-docs/src/docs/asciidoc/features/developing-web-applications.adoc
@@ -457,6 +457,9 @@ The `ObjectMapper` is customized by setting the various `spring.jackson.*` prope
 You can take control of Spring HATEOAS's configuration by using `@EnableHypermediaSupport`.
 Note that doing so disables the `ObjectMapper` customization described earlier.
 
+NOTE: Spring Boot only supports Spring HATEOAS with Spring MVC.
+Adding Spring HATEOAS to a Spring Boot application with Spring WebFlux can cause the application to fail.
+
 
 
 [[features.developing-web-applications.spring-mvc.cors]]