Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-05-07 14:53:58 +02:00
parent 7f50d49251 9dccf5b895
commit 3ad8f3fcbf
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@@ -266,7 +266,7 @@ behalf. The algorithm used to determine a `WebEnvironmentType` is fairly simple:
* If Spring MVC is present, an `AnnotationConfigServletWebServerApplicationContext` is
used
* If Spring MVC is not present and Spring WebFlux is present, an
`AnnotationConfigReactiveWebApplicationContext` is used
`AnnotationConfigReactiveWebServerApplicationContext` is used
* Otherwise, `AnnotationConfigApplicationContext` is used
This means that if you are using Spring MVC and the new `WebClient` from Spring WebFlux in