This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 8df4af1 BIGTOP-3303. Fix build failure of hbase-1.5.0 on Ubuntu.
(#593)
8df4af1 is described below
commit 8df4af1a8ee99f881b46b36b9c1a4cb02a901f60
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Wed Feb 12 22:52:46 2020 +0900
BIGTOP-3303. Fix build failure of hbase-1.5.0 on Ubuntu. (#593)
---
bigtop-packages/src/common/hbase/do-component-build | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/bigtop-packages/src/common/hbase/do-component-build
b/bigtop-packages/src/common/hbase/do-component-build
index 114f2e5..873b0df 100644
--- a/bigtop-packages/src/common/hbase/do-component-build
+++ b/bigtop-packages/src/common/hbase/do-component-build
@@ -36,12 +36,15 @@ if [ $HOSTTYPE = "aarch64" ] ; then
sed -i '/<version>1.5.0-alpha.6<\/version>/,+1d' ./pom.xml
sed -i
'/<artifactId>asciidoctorj-pdf<\/artifactId>/a\<version>1.5.0-alpha.6<\/version>\n</dependency>\n<dependency>\n<groupId>org.jruby<\/groupId>\n<artifactId>jruby-complete<\/artifactId>\n<version>9.1.8.0<\/version>\n<\/dependency>'
./pom.xml
fi
-mvn -DskipTests -Dslf4j.version=1.7.25 \
- -Dhadoop-two.version=$HADOOP_VERSION \
- -Dzookeeper.version=$ZOOKEEPER_VERSION \
- -Dcheckstyle.skip=true \
- ${MAVEN_ADDITIONAL} \
- install site assembly:single "$@"
+
+MVN_ARGS="-DskipTests "
+MVN_ARGS+="-Dslf4j.version=1.7.25 "
+MVN_ARGS+="-Dhadoop-two.version=${HADOOP_VERSION} "
+MVN_ARGS+="-Dzookeeper.version=${ZOOKEEPER_VERSION} "
+MVN_ARGS+="-Dcheckstyle.skip=true "
+mvn ${MVN_ARGS} ${MAVEN_ADDITIONAL} install "$@"
+mvn ${MVN_ARGS} ${MAVEN_ADDITIONAL} site "$@"
+mvn ${MVN_ARGS} ${MAVEN_ADDITIONAL} package assembly:single "$@"
rm -rf build
mkdir build
