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

Complete removing support for Tomcat 7

Browse Source 
Closes gh-6416
This commit is contained in:
Andy Wilkinson
2017-01-24 17:25:28 +00:00
parent df3e1f0898
commit 0807c27c26
19 changed files with 6 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-docs/src/main/asciidoc/getting-started.adoc
View File

@@ -50,14 +50,10 @@ The following embedded servlet containers are supported out of the box:
|===
|Name |Servlet Version |Java Version
|Tomcat 8
|Tomcat 8.5
|3.1
|Java 7+
|Tomcat 7
|3.0
|Java 6+
|Jetty 9.3
|3.1
|Java 8+

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

@@ -930,57 +930,6 @@ add a listener to the `Builder`:
[[howto-use-tomcat-7]]
=== Use Tomcat 7.x or 8.0
Tomcat 7 & 8.0 work with Spring Boot, but the default is to use Tomcat 8.5. If you cannot
use Tomcat 8.5 (for example, because you are using Java 1.6) you will need to change your
classpath to reference a different version.
[[howto-use-tomcat-7-maven]]
==== Use Tomcat 7.x or 8.0 with Maven
If you are using the starters and parent you can change the Tomcat version property
and additionally import `tomcat-juli`. E.g. for a simple webapp or service:
[source,xml,indent=0,subs="verbatim,quotes,attributes"]
----
<properties>
<tomcat.version>7.0.59</tomcat.version>
</properties>
<dependencies>
...
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
<version>${tomcat.version}</version>
</dependency>
...
</dependencies>
----
==== Use Tomcat 7.x or 8.0 with Gradle
[[howto-use-tomcat-7-gradle]]
With Gradle, you can change the Tomcat version by setting the `tomcat.version` property
and then additionally include `tomcat-juli`:
[source,groovy,indent=0,subs="verbatim,quotes,attributes"]
----
ext['tomcat.version'] = '7.0.59'
dependencies {
compile 'org.springframework.boot:spring-boot-starter-web'
compile group:'org.apache.tomcat', name:'tomcat-juli', version:property('tomcat.version')
}
----
[[howto-use-jetty-9.2]]
=== Use Jetty 9.2
Jetty 9.2 works with Spring Boot, but the default is to use Jetty 9.3. If you cannot use