[jboss-cvs] JBossAS SVN: r107366 - in trunk: weld-int/assembly and 1 other directories.

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

Author: marius.bogoevici
Date: 2010-08-03 15:44:48 -0400 (Tue, 03 Aug 2010)
New Revision: 107366

Modified:
   trunk/component-matrix/pom.xml
   trunk/weld-int/assembly/pom.xml
   trunk/weld-int/assembly/src/main/assembly/assembly.xml
Log:
JBAS-8230: Include Google Guava instead of Google collections in weld-int

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-08-03 18:01:13 UTC (rev 107365)
+++ trunk/component-matrix/pom.xml	2010-08-03 19:44:48 UTC (rev 107366)
@@ -42,6 +42,7 @@
     <version.asm>2.2.3</version.asm>
     <version.beanvalidation.integration>1.0.0-Beta-1</version.beanvalidation.integration>
     <version.commons.beanutils>1.8.0</version.commons.beanutils>
+    <version.com.google.guava>r06</version.com.google.guava>
     <version.fastinfoset>1.2.2</version.fastinfoset>
     <version.hornetq>2.1.1.Final</version.hornetq>
     <version.rhq>1.4.0.B01</version.rhq>
@@ -255,6 +256,12 @@
       </dependency>
 
       <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <version>${version.com.google.guava}</version>
+      </dependency>
+
+      <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>weld-int-assembly</artifactId>
       <type>pom</type>

Modified: trunk/weld-int/assembly/pom.xml
===================================================================
--- trunk/weld-int/assembly/pom.xml	2010-08-03 18:01:13 UTC (rev 107365)
+++ trunk/weld-int/assembly/pom.xml	2010-08-03 19:44:48 UTC (rev 107366)
@@ -11,8 +11,7 @@
    <packaging>jar</packaging>
    <name>JBoss Application Server Weld Integration Assembly</name>
    <description>Weld deployer assembly for JBoss AS</description>
-
-
+    
     <build>
         <plugins>
             <plugin>
@@ -128,6 +127,10 @@
               <groupId>org.jboss.interceptor</groupId>
               <artifactId>jboss-interceptor-api</artifactId>
           </exclusion>
+          <exclusion>
+              <groupId>com.google.collections</groupId>
+              <artifactId>google-collections</artifactId>
+          </exclusion>
       </exclusions>
     </dependency>
 
@@ -154,7 +157,13 @@
       <artifactId>weld-spi</artifactId>
       <optional>true</optional>
     </dependency>
-      
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
+
    </dependencies>
    
 </project>

Modified: trunk/weld-int/assembly/src/main/assembly/assembly.xml
===================================================================
--- trunk/weld-int/assembly/src/main/assembly/assembly.xml	2010-08-03 18:01:13 UTC (rev 107365)
+++ trunk/weld-int/assembly/src/main/assembly/assembly.xml	2010-08-03 19:44:48 UTC (rev 107366)
@@ -23,7 +23,7 @@
       <dependencySet>
          <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
          <includes>
-            <include>com.google.collections:google-collections</include>
+            <include>com.google.guava:guava</include>
             <include>org.slf4j:slf4j-ext:jar</include>
             <include>ch.qos.cal10n:cal10n-api</include>
             <include>org.jboss.weld:weld-spi</include>