[hibernate-commits] Hibernate SVN: r19676 - in core/branches/gradle2: cache-jbosscache and 4 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Wed Jun 2 17:00:19 EDT 2010


Author: steve.ebersole at jboss.com
Date: 2010-06-02 17:00:17 -0400 (Wed, 02 Jun 2010)
New Revision: 19676

Modified:
   core/branches/gradle2/cache-infinispan/build.gradle
   core/branches/gradle2/cache-jbosscache/build.gradle
   core/branches/gradle2/entitymanager/build.gradle
   core/branches/gradle2/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java
   core/branches/gradle2/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java
   core/branches/gradle2/envers/build.gradle
Log:
completely compiling version

Modified: core/branches/gradle2/cache-infinispan/build.gradle
===================================================================
--- core/branches/gradle2/cache-infinispan/build.gradle	2010-06-02 20:07:11 UTC (rev 19675)
+++ core/branches/gradle2/cache-infinispan/build.gradle	2010-06-02 21:00:17 UTC (rev 19676)
@@ -5,6 +5,11 @@
 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(':core')
@@ -19,7 +24,13 @@
     }
     testCompile (
             project(':testing'),
-            [group: 'org.jboss', name: 'jboss-common-core', version: jbossCommonCoreVersion]
+            [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 (

Modified: core/branches/gradle2/cache-jbosscache/build.gradle
===================================================================
--- core/branches/gradle2/cache-jbosscache/build.gradle	2010-06-02 20:07:11 UTC (rev 19675)
+++ core/branches/gradle2/cache-jbosscache/build.gradle	2010-06-02 21:00:17 UTC (rev 19676)
@@ -4,13 +4,16 @@
 
 dependencies {
     jbcVersion = '3.2.1.GA'
+    jgroupsVersion = '2.6.13.GA'
 
     compile (
             project(':core'),
             [group: 'org.jboss.cache', name: 'jbosscache-core', version: jbcVersion]
     )
     testCompile(
-            project(':testing')
+            project(':testing'),
+            [group: 'jgroups', name: 'jgroups', version: jgroupsVersion],
+            "javax.transaction:jta:1.1"
     )
     testRuntime (
             [group: 'javassist', name: 'javassist', version: javassistVersion],

Modified: core/branches/gradle2/entitymanager/build.gradle
===================================================================
--- core/branches/gradle2/entitymanager/build.gradle	2010-06-02 20:07:11 UTC (rev 19675)
+++ core/branches/gradle2/entitymanager/build.gradle	2010-06-02 21:00:17 UTC (rev 19676)
@@ -1,4 +1,6 @@
 dependencies {
+    shrinkwrapVersion = '1.0.0-alpha-6'
+
     compile(
             project(':core'),
             project(':annotations'),
@@ -11,10 +13,13 @@
     testCompile(
             project(':testing'),
             [group: 'cglib', name: 'cglib', version: cglibVersion],
-            [group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '1.0.0.Final']
+            [group: 'org.hibernate', name: 'hibernate-jpamodelgen', version: '1.0.0.Final'],
+            [group: 'org.jboss.shrinkwrap', name: 'shrinkwrap-api', version: shrinkwrapVersion],
+            [group: 'org.jboss.shrinkwrap', name: 'shrinkwrap-impl-base', version: shrinkwrapVersion],
+            [group: 'javax.validation', name: 'validation-api', version: javaxValidationVersion],
+            group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
     )
     testRuntime(
-            [group: 'javax.validation', name: 'validation-api', version: javaxValidationVersion],
             [group: 'org.hibernate', name: 'hibernate-validator', version: hibernateValidatorVersion]
     )
 }

Modified: core/branches/gradle2/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java
===================================================================
--- core/branches/gradle2/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java	2010-06-02 20:07:11 UTC (rev 19675)
+++ core/branches/gradle2/entitymanager/src/test/java/org/hibernate/ejb/test/TestCase.java	2010-06-02 21:00:17 UTC (rev 19676)
@@ -36,8 +36,8 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.hibernate.cfg.AnnotationConfiguration;
 import org.hibernate.cfg.Environment;
@@ -53,9 +53,8 @@
  * @author Hardy Ferentschik
  */
 public abstract class TestCase extends HibernateTestCase {
+	private static final Logger log = LoggerFactory.getLogger( TestCase.class );
 
-	private static final Log log = LogFactory.getLog( TestCase.class );
-
 	protected static EntityManagerFactory factory;
 	private EntityManager em;
 	private ArrayList isolatedEms = new ArrayList();

Modified: core/branches/gradle2/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java
===================================================================
--- core/branches/gradle2/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java	2010-06-02 20:07:11 UTC (rev 19675)
+++ core/branches/gradle2/entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java	2010-06-02 21:00:17 UTC (rev 19676)
@@ -8,8 +8,6 @@
 import javax.persistence.Query;
 import javax.persistence.QueryTimeoutException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.Oracle10gDialect;
 import org.hibernate.ejb.AvailableSettings;
@@ -23,11 +21,14 @@
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * @author Emmanuel Bernard
  */
 public class LockTest extends TestCase {
-	private static final Log log = LogFactory.getLog( LockTest.class );
+	private static final Logger log = LoggerFactory.getLogger( LockTest.class );
 
 	public void testFindWithTimeoutHint() {
 		EntityManager em = getOrCreateEntityManager();

Modified: core/branches/gradle2/envers/build.gradle
===================================================================
--- core/branches/gradle2/envers/build.gradle	2010-06-02 20:07:11 UTC (rev 19675)
+++ core/branches/gradle2/envers/build.gradle	2010-06-02 21:00:17 UTC (rev 19676)
@@ -11,7 +11,8 @@
             [group: 'ant', name: 'ant', version: '1.6.5']
     )
     testCompile (
-            [group: 'org.testng', name: 'testng', version: testngVersion]
+            [group: 'org.testng', name: 'testng', version: testngVersion, classifier: 'jdk15'],
+            [group: 'org.hibernate.javax.persistence', name: 'hibernate-jpa-2.0-api', version: jpaVersion]
     )
     testRuntime (
             [group: 'com.h2database', name: 'h2', version: h2Version],



More information about the hibernate-commits mailing list