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)
This commit is contained in:
Andy Wilkinson
2014-05-13 09:22:10 +01:00
parent 35b5ad357f
commit a0650e8328

View File

@@ -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") {