You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2014/09/14 22:11:48 UTC
[2/2] git commit: BIGTOP-1446. Spark fails with clean .m2
BIGTOP-1446. Spark fails with clean .m2
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/911f6e1c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/911f6e1c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/911f6e1c
Branch: refs/heads/master
Commit: 911f6e1ca3a10dcb82fa9c8d88b03d95e7732f89
Parents: 0493cbf
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Sat Sep 13 23:33:47 2014 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Sat Sep 13 23:33:47 2014 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/spark/do-component-build | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/911f6e1c/bigtop-packages/src/common/spark/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/spark/do-component-build b/bigtop-packages/src/common/spark/do-component-build
index 6f930d0..ac39b03 100644
--- a/bigtop-packages/src/common/spark/do-component-build
+++ b/bigtop-packages/src/common/spark/do-component-build
@@ -23,6 +23,9 @@ if [ "x$SCALA_HOME" = "x" ]; then
exit 2
fi
+# FIXME: this is fixed in Spark 1.x
+sed -i -e '/<dependencies>/a<dependency><groupId>commons-cli</groupId><artifactId>commons-cli</artifactId><version>1.2</version></dependency>' assembly/pom.xml
+
BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${HOME} \
-Drepo.maven.org=$IVY_MIRROR_PROP \
-Dreactor.repo=file://${HOME}/.m2/repository \