From a0650e8328730299b3a555910edd8abe9fb6f7f9 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@gopivotal.com>
Date: Tue, 13 May 2014 09:22:10 +0100
Subject: [PATCH] Streamline ehcache dependency and upgrade Spring Security

Depend upon ehcache-core rather than ehcache, thereby removing the need
for the exclusion of ehcache-terracotta.

Upgrade to Spring Security 3.2.3 (the 3.2.x line uses ehcache-core)
---
 build.gradle | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index ea2e88ef..a2d49046 100644
--- a/build.gradle
+++ b/build.gradle
@@ -221,11 +221,8 @@ project('spring-ws-security') {
 		compile("org.springframework:spring-tx:$springVersion")
 
 		// Spring Security
-		compile("org.springframework.security:spring-security-core:3.1.0.RELEASE")
-		compile("net.sf.ehcache:ehcache:2.6.3") {
-			optional
-			exclude group: 'net.sf.ehcache', module: 'ehcache-terracotta'
-		}
+		compile("org.springframework.security:spring-security-core:3.2.3.RELEASE")
+		compile("net.sf.ehcache:ehcache-core:2.6.9", optional)
 
 		// WS-Security
 		compile("com.sun.xml.wss:xws-security:3.0") {