aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun He <jun.he@linaro.org>2016-12-06 13:09:40 +0000
committerJun He <jun.he@linaro.org>2016-12-06 13:09:40 +0000
commit82d4786469d43fa088791e616e2eb01f533ccb4f (patch)
tree361b8cb64ce457388826f8535afb55425ff03938
parent187884fc29025a3c10fe3fdc16d3f05a3eb51acd (diff)
downloadbigtop-odpi-82d4786469d43fa088791e616e2eb01f533ccb4f.tar.gz
Revert "Fix build: remove MAVEN_OPTS"
This reverts commit e27e1e63e375c97f18c7546b386200dd6821aebc.
-rw-r--r--bigtop-packages/src/common/hadoop/do-component-build3
1 files changed, 1 insertions, 2 deletions
diff --git a/bigtop-packages/src/common/hadoop/do-component-build b/bigtop-packages/src/common/hadoop/do-component-build
index 47c581e5..be986f71 100644
--- a/bigtop-packages/src/common/hadoop/do-component-build
+++ b/bigtop-packages/src/common/hadoop/do-component-build
@@ -129,8 +129,7 @@ HADOOP_DEPLOY_OPTS="${MAVEN_OPTS} deploy"
# Based on Environment Flag, setting the right HADOOP_OPTS with install/deploy.
[[ $deployarg = "yes" ]] && HADOOP_OPTS="${HADOOP_DEPLOY_OPTS}" || HADOOP_OPTS="${HADOOP_INSTALL_OPTS}"
-#mvn $ANT_OPTS $BUNDLE_SNAPPY -Pdist -Pnative -Psrc -Dtar -Dtomcat.version=${BIGTOP_TOMCAT_VERSION} -Dtomcat.download.url="http://archive.apache.org/dist/tomcat/tomcat-6/v${BIGTOP_TOMCAT_VERSION}/bin/apache-tomcat-${BIGTOP_TOMCAT_VERSION}.tar.gz" ${HADOOP_OPTS} "$@"
-mvn clean package -Pdist -Dtar -Dmaven.javadoc.skip=true -DskipTests -fail-at-end -Pnative -Dtomcat.version=${BIGTOP_TOMCAT_VERSION} -Dtomcat.download.url="http://archive.apache.org/dist/tomcat/tomcat-6/v${BIGTOP_TOMCAT_VERSION}/bin/apache-tomcat-${BIGTOP_TOMCAT_VERSION}.tar.gz" ${HADOOP_OPTS} "$@"
+mvn $ANT_OPTS $BUNDLE_SNAPPY -Pdist -Pnative -Psrc -Dtar -Dtomcat.version=${BIGTOP_TOMCAT_VERSION} -Dtomcat.download.url="http://archive.apache.org/dist/tomcat/tomcat-6/v${BIGTOP_TOMCAT_VERSION}/bin/apache-tomcat-${BIGTOP_TOMCAT_VERSION}.tar.gz" ${HADOOP_OPTS} "$@"
mvn site site:stage ${HADOOP_OPTS} $@