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

Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-12-09 11:58:00 +00:00
parent cbfdfb463e ae6971a61a
commit bdc395f16e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@
<mariadb.version>1.2.3</mariadb.version>
<mockito.version>1.10.19</mockito.version>
<mongodb.version>2.13.3</mongodb.version>
<mysql.version>5.1.37</mysql.version>
<mysql.version>5.1.38</mysql.version>
<nekohtml.version>1.9.22</nekohtml.version>
<postgresql.version>9.4-1205-jdbc41</postgresql.version>
<reactor.version>2.0.7.RELEASE</reactor.version>
@ -135,7 +135,7 @@
<spring-data-releasetrain.version>Gosling-SR1</spring-data-releasetrain.version>
<spring-hateoas.version>0.19.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.2.2.RELEASE</spring-integration.version>
<spring-loaded.version>1.2.4.RELEASE</spring-loaded.version>
<spring-loaded.version>1.2.5.RELEASE</spring-loaded.version>
<spring-mobile.version>1.1.5.RELEASE</spring-mobile.version>
<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
<spring-restdocs.version>1.0.0.RELEASE</spring-restdocs.version>
@ -156,7 +156,7 @@
<thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
<thymeleaf-layout-dialect.version>1.3.1</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<tomcat.version>8.0.28</tomcat.version>
<tomcat.version>8.0.30</tomcat.version>
<undertow.version>1.3.5.Final</undertow.version>
<velocity.version>1.7</velocity.version>
<velocity-tools.version>2.0</velocity-tools.version>

6
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@ -179,6 +179,12 @@ public class TomcatEmbeddedServletContainerFactory
context.setParentClassLoader(
this.resourceLoader != null ? this.resourceLoader.getClassLoader()
: ClassUtils.getDefaultClassLoader());
try {
context.setUseRelativeRedirects(false);
}
catch (NoSuchMethodError ex) {
// Tomcat is < 8.0.30. Continue
}
SkipPatternJarScanner.apply(context, this.tldSkip);
WebappLoader loader = new WebappLoader(context.getParentClassLoader());
loader.setLoaderClass(TomcatEmbeddedWebappClassLoader.class.getName());