Merge branch '2.4.x' into 2.5.x

See gh-27139
3 years ago · c6acce569f
parent 503d50f39e 877f618a69
commit c6acce569f
1 changed files with 2 additions and 2 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-web-applications.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/developing-web-applications.adoc
@ -457,8 +457,8 @@ 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.
+WARNING: `spring-boot-starter-hateoas` is specific to Spring MVC and should not be combined with Spring WebFlux.
+In order to use Spring HATEOAS with Spring WebFlux, you can add a direct dependency on `org.springframework.hateoas:spring-hateoas` along with `spring-boot-starter-webflux`.