From 5194953030906f515fbb2de38224ff4924df93a9 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 11 Nov 2014 12:30:12 +0000
Subject: [PATCH] Upgrade to Tomcat 8.0.15

Closes gh-1890
---
 spring-boot-dependencies/pom.xml |  2 +-
 spring-boot/pom.xml              | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 655b173cd7..d85b67458b 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -127,7 +127,7 @@
 		<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
 		<thymeleaf-layout-dialect.version>1.2.7</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
-		<tomcat.version>8.0.14</tomcat.version>
+		<tomcat.version>8.0.15</tomcat.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity-tools.version>2.0</velocity-tools.version>
 		<wsdl4j.version>1.6.3</wsdl4j.version>
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index fa1b23f683..2c50461ec5 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -99,6 +99,11 @@
 			<artifactId>tomcat-embed-jasper</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-logging-juli</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.btm</groupId>
 			<artifactId>btm</artifactId>
@@ -181,11 +186,6 @@
 			<artifactId>httpasyncclient</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-logging-juli</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>