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

Upgrade to Tomcat 7.0.55 

Closes #1405
This commit is contained in:
Andy Wilkinson 2014-08-19 11:55:32 +01:00
parent 601794c617
commit c1d6e5e897
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -116,7 +116,7 @@
<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
<thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
<tomcat.version>7.0.54</tomcat.version>
<tomcat.version>7.0.55</tomcat.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>
<wsdl4j.version>1.6.3</wsdl4j.version>

3
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedContext.java
View File

@ -34,7 +34,8 @@ class TomcatEmbeddedContext extends StandardContext {
private ServletContextInitializerLifecycleListener starter;
@Override
public void loadOnStartup(Container[] children) {
public boolean loadOnStartup(Container[] children) {
return true;
}
public void deferredLoadOnStartup() {