Repository: spark Updated Branches: refs/heads/branch-1.0 eac4ee890 -> eec4dd884
SPARK-1862: Support for MapR in the Maven build. Author: Patrick Wendell <[email protected]> Closes #803 from pwendell/mapr-support and squashes the following commits: 8df60e4 [Patrick Wendell] SPARK-1862: Support for MapR in the Maven build. (cherry picked from commit 17702e280c4b0b030870962fcb3d50c3085ae862) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/eec4dd88 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/eec4dd88 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/eec4dd88 Branch: refs/heads/branch-1.0 Commit: eec4dd884264eda0130fcc2922f6b281b273a95b Parents: eac4ee8 Author: Patrick Wendell <[email protected]> Authored: Thu May 15 23:31:43 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Thu May 15 23:32:24 2014 -0700 ---------------------------------------------------------------------- pom.xml | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/eec4dd88/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5adff6b..f04d7e4 100644 --- a/pom.xml +++ b/pom.xml @@ -122,6 +122,7 @@ <protobuf.version>2.4.1</protobuf.version> <yarn.version>${hadoop.version}</yarn.version> <hbase.version>0.94.6</hbase.version> + <zookeeper.version>3.4.5</zookeeper.version> <hive.version>0.12.0</hive.version> <parquet.version>1.4.3</parquet.version> <jblas.version>1.2.3</jblas.version> @@ -193,6 +194,17 @@ <enabled>false</enabled> </snapshots> </repository> + <repository> + <id>mapr-repo</id> + <name>MapR Repository</name> + <url>http://repository.mapr.com/maven</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> </repositories> <dependencyManagement> @@ -489,6 +501,14 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -978,6 +998,19 @@ </modules> </profile> + <profile> + <id>mapr</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> + </properties> + </profile> + <!-- Build without Hadoop dependencies that are included in some runtime environments. --> <profile> <id>hadoop-provided</id> @@ -1023,7 +1056,7 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> + <version>${zookeeper.version}</version> <scope>provided</scope> </dependency> </dependencies>
