Repository: lens
Updated Branches:
  refs/heads/master b5763ff06 -> 7707a25b1


LENS-1198 : Update hive dependency to apache hive release 2.1.0


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

Branch: refs/heads/master
Commit: 7707a25b1f195b846292adfe679881004d748b31
Parents: b5763ff
Author: Rajat Khandelwal <[email protected]>
Authored: Sun Jul 24 08:25:58 2016 +0530
Committer: Amareshwari Sriramadasu <[email protected]>
Committed: Sun Jul 24 08:25:58 2016 +0530

----------------------------------------------------------------------
 bin-dist-files/README                     | 14 ++++++-------
 pom.xml                                   | 19 +----------------
 src/site/apt/developer/contribute.apt     |  2 +-
 src/site/apt/lenshome/install-and-run.apt | 29 +++++++++++++++++++-------
 4 files changed, 29 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lens/blob/7707a25b/bin-dist-files/README
----------------------------------------------------------------------
diff --git a/bin-dist-files/README b/bin-dist-files/README
index 84dcdf1..e4e9f9d 100644
--- a/bin-dist-files/README
+++ b/bin-dist-files/README
@@ -14,14 +14,12 @@ Detailed documentation for the project is available at 
https://lens.apache.org
 Here are quick start steps :
 
 Before starting the server, you need to set HADOOP_HOME and HIVE_HOME 
environment variables. These should point to
-the Hadoop and Hive installation directories. Lens depends on a forked version 
of Hive which is available at
-https://github.com/inmobi/hive. So, Hive needs to be built and HIVE_HOME 
should be set as packaged directory from
-build.
-
-Building hive :
-$ git clone https://github.com/inmobi/hive
-$ git checkout hive-release-0.13.3-inm
-$ mvn clean package -DskipTests -Phadoop-2,dist
+the Hadoop and Hive installation directories. Lens depends on apache Hive 2.1+.
+
+Installing Hive :
+$ # Download hive binary from http://apache.org/download.cgi
+$ # extract
+$ export HIVE_HOME=<extracted_directory>
 
 Server packaging is server/ folder.
 $ cd server

http://git-wip-us.apache.org/repos/asf/lens/blob/7707a25b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 176fb0e..f5a80df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
     <!-- hadoop stack -->
     <hadoop.version>2.6.0</hadoop.version>
     <spark.version>1.3.0</spark.version>
-    <hive.version>2.1.1-inm</hive.version>
+    <hive.version>2.1.0</hive.version>
 
     <!-- jest client for elasticsearch -->
     <jest.version>0.1.5</jest.version>
@@ -753,23 +753,6 @@
   </build>
   <repositories>
     <repository>
-      <id>inmobi.repo</id>
-      <url>https://github.com/InMobi/mvn-repo/raw/master/releases</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>inmobi.snapshots</id>
-      <url>https://github.com/InMobi/mvn-repo/raw/master/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
       <id>central</id>
       <url>http://repo1.maven.org/maven2</url>
       <snapshots>

http://git-wip-us.apache.org/repos/asf/lens/blob/7707a25b/src/site/apt/developer/contribute.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer/contribute.apt 
b/src/site/apt/developer/contribute.apt
index 8ea7a6d..3358052 100644
--- a/src/site/apt/developer/contribute.apt
+++ b/src/site/apt/developer/contribute.apt
@@ -148,7 +148,7 @@ Developer Documentation : How to contribute to Apache Lens?
 
 +---+
 
-   git clone https://github.com/InMobi/hive.git
+   git clone https://github.com/apache/hive.git
 
    cd hive
 

http://git-wip-us.apache.org/repos/asf/lens/blob/7707a25b/src/site/apt/lenshome/install-and-run.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/lenshome/install-and-run.apt 
b/src/site/apt/lenshome/install-and-run.apt
index b9727c4..6c9bb09 100644
--- a/src/site/apt/lenshome/install-and-run.apt
+++ b/src/site/apt/lenshome/install-and-run.apt
@@ -26,8 +26,10 @@ Installing and Running Lens
 ** Downloading
 
   Download a release of Apache Lens from {{{/releases/download.html}here}}.
-  Lens depends on Hive forked from Apache Hive. Download a release of hive 
from 
{{{https://github.com/InMobi/hive/releases}https://github.com/InMobi/hive/releases}}.
-  Lens < 2.6 works with hive 0.13.x releases, Lens >= 2.6 works with hive 2.1+ 
releases.
+  Lens \< 2.6 depend on Hive forked from Apache Hive. Download a release of 
hive from 
{{{https://github.com/InMobi/hive/releases}https://github.com/InMobi/hive/releases}}.
 Compatible versions are 0.13.x.
+
+  In version <2.6>, hive dependency has been migrated to apache hive. Now lens 
no longer depends on forked hive.
+  Lens > 2.6 work with apache hive 2.1+ releases. Downloadable from 
{{{http://www.apache.org/dyn/closer.cgi/hive/}http://www.apache.org/dyn/closer.cgi/hive/}}
 
 ** Installing Lens
 
@@ -35,14 +37,14 @@ Installing and Running Lens
 
 +---+
 
-  tar zxvf apache-lens-<verison>-bin.tar.gz
+  tar zxvf apache-lens-<version>-bin.tar.gz
 
 +---+
 
-  This will result in the creation of a directory named 
apache-lens-<verison>-bin (where <version> is the release number).
+  This will result in the creation of a directory named 
apache-lens-<version>-bin (where <version> is the release number).
 
 +---+
-  apache-lens-<verison>-bin
+  apache-lens-<version>-bin
   ├── client
   ├── LICENSE
   ├── NOTICE
@@ -52,15 +54,18 @@ Installing and Running Lens
   └── ui
 +---+
 
- <apache-lens-<verison>-bin/client> can be used as the Lens client 
installation directory, <apache-lens-<verison>-bin/server> can be used as the 
Lens server installation directory, and <apache-lens-<verison>-bin/ui> can be 
used as the Lens UI installation directory to {{{#Running_Lens}run}} lens 
client, lens server and lens ui respectively.
+ <apache-lens-<version>-bin/client> can be used as the Lens client 
installation directory, <apache-lens-<version>-bin/server> can be used as the 
Lens server installation directory, and <apache-lens-<version>-bin/ui> can be 
used as the Lens UI installation directory to {{{#Running_Lens}run}} lens 
client, lens server and lens ui respectively.
 
 ** Installing Hive
 
-  Unpack the tarball.
+
+*** Lens \< 2.6
+
+  Only source releases are available so we'll have to download source and 
build from there:
 
 +---+
 
-  tar -xzvf hive-hive-release-<version>-inm.tar.gz
+  tar -xzvf hive-hive-release-<version>-inm.tar.gz # Lens < 2.6
 
 +---+
 
@@ -88,6 +93,14 @@ Installing and Running Lens
   export HIVE_HOME=`pwd`
 +---+
 
+*** Lens \>= 2.6
+
+  Apache hive releases are available as both binary and source releases. You 
can move forward with the source release
+  following the steps mentioned in the earlier section, with minor changes in 
names of the files and directories.
+  The other way is to download the bin tarball directly and proceed with that. 
Steps will be similar as above, except
+  that you'll directly start from the <bin.tar.gz> instead of building that 
from source first.
+
+
 * Running Lens
 
 ** Running Lens Server

Reply via email to