diff --git a/extensions/modeshape-connector-store-jpa/pom.xml b/extensions/modeshape-connector-store-jpa/pom.xml
index c9ad1a7..22a16c2 100644
--- a/extensions/modeshape-connector-store-jpa/pom.xml
+++ b/extensions/modeshape-connector-store-jpa/pom.xml
@@ -18,14 +18,14 @@
     parent pom.
   -->
   <dependencies>
-    <!-- 
+    <!--
     ModeShape
     -->
     <dependency>
       <groupId>org.modeshape</groupId>
       <artifactId>modeshape-graph</artifactId>
     </dependency>
-    <!-- 
+    <!--
     JPA via Hibernate Entity Manager
     -->
     <dependency>
@@ -38,7 +38,7 @@
       <artifactId>hibernate-c3p0</artifactId>
       <version>3.5.2-Final</version>
     </dependency>
-    <!-- 
+    <!--
     HSQLDB
     -->
     <dependency>
@@ -47,10 +47,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-         <groupId>com.google.collections</groupId>
-         <artifactId>google-collections</artifactId>
+         <groupId>com.google.guava</groupId>
+         <artifactId>guava</artifactId>
     </dependency>
-    <!-- 
+    <!--
     Testing (note the scope)
     -->
     <dependency>
@@ -75,8 +75,8 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <!-- 
-    Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing) 
+    <!--
+    Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing)
     -->
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -90,7 +90,7 @@
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-    <!-- 
+    <!--
     Java Concurrency in Practice annotations
     -->
     <dependency>
diff --git a/extensions/modeshape-search-lucene/pom.xml b/extensions/modeshape-search-lucene/pom.xml
index 5b1cef8..c3f02c6 100644
--- a/extensions/modeshape-search-lucene/pom.xml
+++ b/extensions/modeshape-search-lucene/pom.xml
@@ -18,14 +18,14 @@
     parent pom.
   -->
   <dependencies>
-    <!-- 
+    <!--
     ModeShape
     -->
     <dependency>
       <groupId>org.modeshape</groupId>
       <artifactId>modeshape-graph</artifactId>
     </dependency>
-    <!-- 
+    <!--
     Lucene
     -->
     <dependency>
@@ -54,10 +54,10 @@
       <version>3.0.2</version>
     </dependency>
       <dependency>
-         <groupId>com.google.collections</groupId>
-         <artifactId>google-collections</artifactId>
+         <groupId>com.google.guava</groupId>
+         <artifactId>guava</artifactId>
       </dependency>
-    <!-- 
+    <!--
     Testing (note the scope)
     -->
     <dependency>
@@ -82,8 +82,8 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <!-- 
-    Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing) 
+    <!--
+    Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing)
     -->
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -97,7 +97,7 @@
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-    <!-- 
+    <!--
     Java Concurrency in Practice annotations
     -->
     <dependency>
diff --git a/modeshape-graph/pom.xml b/modeshape-graph/pom.xml
index c16fa1a..9b9dda2 100644
--- a/modeshape-graph/pom.xml
+++ b/modeshape-graph/pom.xml
@@ -11,9 +11,9 @@
   <packaging>jar</packaging>
   <name>ModeShape Graph</name>
   <url>http://www.modeshape.org</url>
-  
+
   <!--
-  Define the dependencies.  Note that all version and scopes default to those 
+  Define the dependencies.  Note that all version and scopes default to those
   defined in the dependencyManagement section of the parent pom.
   -->
   <dependencies>
@@ -33,10 +33,10 @@
       <artifactId>joda-time</artifactId>
     </dependency>
 	  <dependency>
-         <groupId>com.google.collections</groupId>
-         <artifactId>google-collections</artifactId>
+         <groupId>com.google.guava</groupId>
+         <artifactId>guava</artifactId>
       </dependency>
-    <!-- 
+    <!--
     Testing (note the scope)
     -->
     <dependency>
@@ -47,8 +47,8 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
     </dependency>
-    <!-- 
-    Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing) 
+    <!--
+    Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing)
     -->
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -62,7 +62,7 @@
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-    <!-- 
+    <!--
     Java Concurrency in Practice annotations
     -->
     <dependency>
diff --git a/modeshape-jcr/pom.xml b/modeshape-jcr/pom.xml
index f01f675..1192ffe 100644
--- a/modeshape-jcr/pom.xml
+++ b/modeshape-jcr/pom.xml
@@ -56,10 +56,10 @@
       <artifactId>modeshape-search-lucene</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
-    <!-- 
+    <!--
     Testing (note the scope)
     -->
     <dependency>
@@ -79,8 +79,8 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
     </dependency>
-    <!-- 
-    Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing) 
+    <!--
+    Logging (require SLF4J API for compiling, but use Log4J and its SLF4J binding for testing)
     -->
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -96,14 +96,14 @@
       <artifactId>log4j</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- 
+    <!--
     Java Concurrency in Practice annotations
     -->
     <dependency>
       <groupId>net.jcip</groupId>
       <artifactId>jcip-annotations</artifactId>
     </dependency>
-    <!-- 
+    <!--
       Apache JCR API unit tests (for any JCR implementation), which is a subset of the official TCK
     -->
     <dependency>
@@ -209,4 +209,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index a3bd79e..153cfc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1164,12 +1164,12 @@
 			   Collections
 			-->
 			<dependency>
-				<groupId>com.google.collections</groupId>
-				<artifactId>google-collections</artifactId>
-				<version>1.0-rc3</version>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>r09</version>
 				<scope>compile</scope>
 			</dependency>
-			<!-- 
+			<!--
 		    Time and Date
 		    -->
 			<dependency>