[bigtop] branch master updated: BIGTOP-3549: HBase build failure caused by protobuf in xolstice (#785)

[iwasakims]

This is an automated email from the ASF dual-hosted git repository.

iwasakims 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 c10b7f4  BIGTOP-3549: HBase build failure caused by protobuf in 
xolstice (#785)
c10b7f4 is described below

commit c10b7f45ec75107337ccef842e82e3dc927aebd4
Author: Jun He <jun...@linaro.org>
AuthorDate: Thu Jun 10 23:19:35 2021 +0800

    BIGTOP-3549: HBase build failure caused by protobuf in xolstice (#785)
    
    Change-Id: I65a2b9abc1b8e5a8aad26cee189a2ccf002107a7
    Signed-off-by: Jun He <jun...@arm.com>
---
 bigtop-packages/src/common/hbase/do-component-build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bigtop-packages/src/common/hbase/do-component-build 
b/bigtop-packages/src/common/hbase/do-component-build
index 8d2263b..0619ff9 100644
--- a/bigtop-packages/src/common/hbase/do-component-build
+++ b/bigtop-packages/src/common/hbase/do-component-build
@@ -28,6 +28,7 @@ if [ $HOSTTYPE = "powerpc64le" ] ; then
   sed  -i 
"s|<asciidoctor.plugin.version>.*</asciidoctor.plugin.version>|<asciidoctor.plugin.version>1.5.3</asciidoctor.plugin.version>|"
 pom.xml
   sed -i 
's|<jruby.version>.*</jruby.version>|<jruby.version>1.7.23</jruby.version>|' 
pom.xml
   sed  -i 
"s|<version>1.5.0-alpha.6</version>|<version>1.5.0-alpha.11</version>|" pom.xml
+  CLASSIFIER="linux-ppcle_64"
 fi
 
 if [ $HOSTTYPE = "aarch64" ] ; then
@@ -37,6 +38,7 @@ if [ $HOSTTYPE = "aarch64" ] ; then
 '\             <artifactId>jruby-complete<\/artifactId>\n'\
 '\             <version>9.1.8.0</version>\n'\
 '\          <\/dependency>' pom.xml
+  CLASSIFIER="linux-aarch_64"
 fi
 
 MVN_ARGS="-Phadoop-3.0 "
@@ -48,6 +50,9 @@ MVN_ARGS+="-Dzookeeper.version=${ZOOKEEPER_VERSION} "
 MVN_ARGS+="-DskipTests "
 MVN_ARGS+="-Dcheckstyle.skip=true "
 
+mvn install:install-file -DgroupId=com.google.protobuf -DartifactId=protoc 
-Dversion=2.5.0 \
+            -Dclassifier=${CLASSIFIER} -Dpackaging=exe 
-Dfile=/usr/local/bin/protoc
+
 # HBASE-21513: separate site and assembly:single to avoid assembly issues.
 mvn ${MVN_ARGS} ${MAVEN_ADDITIONAL} clean install "$@"
 mvn ${MVN_ARGS} ${MAVEN_ADDITIONAL} site "$@"