From 377953babd3dcd15b6a29b13ae7882e88253a926 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Mon, 20 Jan 2014 22:50:56 -0800
Subject: [PATCH] Upgrade to Hibernate Validator 5.0.2

Update Hibernate Validator dependency to 5.0.2 and also include
Tomcat Jasper dependency. Jasper is required as it provides the
default ExpressionFactory implementation class
(org.apache.el.ExpressionFactoryImpl) which is indirectly
instantiated by Hibernate Validator.

Fixes gh-173
---
 spring-boot-dependencies/pom.xml                        | 2 +-
 spring-boot-starters/spring-boot-starter-tomcat/pom.xml | 4 ++++
 spring-boot/pom.xml                                     | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index f6f9c1837d..3fc006c94c 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -18,7 +18,7 @@
 		<hamcrest.version>1.3</hamcrest.version>
 		<hibernate-entitymanager.version>4.3.0.Final</hibernate-entitymanager.version>
 		<hibernate-jpa-api.version>1.0.1.Final</hibernate-jpa-api.version>
-		<hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
+		<hibernate-validator.version>5.0.2.Final</hibernate-validator.version>
 		<httpclient.version>4.3.2</httpclient.version>
 		<httpasyncclient.version>4.0</httpasyncclient.version>
 		<hsqldb.version>2.3.1</hsqldb.version>
diff --git a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
index 6113c30699..91b1a1ccc6 100644
--- a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
@@ -17,6 +17,10 @@
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-core</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-logging-juli</artifactId>
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index bf3961acee..b29bd22fd4 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -54,6 +54,11 @@
 			<artifactId>tomcat-embed-core</artifactId>
 			<optional>true</optional>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-jasper</artifactId>
+            <optional>true</optional>
+        </dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>