You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/08/20 21:20:13 UTC
git commit: BUILD: Bump Hadoop versions in the release build.
Repository: spark
Updated Branches:
refs/heads/master f2f26c2a1 -> ceb19830b
BUILD: Bump Hadoop versions in the release build.
Also, minor modifications to the MapR profile.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ceb19830
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ceb19830
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ceb19830
Branch: refs/heads/master
Commit: ceb19830b88486faa87ff41e18d03ede713a73cc
Parents: f2f26c2
Author: Patrick Wendell <pw...@gmail.com>
Authored: Wed Aug 20 12:18:41 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Aug 20 12:19:19 2014 -0700
----------------------------------------------------------------------
dev/create-release/create-release.sh | 10 ++++----
pom.xml | 39 +++++++++++++++++++++++++++----
2 files changed, 40 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ceb19830/dev/create-release/create-release.sh
----------------------------------------------------------------------
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh
index 905dec0..eab6313 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -118,11 +118,11 @@ make_binary_release() {
}
make_binary_release "hadoop1" "-Phive -Dhadoop.version=1.0.4" &
-make_binary_release "cdh4" "-Phive -Dhadoop.version=2.0.0-mr1-cdh4.2.0" &
-make_binary_release "hadoop2" \
- "-Phive -Pyarn -Phadoop-2.2 -Dhadoop.version=2.2.0 -Pyarn.version=2.2.0" &
-make_binary_release "hadoop2-without-hive" \
- "-Pyarn -Phadoop-2.2 -Dhadoop.version=2.2.0 -Pyarn.version=2.2.0" &
+make_binary_release "hadoop2.3" "-Phadoop-2.3 -Phive -Pyarn" &
+make_binary_release "hadoop2.4" "-Phadoop-2.4 -Phive -Pyarn" &
+make_binary_release "hadoop2.4-without-hive" "-Phadoop-2.4 -Pyarn" &
+make_binary_release "mapr3" "-Pmapr3 -Pyarn -Phive" &
+make_binary_release "mapr4" "-Pmapr4 -Pyarn -Phive" &
wait
# Copy data
http://git-wip-us.apache.org/repos/asf/spark/blob/ceb19830/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dd4c4ee..7ed07ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1115,18 +1115,49 @@
</profile>
<profile>
- <id>mapr</id>
+ <id>mapr3</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<hadoop.version>1.0.3-mapr-3.0.3</hadoop.version>
- <yarn.version>2.3.0-mapr-4.0.0-beta</yarn.version>
- <hbase.version>0.94.17-mapr-1403</hbase.version>
- <zookeeper.version>3.4.5-mapr-1401</zookeeper.version>
+ <yarn.version>2.3.0-mapr-4.0.0-FCS</yarn.version>
+ <hbase.version>0.94.17-mapr-1405</hbase.version>
+ <zookeeper.version>3.4.5-mapr-1406</zookeeper.version>
</properties>
</profile>
+ <profile>
+ <id>mapr4</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>
+ <hbase.version>0.94.17-mapr-1405-4.0.0-FCS</hbase.version>
+ <zookeeper.version>3.4.5-mapr-1406</zookeeper.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-1406</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<!-- Build without Hadoop dependencies that are included in some runtime environments. -->
<profile>
<id>hadoop-provided</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org