hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ser...@apache.org
Subject [1/2] hive git commit: HIVE-10914 : LLAP: fix hadoop-1 build for good by removing llap-server from hadoop-1 build - FIX (Sergey Shelukhin)
Date Thu, 04 Jun 2015 18:30:19 GMT
Repository: hive
Updated Branches:
  refs/heads/llap 8e920f245 -> fbb9be8d8


HIVE-10914 : LLAP: fix hadoop-1 build for good by removing llap-server from hadoop-1 build
- FIX (Sergey Shelukhin)


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

Branch: refs/heads/llap
Commit: a73a910a354136a8b71b05d20769789b0e2110aa
Parents: 8e920f2
Author: Sergey Shelukhin <sershe@apache.org>
Authored: Thu Jun 4 11:23:26 2015 -0700
Committer: Sergey Shelukhin <sershe@apache.org>
Committed: Thu Jun 4 11:23:26 2015 -0700

----------------------------------------------------------------------
 cli/pom.xml          |  5 -----
 itests/qtest/pom.xml | 12 ++++++------
 packaging/pom.xml    | 15 ++++++++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/a73a910a/cli/pom.xml
----------------------------------------------------------------------
diff --git a/cli/pom.xml b/cli/pom.xml
index d330030..1cf58dd 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -64,11 +64,6 @@
       <artifactId>hive-exec</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hive</groupId>
-      <artifactId>hive-llap-server</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <!-- inter-project -->
     <dependency>
       <groupId>commons-cli</groupId>

http://git-wip-us.apache.org/repos/asf/hive/blob/a73a910a/itests/qtest/pom.xml
----------------------------------------------------------------------
diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml
index 27e6094..a23fb5c 100644
--- a/itests/qtest/pom.xml
+++ b/itests/qtest/pom.xml
@@ -106,12 +106,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.hive</groupId>
-      <artifactId>hive-llap-server</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-yarn-registry</artifactId>
       <version>${hadoop-23.version}</version>
@@ -215,6 +209,12 @@
       </properties>
       <dependencies>
         <dependency>
+          <groupId>org.apache.hive</groupId>
+          <artifactId>hive-llap-server</artifactId>
+          <version>${project.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
           <groupId>com.sun.jersey</groupId>
           <artifactId>jersey-servlet</artifactId>
           <version>${jersey.version}</version>

http://git-wip-us.apache.org/repos/asf/hive/blob/a73a910a/packaging/pom.xml
----------------------------------------------------------------------
diff --git a/packaging/pom.xml b/packaging/pom.xml
index b2db2cb..00dcd35 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -89,6 +89,16 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>hadoop-2</id>
+      <dependencies>
+        <dependency>
+         <groupId>org.apache.hive</groupId>
+         <artifactId>hive-llap-server</artifactId>
+         <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
 
@@ -176,11 +186,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.hive</groupId>
-      <artifactId>hive-llap-server</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.hive.hcatalog</groupId>
       <artifactId>hive-hcatalog-streaming</artifactId>
       <version>${project.version}</version>


Mime
View raw message