From fdded0768ebd65f040f0e9c970f50a22ee99d005 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Tue, 17 Apr 2012 11:51:16 +0300
Subject: [PATCH] Upgrade slf4j-api and -log4j12 dependencies to 1.6.1

Previously depending on 1.5.10 in certain locations, which caused
NoClassDefFoundErrors in EhCacheCacheTests and other tests due to
mismatches between slf4j -api and -log4j12 versions.

With the exception of one transitive dependency via Hibernate 3.3.1.GA,
all slf4j dependencies are now pegged at 1.6.1 (and all tests pass).
---
 build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3922462e91c..9d9206b48fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,6 @@ configure(allprojects) {
     sourceCompatibility=1.5
     targetCompatibility=1.5
 
-    ext.slf4jLog4jVersion = '1.5.10'
     ext.aspectjVersion = '1.6.12'
 
     [compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
@@ -219,7 +218,7 @@ project('spring-context') {
         }
         compile("joda-time:joda-time:1.6", optional)
         compile("net.sf.ehcache:ehcache-core:2.0.0", optional)
-        compile("org.slf4j:slf4j-api:${slf4jLog4jVersion}", optional)
+        compile("org.slf4j:slf4j-api:1.6.1", optional)
         compile("org.codehaus.jsr166-mirror:jsr166:1.7.0", provided)
         testCompile "commons-dbcp:commons-dbcp:1.2.2"
         testCompile("javax.xml:jaxrpc-api:1.1")
@@ -389,7 +388,7 @@ project('spring-webmvc') {
         }
         compile("javax.servlet:jstl:1.1.2", provided)
         compile("org.apache.tomcat:tomcat-servlet-api:7.0.8", provided) // servlet-api 3.0
-        testCompile("org.slf4j:slf4j-log4j12:${slf4jLog4jVersion}") {
+        testCompile("org.slf4j:slf4j-log4j12:1.6.1") {
             exclude group: 'log4j', module: 'log4j'
         }
         testCompile "rhino:js:1.7R1"