[hibernate-commits] Hibernate SVN: r19828 - in core/branches/gradle2: hibernate-jbosscache and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2010-06-25 12:07:19 -0400 (Fri, 25 Jun 2010)
New Revision: 19828

Modified:
   core/branches/gradle2/hibernate-infinispan/hibernate-infinispan.gradle
   core/branches/gradle2/hibernate-jbosscache/hibernate-jbosscache.gradle
Log:
intermediate working copy of infinispan and jbosscache modules (so other modules can build)

Modified: core/branches/gradle2/hibernate-infinispan/hibernate-infinispan.gradle
===================================================================
--- core/branches/gradle2/hibernate-infinispan/hibernate-infinispan.gradle	2010-06-25 16:05:20 UTC (rev 19827)
+++ core/branches/gradle2/hibernate-infinispan/hibernate-infinispan.gradle	2010-06-25 16:07:19 UTC (rev 19828)
@@ -1,41 +1,16 @@
-// todo : need to account for skipUnitTests from pom.xml
-// todo : need to account for groups.bind_addr from pom.xml
-// todo : need to account for surefire system-properties from pom.xml
-
 dependencies {
     infinispanVersion = '4.0.0.FINAL'
-    jbossCommonCoreVersion = '2.2.14.GA'
     jnpVersion = '5.0.3.GA'
-    xapoolVersion = '1.5.0'
-    jbosstsVersion = '4.9.0.GA'
-    rhqVersion = '1.4.0.B01'
-    jgroupsVersion = '2.9.0.GA'
 
-    compile(
-            project(':hibernate-core')
-    )
-    compile(
-            [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion]
-    ) {
+    compile( project( ':hibernate-core' ) )
+    compile( [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion] ) {
         artifact {
             name = "infinispan-core"
             type = 'jar'
         }
     }
-    testCompile(
-            project(':hibernate-testing'),
-            [group: 'org.jboss', name: 'jboss-common-core', version: jbossCommonCoreVersion],
-            [group: 'org.jboss.naming', name: 'jnp-client', version: jnpVersion],
-            [group: 'com.experlog', name: 'xapool', version: xapoolVersion],
-            [group: 'jboss.jbossts', name: 'jbossjta', version: jbosstsVersion],
-            [group: 'org.jboss.naming', name: 'jnpserver', version: jnpVersion],
-            [group: 'org.rhq.helpers', name: 'rhq-pluginAnnotations', version: rhqVersion],
-            "javax.transaction:jta:1.1"
-    )
-// ewww...  http://jira.codehaus.org/browse/GRADLE-739
-    testCompile(
-            [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion]
-    ) {
+    // http://jira.codehaus.org/browse/GRADLE-739
+    testCompile( [group: 'org.infinispan', name: 'infinispan-core', version: infinispanVersion] ) {
         artifact {
             name = "infinispan-core"
             type = 'jar'
@@ -46,27 +21,37 @@
             type = 'jar'
         }
     }
-    testRuntime(
-            [group: 'javassist', name: 'javassist', version: javassistVersion],
-            [group: 'cglib', name: 'cglib', version: cglibVersion]
-    )
+//    testCompile( project(':hibernate-core').sourceSets.testing.classes )
+    testCompile( [group: 'org.jboss', name: 'jboss-common-core', version: '2.2.14.GA'] )
+    testCompile( [group: 'org.jboss.naming', name: 'jnp-client', version: jnpVersion] )
+    testCompile( [group: 'org.jboss.naming', name: 'jnpserver', version: jnpVersion] )
+    testCompile( [group: 'com.experlog', name: 'xapool', version: '1.5.0'] )
+    testCompile( [group: 'jboss.jbossts', name: 'jbossjta', version: '4.9.0.GA'] )
+    testCompile( libraries.jta )
+    testCompile( [group: 'org.rhq.helpers', name: 'rhq-pluginAnnotations', version: '1.4.0.B01'] )
+    testRuntime( libraries.javassist )
 }
 
 sourceCompatibility = "1.6"
 targetCompatibility = "1.6"
 
 compileJava {
-    options.fork(executable: "$jdk16_home/bin/javac")
+    options.fork( executable: java6Home.getJavacExecutable() )
 }
 
 compileTestJava {
-     options.fork(executable: "$jdk16_home/bin/javac")
+    options.fork( executable: java6Home.getJavacExecutable() )
 }
 
 test {
-     jvm: "$jdk16_home/bin/java"
+    executable = java6Home.getJavaExecutable()
 }
 
 ideaModule {
     javaVersion = "1.6"
-}
\ No newline at end of file
+}
+
+// todo : need to account for skipUnitTests from pom.xml
+// todo : need to account for groups.bind_addr from pom.xml
+// todo : need to account for surefire system-properties from pom.xml
+

Modified: core/branches/gradle2/hibernate-jbosscache/hibernate-jbosscache.gradle
===================================================================
--- core/branches/gradle2/hibernate-jbosscache/hibernate-jbosscache.gradle	2010-06-25 16:05:20 UTC (rev 19827)
+++ core/branches/gradle2/hibernate-jbosscache/hibernate-jbosscache.gradle	2010-06-25 16:07:19 UTC (rev 19828)
@@ -1,22 +1,12 @@
+dependencies {
+    compile ( project( ':hibernate-core' ) )
+    compile( [group: 'org.jboss.cache', name: 'jbosscache-core', version: '3.2.1.GA'] )
+//    testCompile( project(':hibernate-core').sourceSets.testing.classes )
+    testCompile( libraries.jta )
+    testCompile( [group: 'jgroups', name: 'jgroups', version: '2.6.13.GA'] )
+    testRuntime( libraries.javassist )
+}
+
 // todo : need to account for skipUnitTests from pom.xml
 // todo : need to account for groups.bind_addr from pom.xml
 // todo : need to account for surefire system-properties from pom.xml
-
-dependencies {
-    jbcVersion = '3.2.1.GA'
-    jgroupsVersion = '2.6.13.GA'
-
-    compile (
-            project(':hibernate-core'),
-            [group: 'org.jboss.cache', name: 'jbosscache-core', version: jbcVersion]
-    )
-    testCompile(
-            project(':hibernate-testing'),
-            [group: 'jgroups', name: 'jgroups', version: jgroupsVersion],
-            "javax.transaction:jta:1.1"
-    )
-    testRuntime (
-            [group: 'javassist', name: 'javassist', version: javassistVersion],
-            [group: 'cglib', name: 'cglib', version: cglibVersion]
-    )
-}