[weld-commits] Weld SVN: r6884 - in core/trunk: impl and 1 other directories.

[weld-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2010-08-03 15:16:57 -0400 (Tue, 03 Aug 2010)
New Revision: 6884

Modified:
   core/trunk/bom/pom.xml
   core/trunk/impl/pom.xml
   core/trunk/osgi-bundle/pom.xml
Log:
WELD-564: Migrate to Google Guava from google-collections

Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml	2010-08-03 18:42:42 UTC (rev 6883)
+++ core/trunk/bom/pom.xml	2010-08-03 19:16:57 UTC (rev 6884)
@@ -35,7 +35,7 @@
    <properties>
       <weld.api.version>1.1-SNAPSHOT</weld.api.version>
       <!-- Override the API and compile with more recent EL API -->
-      <google.collections.version>1.0</google.collections.version>
+      <google.guava.version>r06</google.guava.version>
       <javassist.version>3.11.0.GA</javassist.version>
       <cdi.tck.version>1.0.2.CR1</cdi.tck.version>
       <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
@@ -104,9 +104,9 @@
          </dependency>
          
          <dependency>
-            <groupId>com.google.collections</groupId>
-            <artifactId>google-collections</artifactId>
-            <version>${google.collections.version}</version>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${google.guava.version}</version>
          </dependency>
  
          <dependency>

Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml	2010-08-03 18:42:42 UTC (rev 6883)
+++ core/trunk/impl/pom.xml	2010-08-03 19:16:57 UTC (rev 6884)
@@ -86,8 +86,8 @@
       </dependency>
 
       <dependency>
-         <groupId>com.google.collections</groupId>
-         <artifactId>google-collections</artifactId>
+         <groupId>com.google.guava</groupId>
+         <artifactId>guava</artifactId>
       </dependency>
 
       <dependency>

Modified: core/trunk/osgi-bundle/pom.xml
===================================================================
--- core/trunk/osgi-bundle/pom.xml	2010-08-03 18:42:42 UTC (rev 6883)
+++ core/trunk/osgi-bundle/pom.xml	2010-08-03 19:16:57 UTC (rev 6884)
@@ -175,8 +175,8 @@
       </dependency>
       
       <dependency>
-         <groupId>com.google.collections</groupId>
-         <artifactId>google-collections</artifactId>
+         <groupId>com.google.guava</groupId>
+         <artifactId>guava</artifactId>
       </dependency>
       
       <dependency>