From d2852e3c4d45bf03200626f4b8710a5dbe09b5ce Mon Sep 17 00:00:00 2001
From: Strong Liu <stliu@hibernate.org>
Date: Fri, 23 Mar 2012 16:02:45 +0800
Subject: [PATCH] a little improvment on the build script

---
 build.gradle                             | 8 ++------
 hibernate-core/hibernate-core.gradle     | 8 ++------
 hibernate-envers/hibernate-envers.gradle | 4 +---
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 710c2970f8..46ff5ee709 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,7 +60,7 @@ libraries = [
 
         // Annotations
         commons_annotations:
-                        'org.hibernate.common:hibernate-commons-annotations:4.0.1.Final',
+                        'org.hibernate.common:hibernate-commons-annotations:4.0.1.Final@jar',
         jandex:         'org.jboss:jandex:1.0.3.Final',
         classmate:      'com.fasterxml:classmate:0.5.4',
 
@@ -145,10 +145,6 @@ subprojects { subProject ->
 
         }
         toolsJar = file("${System.getProperty('java.home')}/../lib/tools.jar")
-		if(!toolsJar.exists()){
-			toolsJar = file("${System.getProperty('java.home')}/../Classes/classes.jar")
-		}
-
         // appropriately inject the common dependencies into each sub-project
         dependencies {
             compile( libraries.logging )
@@ -156,7 +152,7 @@ subprojects { subProject ->
             testCompile( libraries.byteman )
             testCompile( libraries.byteman_install )
             testCompile( libraries.byteman_bmunit )
-			testCompile files( toolsJar )
+            testCompile files( toolsJar )
             testRuntime( libraries.slf4j_api )
             testRuntime( libraries.slf4j_log4j12 )
             testRuntime( libraries.jcl_slf4j )
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index fff0e78723..529255e9ec 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -5,12 +5,8 @@ apply plugin: org.hibernate.build.gradle.testing.matrix.MatrixTestingPlugin
 
 dependencies {
     compile( libraries.jta )
-    compile( libraries.dom4j ) {
-        transitive = false
-    }
-    compile( libraries.commons_annotations ) {
-        transitive = false
-    }
+    compile( libraries.dom4j )
+    compile( libraries.commons_annotations )
     compile( libraries.jpa )
     compile( libraries.javassist )
     compile( libraries.antlr )
diff --git a/hibernate-envers/hibernate-envers.gradle b/hibernate-envers/hibernate-envers.gradle
index 9e3f549730..3d140c89a9 100644
--- a/hibernate-envers/hibernate-envers.gradle
+++ b/hibernate-envers/hibernate-envers.gradle
@@ -6,9 +6,7 @@ dependencies {
     compile( project( ':hibernate-entitymanager' ) )
     compile( libraries.commons_annotations )
     provided( [group: 'org.hibernate', name: 'hibernate-tools', version: '3.2.0.ga'] )
-    compile( libraries.dom4j ) {
-        trasitive = false
-    }
+    compile( libraries.dom4j )
     provided( libraries.ant )
     testCompile( libraries.junit )
     testCompile( project(':hibernate-testing') )