accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ujustgotbi...@apache.org
Subject [43/50] [abbrv] git commit: ACCUMULO-2017 Wikisearch should use Guava instead of Google Collections.
Date Wed, 19 Mar 2014 16:08:53 GMT
ACCUMULO-2017 Wikisearch should use Guava instead of Google Collections.

replaces Google Collections with Google Guava because that's what Hadoop 2 uses internally
and they conflict.


Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/e84d8d7a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/e84d8d7a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/diff/e84d8d7a

Branch: refs/heads/master
Commit: e84d8d7a798a5b8098d01a2e02a17b8d20c918f8
Parents: e158590
Author: Sean Busbey <busbey@clouderagovt.com>
Authored: Wed Dec 11 00:27:16 2013 -0600
Committer: Sean Busbey <busbey@cloudera.com>
Committed: Mon Mar 10 10:08:22 2014 -0500

----------------------------------------------------------------------
 README          | 2 +-
 README.parallel | 2 +-
 ingest/pom.xml  | 7 ++++---
 pom.xml         | 8 ++++----
 query/pom.xml   | 7 ++++---
 5 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/e84d8d7a/README
----------------------------------------------------------------------
diff --git a/README b/README
index 041490f..869f5e7 100644
--- a/README
+++ b/README
@@ -55,7 +55,7 @@
 		kryo*.jar
 		minlog*.jar
 		commons-jexl*.jar
-		google-collections*.jar
+		guava*.jar
 		
 	8. Copy the $JBOSS_HOME/server/default/deploy/wikisearch-query*.jar to $ACCUMULO_HOME/lib/ext.
 

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/e84d8d7a/README.parallel
----------------------------------------------------------------------
diff --git a/README.parallel b/README.parallel
index 477556b..399f0f3 100644
--- a/README.parallel
+++ b/README.parallel
@@ -52,7 +52,7 @@
 		kryo*.jar
 		minlog*.jar
 		commons-jexl*.jar
-		google-collections*.jar
+		guava*.jar
 		
 	8. Copy the $JBOSS_HOME/server/default/deploy/wikisearch-query*.jar to $ACCUMULO_HOME/lib/ext.
 

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/e84d8d7a/ingest/pom.xml
----------------------------------------------------------------------
diff --git a/ingest/pom.xml b/ingest/pom.xml
index 31d7110..c4e0336 100644
--- a/ingest/pom.xml
+++ b/ingest/pom.xml
@@ -49,8 +49,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>
@@ -103,7 +103,8 @@
             <configuration>
               <outputDirectory>lib</outputDirectory>
               <!-- 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>
+              <!-- XXX we include guava at the same version as hadoop 2 provides so that
we have it on hadoop 1 -->
+              <includeArtifactIds>commons-lang,guava,lucene-core,lucene-analyzers,lucene-wikipedia,protobuf-java,accumulo-core,hadoop-core,libthrift,cloudtrace,zookeeper,commons-codec</includeArtifactIds>
               <excludeTransitive>false</excludeTransitive>
             </configuration>
           </execution>

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/e84d8d7a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ea9a2a..44996e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
     <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.guava>11.0.2</version.guava>
     <version.libthrift>0.6.1</version.libthrift>
     <version.zookeeper>3.3.1</version.zookeeper>
     <version.minlog>1.2</version.minlog>
@@ -203,9 +203,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>

http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/e84d8d7a/query/pom.xml
----------------------------------------------------------------------
diff --git a/query/pom.xml b/query/pom.xml
index 8c6e6d3..d2f75ea 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -62,8 +62,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>
@@ -106,7 +106,8 @@
             <configuration>
               <outputDirectory>lib</outputDirectory>
               <!-- 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>
+              <!-- XXX we include guava at the same version as hadoop 2 provides so that
we have it on hadoop 1 -->
+              <includeArtifactIds>commons-lang,commons-codec,protobuf-java,libthrift,zookeeper,hadoop-core,commons-jexl,guava,kryo,asm,minlog,reflectasm,wikisearch-ingest,accumulo-core,cloudtrace</includeArtifactIds>
               <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>


Mime
View raw message