root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-04-13 15:19:06 +02:00
parent 2fd5cebe31 2204d5f750
commit fb60716e1b
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@ -516,9 +516,6 @@ includes Tomcat by including `spring-boot-starter-tomcat`, but you can use
`spring-boot-starter-reactor-netty`, but you can use `spring-boot-starter-tomcat`, `spring-boot-starter-reactor-netty`, but you can use `spring-boot-starter-tomcat`,
`spring-boot-starter-jetty`, or `spring-boot-starter-undertow` instead. `spring-boot-starter-jetty`, or `spring-boot-starter-undertow` instead.
NOTE: Many starters support only Spring MVC, so they transitively bring
`spring-boot-starter-web` into your application classpath.
If you need to use a different HTTP server, you need to exclude the default dependencies If you need to use a different HTTP server, you need to exclude the default dependencies
and include the one you need. Spring Boot provides separate starters for and include the one you need. Spring Boot provides separate starters for
HTTP servers to help make this process as easy as possible. HTTP servers to help make this process as easy as possible.
@ -569,6 +566,19 @@ server.
[[howto-use-another-web-server]]
=== Disabling the Web Server
If your classpath contains the necessary bits to start a web server, Spring Boot will
automatically start it. To disable this behaviour configure the `WebApplicationType` in
your `application.properties`, as shown in the following example:
[source,properties,indent=0]
----
spring.main.web-application-type=none
----
[[howto-configure-jetty]] [[howto-configure-jetty]]
=== Configure Jetty === Configure Jetty
Generally, you can follow the advice from Generally, you can follow the advice from