From 0ad058f69fa4eca9c8b3b37ce4aded5ff7cc60b9 Mon Sep 17 00:00:00 2001
From: Hardy Ferentschik <hardy@hibernate.org>
Date: Fri, 3 Aug 2012 16:20:16 +0200
Subject: [PATCH] HHH-6315 Removing slf4j dependency and upgrading Validator
 version

---
 build.gradle                       | 16 +++-------------
 documentation/documentation.gradle |  2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2a218d7982..4f85fef9de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,7 +48,6 @@ idea {
 
 // build a map of the dependency artifacts to use.  Allows centralized definition of the version of artifacts to
 // use.  In that respect it serves a role similar to <dependencyManagement> in Maven
-slf4jVersion = '1.6.1'
 junitVersion = '4.10'
 h2Version = '1.2.145'
 bytemanVersion = '1.5.2'
@@ -91,12 +90,7 @@ libraries = [
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~ testing
 
         // logging for testing
-        slf4j_api:      "org.slf4j:slf4j-api:${slf4jVersion}",
-        slf4j_log4j12:  "org.slf4j:slf4j-log4j12:${slf4jVersion}",
-        jcl_slf4j:      "org.slf4j:jcl-over-slf4j:${slf4jVersion}",
-        jcl_api:        'commons-logging:commons-logging-api:99.0-does-not-exist',
-        jcl:            'commons-logging:commons-logging:99.0-does-not-exist',
-
+        log4j:          'log4j:log4j:1.2.16',
 
         junit:           "junit:junit:${junitVersion}",
         byteman:         "org.jboss.byteman:byteman:${bytemanVersion}",
@@ -105,7 +99,7 @@ libraries = [
         jpa_modelgen:    'org.hibernate:hibernate-jpamodelgen:1.2.0.Final',
         shrinkwrap_api:  'org.jboss.shrinkwrap:shrinkwrap-api:1.0.0-beta-6',
         shrinkwrap:      'org.jboss.shrinkwrap:shrinkwrap-impl-base:1.0.0-beta-6',
-        validator:       'org.hibernate:hibernate-validator:4.2.0.Final',
+        validator:       'org.hibernate:hibernate-validator:4.3.0.Final',
         h2:              "com.h2database:h2:${h2Version}"
 ]
 
@@ -157,11 +151,7 @@ subprojects { subProject ->
             testCompile( libraries.byteman_install )
             testCompile( libraries.byteman_bmunit )
             testCompile files( toolsJar )
-            testRuntime( libraries.slf4j_api )
-            testRuntime( libraries.slf4j_log4j12 )
-            testRuntime( libraries.jcl_slf4j )
-            testRuntime( libraries.jcl_api )
-            testRuntime( libraries.jcl )
+            testRuntime( libraries.log4j )
             testRuntime( libraries.javassist )
             testRuntime( libraries.h2 )
             jbossLoggingTool( libraries.logging_processor )
diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
index cf1064c2b9..f6ee9cfe06 100644
--- a/documentation/documentation.gradle
+++ b/documentation/documentation.gradle
@@ -79,7 +79,7 @@ task buildTutorialZip(type: Zip) {
     from 'src/main/docbook/quickstart/tutorials'
     expand(
             version: project.version,
-            slf4j: parent.slf4jVersion,
+            slf4j: '1.6.1',
             junit: parent.junitVersion,
             h2: parent.h2Version
     )