From 6ab0d9ec93bc95b8abfc774e69cdaa0afb58eff0 Mon Sep 17 00:00:00 2001
From: trystanleftwich <trystan@atscale.com>
Date: Fri, 26 Jun 2015 11:15:47 -0700
Subject: [PATCH] [SPARK-6196][build]Add MAPR 4.0.2 support to the build

---
 dev/create-release/create-release.sh     |  4 +--
 docs/hadoop-third-party-distributions.md |  9 ++++++
 pom.xml                                  | 38 ------------------------
 3 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh
index 54274a83f6d66..96bd58dc438ff 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -233,8 +233,8 @@ if [[ ! "$@" =~ --skip-package ]]; then
   make_binary_release "cdh4" "-Psparkr -Phadoop-1 -Phive -Phive-thriftserver -Dhadoop.version=2.0.0-mr1-cdh4.2.0" "3032" &
   make_binary_release "hadoop2.3" "-Psparkr -Phadoop-2.3 -Phive -Phive-thriftserver -Pyarn" "3033" &
   make_binary_release "hadoop2.4" "-Psparkr -Phadoop-2.4 -Phive -Phive-thriftserver -Pyarn" "3034" &
-  make_binary_release "mapr3" "-Pmapr3 -Psparkr -Phive -Phive-thriftserver" "3035" &
-  make_binary_release "mapr4" "-Pmapr4 -Psparkr -Pyarn -Phive -Phive-thriftserver" "3036" &
+  make_binary_release "mapr4" "-Psparkr -Pyarn -Phive -Phive-thriftserver -Dhadoop.version=2.4.1-mapr-1408 -Dhbase.version=0.98.4-mapr-1408 -Dzookeeper.version=3.4.5-mapr-1406" "3035" &
+  make_binary_release "mapr4.0.2" "-Psparkr -Pyarn -Phive -Phive-thriftserver -Dhadoop.version=2.5.1-mapr-1501 -Dhbase.version=0.98.7-mapr-1501-r1 -Dzookeeper.version=3.4.5-mapr-1406 -Dprotobuf.version=2.5.0" "3036" &
   make_binary_release "hadoop2.4-without-hive" "-Psparkr -Phadoop-2.4 -Pyarn" "3037" &
   wait
   rm -rf spark-$RELEASE_VERSION-bin-*/
diff --git a/docs/hadoop-third-party-distributions.md b/docs/hadoop-third-party-distributions.md
index 795dd82a6be06..2c455969cd1f9 100644
--- a/docs/hadoop-third-party-distributions.md
+++ b/docs/hadoop-third-party-distributions.md
@@ -40,6 +40,15 @@ the _exact_ Hadoop version you are running to avoid any compatibility errors.
         <tr><td>HDP 1.1</td><td>1.0.3</td></tr>
         <tr><td>HDP 1.0</td><td>1.0.3</td></tr>
         <tr><td>HDP 2.0</td><td>2.2.0</td></tr>
+        <tr><td>HDP 2.2</td><td>2.6.0</td></tr>
+      </table>
+    </td>
+    <td>
+      <h3>Mapr Releases</h3>
+      <table class="table" style="width:350px;">
+        <tr><th>Release</th><th>Version codes</th></tr>
+        <tr><td>Mapr 4.0.1</td><td>hadoop.version=2.4.1-mapr-1408 <br />hbase.version=0.98.7-mapr-1501-r1 <br />zookeeper.version=3.4.5-mapr-1406</td></tr>
+        <tr><td>Mapr 4.0.2</td><td>hadoop.version=2.5.1-mapr-1501 <br />hbase.version=0.98.7-mapr-1501-r1 <br />zookeeper.version=3.4.5-mapr-1406 <br />protobuf.version=2.5.0</td></tr>
       </table>
     </td>
   </tr>
diff --git a/pom.xml b/pom.xml
index 80cacb5ace2d4..1aac26fb7f6b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1738,44 +1738,6 @@
       </modules>
     </profile>
 
-    <profile>
-      <id>mapr3</id>
-      <properties>
-        <hadoop.version>1.0.3-mapr-3.0.3</hadoop.version>
-        <yarn.version>2.4.1-mapr-1408</yarn.version>
-        <hbase.version>0.98.4-mapr-1408</hbase.version>
-        <zookeeper.version>3.4.5-mapr-1406</zookeeper.version>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>mapr4</id>
-      <properties>
-        <hadoop.version>2.4.1-mapr-1408</hadoop.version>
-        <yarn.version>2.4.1-mapr-1408</yarn.version>
-        <hbase.version>0.98.4-mapr-1408</hbase.version>
-        <zookeeper.version>3.4.5-mapr-1406</zookeeper.version>
-      </properties>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.curator</groupId>
-          <artifactId>curator-recipes</artifactId>
-          <version>${curator.version}</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-1406</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
     <profile>
       <id>hive-thriftserver</id>
       <modules>