From 9e9c31330a62e40580bcb172f5a2cf6e1ed48b7c Mon Sep 17 00:00:00 2001
From: Tim Reardon <tequalsme@gmail.com>
Date: Wed, 30 Oct 2013 17:16:57 -0400
Subject: [PATCH] Updated to use guava over outdated google-collections

---
 ingest/pom.xml | 6 +++---
 pom.xml        | 8 ++++----
 query/pom.xml  | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ingest/pom.xml b/ingest/pom.xml
index 858ddfa..4cdcf10 100644
--- a/ingest/pom.xml
+++ b/ingest/pom.xml
@@ -51,8 +51,8 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.lucene</groupId>
@@ -100,7 +100,7 @@
             </goals>
             <configuration>
               <!-- just grab the non-provided runtime dependencies -->
-              <includeArtifactIds>commons-lang,google-collections,lucene-core,lucene-analyzers,lucene-wikipedia,protobuf-java,accumulo-core,hadoop-core,libthrift,cloudtrace,zookeeper,commons-codec</includeArtifactIds>
+              <includeArtifactIds>commons-lang,guava,lucene-core,lucene-analyzers,lucene-wikipedia,protobuf-java,accumulo-core,hadoop-core,libthrift,cloudtrace,zookeeper,commons-codec</includeArtifactIds>
             </configuration>
           </execution>
         </executions>
diff --git a/pom.xml b/pom.xml
index 8c88634..6e670d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,7 @@
     <version.accumulo>1.4.4</version.accumulo>
     <version.commons-jexl>2.0.1</version.commons-jexl>
     <version.commons-codec>1.5</version.commons-codec>
+    <version.guava>14.0.1</version.guava>
     <version.kryo>1.04</version.kryo>
     <version.log4j>1.2.16</version.log4j>
     <version.log4j-extras>1.0</version.log4j-extras>
@@ -66,7 +67,6 @@
     <version.lucene-analyzers>3.0.2</version.lucene-analyzers>
     <version.lucene-wikipedia>3.0.2</version.lucene-wikipedia>
     <version.protobuf>2.3.0</version.protobuf>
-    <version.googlecollections>1.0</version.googlecollections>
     <version.libthrift>0.6.1</version.libthrift>
     <version.zookeeper>3.3.1</version.zookeeper>
     <version.minlog>1.2</version.minlog>
@@ -105,9 +105,9 @@
         <version>${version.accumulo}</version>
       </dependency>
       <dependency>
-        <groupId>com.google.collections</groupId>
-        <artifactId>google-collections</artifactId>
-        <version>${version.googlecollections}</version>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${version.guava}</version>
       </dependency>
       <dependency>
         <groupId>com.googlecode</groupId>
diff --git a/query/pom.xml b/query/pom.xml
index b04e063..f8957e6 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -60,8 +60,8 @@
       <artifactId>commons-jexl</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.collections</groupId>
-      <artifactId>google-collections</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
     <dependency>
       <groupId>com.googlecode</groupId>
@@ -116,7 +116,7 @@
             </goals>
             <configuration>
               <!-- just grab the non-provided runtime dependencies -->
-              <includeArtifactIds>commons-lang,commons-codec,protobuf-java,libthrift,zookeeper,hadoop-core,commons-jexl,google-collections,kryo,asm,minlog,reflectasm,wikisearch-ingest,accumulo-core,cloudtrace</includeArtifactIds>
+              <includeArtifactIds>commons-lang,commons-codec,protobuf-java,libthrift,zookeeper,hadoop-core,commons-jexl,guava,kryo,asm,minlog,reflectasm,wikisearch-ingest,accumulo-core,cloudtrace</includeArtifactIds>
             </configuration>
           </execution>
         </executions>