Merge branch '2.5.x' into main

See gh-27140
5 years ago · ce1dff86df
1 changed files with 2 additions and 2 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/spring-hateoas.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/spring-hateoas.adoc
@ -7,5 +7,5 @@ The `ObjectMapper` is customized by setting the various `spring.jackson.*` prope
				@@ -7,5 +7,5 @@ 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`.