gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hsapu...@apache.org
Subject git commit: Use Hadoop1 for Gora dependencies to pass the HBase tests for now.
Date Sat, 13 Sep 2014 15:55:46 GMT
Repository: gora
Updated Branches:
  refs/heads/master d4d39ef31 -> 56a01d954


Use Hadoop1 for Gora dependencies to pass the HBase tests for now.


Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/56a01d95
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/56a01d95
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/56a01d95

Branch: refs/heads/master
Commit: 56a01d954e14aff97fabef3d4a34095a90cda7a7
Parents: d4d39ef
Author: Henry Saputra <henry.saputra@gmail.com>
Authored: Sat Sep 13 08:55:36 2014 -0700
Committer: Henry Saputra <henry.saputra@gmail.com>
Committed: Sat Sep 13 08:55:36 2014 -0700

----------------------------------------------------------------------
 .gitignore             |  2 ++
 gora-accumulo/pom.xml  |  4 +---
 gora-cassandra/pom.xml |  4 +---
 gora-core/pom.xml      | 28 +++++++++-------------------
 gora-tutorial/pom.xml  |  3 +--
 5 files changed, 14 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/56a01d95/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 972a8df..cb1bf09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ lib
 ivy/ivy*.jar
 /conf/*-site.xml
 **/conf/*-site.xml
+**/dependency-reduced-pom.xml
+**/gora-solr/src/test/conf/solr/collection1/data/

http://git-wip-us.apache.org/repos/asf/gora/blob/56a01d95/gora-accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/gora-accumulo/pom.xml b/gora-accumulo/pom.xml
index 374a9c3..bbd5cdd 100644
--- a/gora-accumulo/pom.xml
+++ b/gora-accumulo/pom.xml
@@ -158,9 +158,7 @@
 
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-2.version}</version>
-      <classifier>tests</classifier>
+      <artifactId>hadoop-test</artifactId>
     </dependency>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/gora/blob/56a01d95/gora-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/gora-cassandra/pom.xml b/gora-cassandra/pom.xml
index 8e140be..54bd37d 100644
--- a/gora-cassandra/pom.xml
+++ b/gora-cassandra/pom.xml
@@ -184,9 +184,7 @@
 
         <dependency>
           <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-common</artifactId>
-          <version>${hadoop-2.version}</version>
-          <classifier>tests</classifier>
+          <artifactId>hadoop-test</artifactId>
         </dependency>
         
     </dependencies>

http://git-wip-us.apache.org/repos/asf/gora/blob/56a01d95/gora-core/pom.xml
----------------------------------------------------------------------
diff --git a/gora-core/pom.xml b/gora-core/pom.xml
index 66d489a..07ba546 100644
--- a/gora-core/pom.xml
+++ b/gora-core/pom.xml
@@ -110,28 +110,12 @@
       <artifactId>gora-shims-distribution</artifactId>
       <version>${project.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-2.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-2.version}</version>
-      <classifier>tests</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
-      <version>${hadoop-2.version}</version>
-      <classifier>tests</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-mapreduce-client-core</artifactId>
-      <version>${hadoop-2.version}</version>
+      <artifactId>hadoop-core</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -177,6 +161,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/gora/blob/56a01d95/gora-tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/gora-tutorial/pom.xml b/gora-tutorial/pom.xml
index e31a69e..530f0ba 100644
--- a/gora-tutorial/pom.xml
+++ b/gora-tutorial/pom.xml
@@ -116,8 +116,7 @@
     <!-- Hadoop Dependencies -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-2.version}</version>
+      <artifactId>hadoop-core</artifactId>
     </dependency>
 
     <dependency>


Mime
View raw message