[jboss-cvs] JBossAS SVN: r107668 - in branches/infinispan-int: depchain and 1 other directory.

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

Author: pferraro
Date: 2010-08-18 12:39:20 -0400 (Wed, 18 Aug 2010)
New Revision: 107668

Modified:
   branches/infinispan-int/component-matrix/pom.xml
   branches/infinispan-int/depchain/pom.xml
Log:
Upgrade infinispan to 4.1.0.CR3
Enable easy upgrading of infinispan in AS without requiring new ha-server-ispn release.

Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml	2010-08-18 16:32:06 UTC (rev 107667)
+++ branches/infinispan-int/component-matrix/pom.xml	2010-08-18 16:39:20 UTC (rev 107668)
@@ -80,7 +80,6 @@
     <version.jboss.osgi.xerces>2.9.1.SP5</version.jboss.osgi.xerces>
     <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP2</version.jboss.osgi.xml.binding>
     <version.jboss.web>3.0.0-beta-6</version.jboss.web>
-    <version.jgroups>2.10.0.GA</version.jgroups>
     <version.jsr181.api>1.0-MR1</version.jsr181.api>
     <version.junit>4.6</version.junit>
     <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
@@ -89,6 +88,7 @@
     <version.org.hibernate.entity.manager>${version.org.hibernate}</version.org.hibernate.entity.manager>
     <version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
     <version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
+    <version.org.infinispan>4.1.0.CR3</version.org.infinispan>
     <version.org.jboss.aop>2.2.1.Alpha3</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
     <version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
@@ -113,7 +113,7 @@
     <version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
     <version.org.jboss.embedded>1.0.0-alpha-3</version.org.jboss.embedded>
-   <version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
+    <version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
     <version.org.jboss.interceptor>1.0.0-CR11</version.org.jboss.interceptor>
     <version.org.jboss.integration>6.0.0.CR1</version.org.jboss.integration>
     <version.org.jboss.javaee.specs.bom>1.0.0.Beta5</version.org.jboss.javaee.specs.bom>
@@ -161,6 +161,7 @@
     <version.org.jboss.weld>1.0.1-SP4</version.org.jboss.weld>
     <version.org.jboss.xnio>2.1.0.CR2</version.org.jboss.xnio>
     <version.org.jboss.xnio.metadata>2.1.0.CR5</version.org.jboss.xnio.metadata>
+    <version.org.jgroups>2.10.0.GA</version.org.jgroups>
     <version.org.osgi>4.2.0</version.org.osgi>
     <version.org.slf4j>1.5.6</version.org.slf4j>
     <version.org.springframework>3.0.1.RELEASE</version.org.springframework>
@@ -1599,7 +1600,7 @@
       <dependency>
         <groupId>org.jgroups</groupId>
         <artifactId>jgroups</artifactId>
-        <version>${version.jgroups}</version>
+        <version>${version.org.jgroups}</version>
       </dependency>
       
       <dependency>
@@ -2444,9 +2445,30 @@
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-ispn</artifactId>
         <version>${version.org.jboss.cluster.server.ispn}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-tree</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       
       <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-core</artifactId>
+        <version>${version.org.infinispan}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-tree</artifactId>
+        <version>${version.org.infinispan}</version>
+      </dependency>
+      
+      <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-cache-ispn</artifactId>
         <version>${version.org.jboss.cluster.cache.ispn}</version>

Modified: branches/infinispan-int/depchain/pom.xml
===================================================================
--- branches/infinispan-int/depchain/pom.xml	2010-08-18 16:32:06 UTC (rev 107667)
+++ branches/infinispan-int/depchain/pom.xml	2010-08-18 16:39:20 UTC (rev 107668)
@@ -1107,6 +1107,14 @@
       <groupId>org.jboss.cluster</groupId>
       <artifactId>jboss-ha-server-cache-ispn</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-tree</artifactId>
+    </dependency>
     <!-- End dist dependencies -->
     
   </dependencies>