gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmarroq...@apache.org
Subject [4/6] gora git commit: GORA-482
Date Sun, 31 Jul 2016 19:33:12 GMT
GORA-482


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

Branch: refs/heads/master
Commit: 1cf3547af79b66928a978a0cba7dab9465408e0b
Parents: d64a275
Author: Renato Marroquin <marenato@inf.ethz.ch>
Authored: Thu Jul 28 10:11:51 2016 +0200
Committer: Renato Marroquin <marenato@inf.ethz.ch>
Committed: Thu Jul 28 10:11:51 2016 +0200

----------------------------------------------------------------------
 pom.xml | 81 ++++++++++++++++--------------------------------------------
 1 file changed, 21 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/gora/blob/1cf3547a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f5df01b..4c8739f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -652,54 +652,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>hadoop1</id>
-      <properties>
-        <hadoop.classifier>hadoop1</hadoop.classifier>
-      </properties>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-core</artifactId>
-            <version>${hadoop-1.version}</version>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
-    <profile>
-      <id>hadoop2</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <hadoop.classifier>hadoop2</hadoop.classifier>
-      </properties>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
-            <version>${hadoop-2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-auth</artifactId>
-            <version>${hadoop-2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-mapreduce-client-core</artifactId>
-            <version>${hadoop-2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-yarn-common</artifactId>
-            <version>${hadoop-2.version}</version>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
   </profiles>
 
   <modules>
@@ -716,10 +668,6 @@
     <!--module>gora-sql</module -->
     <module>gora-maven-plugin</module>
     <module>gora-mongodb</module>
-    <!--<module>gora-shims-hadoop</module>-->
-    <!--<module>gora-shims-hadoop1</module>-->
-    <!--<module>gora-shims-hadoop2</module>-->
-    <!--<module>gora-shims-distribution</module>-->
     <module>gora-solr</module>
     <module>gora-solr-5</module>
     <module>gora-tutorial</module>
@@ -733,9 +681,7 @@
     <avro.version>1.7.6</avro.version>
 <!--     <jackson.version>1.6.9</jackson.version> -->
     <!-- Hadoop Dependencies -->
-    <hadoop-1.version>1.2.1</hadoop-1.version>
     <hadoop-2.version>2.5.2</hadoop-2.version>
-    <hadoop-1.test.version>1.2.1</hadoop-1.test.version>
     <hadoop-2.test.version>2.5.2</hadoop-2.test.version>
     <hbase.version>0.98.8-hadoop2</hbase.version>
     <hbase.test.version>0.98.8-hadoop2</hbase.test.version>
@@ -915,12 +861,27 @@
         <version>${hadoop-2.version}</version>
         <optional>true</optional>
       </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-minicluster</artifactId>
-        <version>${hadoop-2.test.version}</version>
-        <optional>true</optional>
-      </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-auth</artifactId>-->
+        <!--<version>${hadoop-2.version}</version>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>org.apache.hadoop</groupId>-->
+        <!--<artifactId>hadoop-mapreduce-client-core</artifactId>-->
+        <!--<version>${hadoop-2.version}</version>-->
+      <!--</dependency>-->
+      <!--<dependency>-->
+        <!--<groupId>org.apache.hadoop</groupId>-->
+        <!--<artifactId>hadoop-yarn-common</artifactId>-->
+        <!--<version>${hadoop-2.version}</version>-->
+      <!--</dependency>-->
+
 
       <dependency>
         <groupId>org.apache.cxf</groupId>


Mime
View raw message