You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2017/04/06 09:42:06 UTC

[1/2] incubator-carbondata git commit: revert pom

Repository: incubator-carbondata
Updated Branches:
  refs/heads/hive 8e753a85b -> 3397dc3d9


revert pom


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/8b4adfdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/8b4adfdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/8b4adfdc

Branch: refs/heads/hive
Commit: 8b4adfdc3306c6fbc2d77b546cdf3e7587fd0268
Parents: 8e753a8
Author: QiangCai <qi...@qq.com>
Authored: Thu Apr 6 14:30:11 2017 +0530
Committer: QiangCai <qi...@qq.com>
Committed: Thu Apr 6 14:30:11 2017 +0530

----------------------------------------------------------------------
 pom.xml | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8b4adfdc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6005c0f..11cbb61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,12 +147,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-yarn-api</artifactId>
-        <version>${hadoop.version}</version>
-        <scope>${hadoop.deps.scope}</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-mapreduce-client-core</artifactId>
         <version>${hadoop.version}</version>
         <scope>${hadoop.deps.scope}</scope>
@@ -311,7 +305,6 @@
         <scala.binary.version>2.10</scala.binary.version>
         <scala.version>2.10.4</scala.version>
         <maven.test.skip>true</maven.test.skip>
-        <hive.version>1.2.1</hive.version>
         <flink.version>1.1.4</flink.version>
       </properties>
       <modules>
@@ -319,7 +312,6 @@
         <module>integration/spark</module>
         <module>examples/spark</module>
         <module>integration/spark2</module>
-        <module>integration/hive</module>
         <module>examples/spark2</module>
         <module>examples/flink</module>
       </modules>
@@ -387,15 +379,6 @@
       </modules>
     </profile>
     <profile>
-      <id>hive-1.2</id>
-      <properties>
-        <hive.version>1.2.1</hive.version>
-      </properties>
-      <modules>
-        <module>integration/hive</module>
-      </modules>
-    </profile>
-    <profile>
       <id>findbugs</id>
       <build>
         <plugins>
@@ -461,4 +444,4 @@
     </profile>
   </profiles>
 
-</project>
+</project>
\ No newline at end of file


[2/2] incubator-carbondata git commit: revert pom.xml for hive branch

Posted by ch...@apache.org.
revert pom.xml for hive branch


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/3397dc3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/3397dc3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/3397dc3d

Branch: refs/heads/hive
Commit: 3397dc3d9589cf8c76df67a909cc3d6ec4cc281e
Parents: 8e753a8 8b4adfd
Author: chenliang613 <ch...@huawei.com>
Authored: Thu Apr 6 15:11:31 2017 +0530
Committer: chenliang613 <ch...@huawei.com>
Committed: Thu Apr 6 15:11:31 2017 +0530

----------------------------------------------------------------------
 pom.xml | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------