[hibernate-commits] Hibernate SVN: r14495 - in core/trunk/cache-jbosscache2: src/test/java/org/hibernate/test/cache/jbc2/functional/bulk and 1 other directory.

[hibernate-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-04-03 15:39:08 -0400 (Thu, 03 Apr 2008)
New Revision: 14495

Modified:
   core/trunk/cache-jbosscache2/pom.xml
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java
Log:
[HHH-3141] Move toward JBC 2.1.1

Modified: core/trunk/cache-jbosscache2/pom.xml
===================================================================
--- core/trunk/cache-jbosscache2/pom.xml	2008-04-03 19:38:24 UTC (rev 14494)
+++ core/trunk/cache-jbosscache2/pom.xml	2008-04-03 19:39:08 UTC (rev 14495)
@@ -25,14 +25,8 @@
         <dependency>
             <groupId>org.jboss.cache</groupId>
             <artifactId>jbosscache-core</artifactId>
-            <version>2.1.0.CR4</version>
+            <version>2.1.1-SNAPSHOT</version>
         </dependency>
-        <!-- TODO Remove once JBC 2.1.0.GA uses JG 2.6.1 -->
-        <dependency>
-            <groupId>jgroups</groupId>
-            <artifactId>jgroups</artifactId>
-            <version>2.6.1</version>
-        </dependency>
         
         <!-- test dependencies -->
         <dependency>

Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java	2008-04-03 19:38:24 UTC (rev 14494)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/bulk/OptimisticBulkOperationsTest.java	2008-04-03 19:39:08 UTC (rev 14495)
@@ -54,19 +54,6 @@
    protected String getEntityCacheConfigName()
    {
       return "optimistic-entity";
-   }
+   } 
 
-   /**
-    * FIXME remove when JBC release with JBCACHE-1298 fix included is
-    * integrated.
-    * 
-    * @throws Exception
-    */
-   public void testBulkOperationsFailureExpected() throws Exception
-   {
-      super.testBulkOperations();
-   }
-   
-   
-
 }