[jboss-cvs] JBossAS SVN: r106972 - projects/cluster/ha-server-cache-ispn/trunk.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-07-21 00:41:18 -0400 (Wed, 21 Jul 2010)
New Revision: 106972

Modified:
   projects/cluster/ha-server-cache-ispn/trunk/pom.xml
Log:
Avoid redundant dependencies.  Upgrade infinispan to 4.1.0.CR2.

Modified: projects/cluster/ha-server-cache-ispn/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-cache-ispn/trunk/pom.xml	2010-07-21 04:38:56 UTC (rev 106971)
+++ projects/cluster/ha-server-cache-ispn/trunk/pom.xml	2010-07-21 04:41:18 UTC (rev 106972)
@@ -39,7 +39,7 @@
     <version.org.jboss.metadata.war>2.0.0.Alpha14</version.org.jboss.metadata.war>
     <version.junit>4.8.1</version.junit>
     <version.easymock>3.0</version.easymock>
-    <version.infinispan>4.1.0.CR1</version.infinispan>      
+    <version.infinispan>4.1.0.CR2</version.infinispan>      
   </properties>
   
   <build>
@@ -79,12 +79,6 @@
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-server-cache-spi</artifactId>
       <version>${version.jboss.ha.server.cache.spi}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>jgroups</groupId>
-          <artifactId>jgroups</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -95,60 +89,21 @@
 
     <dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-core</artifactId>
+      <artifactId>infinispan-tree</artifactId>
       <version>${version.infinispan}</version>
       <exclusions>
-          <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-          </exclusion>
-          <exclusion>
-            <!-- Exclude JTA, and redeclare using provided scope -->
-            <groupId>org.jboss.javaee</groupId>
-            <artifactId>jboss-transaction-api</artifactId>
-          </exclusion>
+        <exclusion>
+          <groupId>org.infinispan</groupId>
+          <artifactId>infinispan-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
-      <dependency>
-        <groupId>org.infinispan</groupId>
-        <artifactId>infinispan-tree</artifactId>
-        <version>${version.infinispan}</version>
-        <exclusions>
-            <exclusion>
-              <groupId>log4j</groupId>
-              <artifactId>log4j</artifactId>
-            </exclusion>
-            <exclusion>
-              <!-- Exclude JTA, and redeclare using provided scope -->
-              <groupId>org.jboss.javaee</groupId>
-              <artifactId>jboss-transaction-api</artifactId>
-            </exclusion>
-        </exclusions>
-      </dependency>
-
     <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-common-core</artifactId>
-      <version>${version.jboss.common.core}</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging</artifactId>
-      <version>${version.jboss.logging}</version>
-      <scope>provided</scope>
-    </dependency> 
-    
-    <!-- For the JTA 1.1 API; consuming projects can safely
-         exclude this and replace with any valid source of this API -->
-    <dependency>
-       <groupId>org.jboss.javaee</groupId>
-       <artifactId>jboss-transaction-api</artifactId>
-       <version>1.0.1${version.suffix.org.jboss.javaee}</version>
-    </dependency>
-    
-    <dependency>
       <groupId>org.jboss.naming</groupId>
       <artifactId>jnp-client</artifactId>
       <version>${version.org.jboss.naming}</version>