You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/11/12 03:48:11 UTC
incubator-zeppelin git commit: Corrected and updated the MapR
Distribution profiles
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 025ba74f3 -> 082eae16d
Corrected and updated the MapR Distribution profiles
Completed the necessary Spark dependency profiles for the MapR distribution. Also added commented out MapR artifact IDs for the Hive interpreter.
Author: Paul Curtis <pc...@mapr.com>
Closes #391 from pfcurtis/master and squashes the following commits:
46c9ce7 [Paul Curtis] Commented out the MapR repository
a95ab43 [Paul Curtis] Moved the MapR repository section to the individual profiles.
9e37ce4 [Paul Curtis] Added information on the MapR profiles
7ed07a0 [Paul Curtis] Corrected and updated the MapR Distribution profiles
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/082eae16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/082eae16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/082eae16
Branch: refs/heads/master
Commit: 082eae16d620639c06016f38e52a5a398829c66f
Parents: 025ba74
Author: Paul Curtis <pc...@mapr.com>
Authored: Tue Nov 10 23:33:36 2015 +0000
Committer: Lee moon soo <mo...@apache.org>
Committed: Thu Nov 12 11:48:25 2015 +0900
----------------------------------------------------------------------
README.md | 20 ++++++++
hive/pom.xml | 13 +++++-
spark-dependencies/pom.xml | 100 ++++++++++++++++++++++++++++++++++++++--
3 files changed, 128 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/082eae16/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 39cb6f0..a3891d3 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,26 @@ CDH 5.X
```
mvn clean package -Pspark-1.2 -Dhadoop.version=2.5.0-cdh5.3.0 -Phadoop-2.4 -DskipTests
```
+For the MapR Hadoop Distribution, these profiles will handle the Hadoop version. As MapR allows different versions
+of Spark to be installed, you should specify which version of Spark is installed on the cluster by adding a Spark profile (-Pspark-1.2, -Pspark-1.3, etc.) as needed. For Hive, check the hive/pom.xml and adjust the version installed as well. The correct Maven
+artifacts can be found for every version of MapR at http://doc.mapr.com
+
+MapR 3.x
+```
+mvn clean package -Pmapr3 -DskipTests
+```
+MapR 4.0.x
+```
+mvn clean package -Pmapr40 -DskipTests
+```
+MapR 4.1
+```
+mvn clean package -Pmapr41 -DskipTests
+```
+MapR 5.0
+```
+mvn clean package -Pmapr50 -DskipTests
+```
Yarn (Hadoop 2.7.x)
```
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/082eae16/hive/pom.xml
----------------------------------------------------------------------
diff --git a/hive/pom.xml b/hive/pom.xml
index 7562c58..f4867d3 100644
--- a/hive/pom.xml
+++ b/hive/pom.xml
@@ -32,10 +32,21 @@
<version>0.6.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Hive interpreter</name>
<url>http://www.apache.org</url>
-
+<!--
+ <repositories>
+ <repository>
+ <id>mapr-releases</id>
+ <url>http://repository.mapr.com/maven/</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ <releases><enabled>true</enabled></releases>
+ </repository>
+ </repositories>
+-->
<properties>
<hive.hive.version>0.14.0</hive.hive.version>
<hive.hadoop.version>2.6.0</hive.hadoop.version>
+<!--<hive.hive.version>1.0.0-mapr-1504</hive.hive.version>
+ <hive.hadoop.version>2.7.0-mapr-1506</hive.hadoop.version> -->
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/082eae16/spark-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index 8294311..8304761 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -588,16 +588,62 @@
<yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version>
<jets3t.version>0.7.1</jets3t.version>
</properties>
+ <repositories>
+ <repository>
+ <id>mapr-releases</id>
+ <url>http://repository.mapr.com/maven/</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ <releases><enabled>true</enabled></releases>
+ </repository>
+ </repositories>
</profile>
<profile>
- <id>mapr4</id>
+ <id>mapr40</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <hadoop.version>2.3.0-mapr-4.0.0-FCS</hadoop.version>
- <yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version>
+ <hadoop.version>2.4.1-mapr-1503</hadoop.version>
+ <yarn.version>2.4.1-mapr-1503</yarn.version>
+ <jets3t.version>0.9.3</jets3t.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <version>2.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.5-mapr-1503</version>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>mapr-releases</id>
+ <url>http://repository.mapr.com/maven/</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ <releases><enabled>true</enabled></releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>mapr41</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <hadoop.version>2.5.1-mapr-1503</hadoop.version>
+ <yarn.version>2.5.1-mapr-1503</yarn.version>
<jets3t.version>0.7.1</jets3t.version>
</properties>
<dependencies>
@@ -615,9 +661,55 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.5-mapr-1406</version>
+ <version>3.4.5-mapr-1503</version>
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>mapr-releases</id>
+ <url>http://repository.mapr.com/maven/</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ <releases><enabled>true</enabled></releases>
+ </repository>
+ </repositories>
+ </profile>
+
+ <profile>
+ <id>mapr50</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <hadoop.version>2.7.0-mapr-1506</hadoop.version>
+ <yarn.version>2.7.0-mapr-1506</yarn.version>
+ <jets3t.version>0.9.3</jets3t.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <version>2.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.4.5-mapr-1503</version>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <id>mapr-releases</id>
+ <url>http://repository.mapr.com/maven/</url>
+ <snapshots><enabled>false</enabled></snapshots>
+ <releases><enabled>true</enabled></releases>
+ </repository>
+ </repositories>
</profile>
<profile>