[jboss-cvs] JBossAS SVN: r94877 - in branches/vfs3-integration: component-matrix and 1 other directory.

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

Author: david.lloyd at jboss.com
Date: 2009-10-14 12:09:27 -0400 (Wed, 14 Oct 2009)
New Revision: 94877

Modified:
   branches/vfs3-integration/build/pom.xml
   branches/vfs3-integration/component-matrix/pom.xml
Log:
Merge from trunk -r94689:94876

Modified: branches/vfs3-integration/build/pom.xml
===================================================================
--- branches/vfs3-integration/build/pom.xml	2009-10-14 16:05:54 UTC (rev 94876)
+++ branches/vfs3-integration/build/pom.xml	2009-10-14 16:09:27 UTC (rev 94877)
@@ -197,10 +197,6 @@
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-webservices</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.cache</groupId>
-      <artifactId>jbosscache-pojo</artifactId>
-    </dependency>
     <!-- End module dependencies -->
 
     <!-- Dependencies on additional artifacts not included by the modules  -->
@@ -356,8 +352,12 @@
     <dependency>
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap-spi-mc</artifactId>
-    </dependency>
+    </dependency>    
     <dependency>
+      <groupId>org.jboss.cache</groupId>
+      <artifactId>jbosscache-pojo</artifactId>
+    </dependency>    
+    <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-common</artifactId>
       <classifier>client</classifier>

Modified: branches/vfs3-integration/component-matrix/pom.xml
===================================================================
--- branches/vfs3-integration/component-matrix/pom.xml	2009-10-14 16:05:54 UTC (rev 94876)
+++ branches/vfs3-integration/component-matrix/pom.xml	2009-10-14 16:09:27 UTC (rev 94877)
@@ -74,13 +74,13 @@
     <version.org.jboss.common.core>2.2.16.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.0.8.GA</version.org.jboss.deployers>
     <version.org.jboss.ejb3.common.client>1.0.1</version.org.jboss.ejb3.common.client>
-    <version.org.jboss.ejb3.core.client>1.1.18</version.org.jboss.ejb3.core.client>
+    <version.org.jboss.ejb3.core.client>1.1.19</version.org.jboss.ejb3.core.client>
     <version.org.jboss.ejb3.endpoint.deployer>0.1.4</version.org.jboss.ejb3.endpoint.deployer>
     <version.org.jboss.ejb3.proxy.impl.client>1.0.5</version.org.jboss.ejb3.proxy.impl.client>
     <version.org.jboss.ejb3.proxy.spi.client>1.0.0</version.org.jboss.ejb3.proxy.spi.client>
     <version.org.jboss.ejb3.proxy.clustered.client>1.0.2</version.org.jboss.ejb3.proxy.clustered.client>
     <version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
-    <version.org.jboss.ejb3>1.1.18</version.org.jboss.ejb3>
+    <version.org.jboss.ejb3>1.1.19</version.org.jboss.ejb3>
     <version.org.jboss.integration>6.0.0-SNAPSHOT</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.2.Beta1</version.org.jboss.jbossxb>
     <version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
@@ -100,7 +100,7 @@
     <version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
     <version.org.jboss.remoting>2.5.0.SP2</version.org.jboss.remoting>
     <version.org.jboss.security>2.1.0.20090318</version.org.jboss.security>
-    <version.org.jboss.service.binding>1.0.0.CR1</version.org.jboss.service.binding>
+    <version.org.jboss.service.binding>1.0.0.GA</version.org.jboss.service.binding>
     <version.org.jboss.threads>1.0.0.GA</version.org.jboss.threads>
     <version.org.jboss.vfs>3.0.0.CR1-SNAPSHOT</version.org.jboss.vfs>
     <version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>