You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ju...@apache.org on 2018/03/30 02:26:12 UTC

bigtop git commit: BIGTOP-2723:Fix asciidoctor-maven-plugin for HBase build on AArch64

Repository: bigtop
Updated Branches:
  refs/heads/master e9d3e3b9e -> 9ff835431


BIGTOP-2723:Fix asciidoctor-maven-plugin for HBase build on AArch64

This closes #200

Change-Id: Ia7318eb115027ceabeff9952588e5ec364b00144
Signed-off-by: Yuqi Gu <yu...@arm.com>
Signed-off-by: Jun He <ju...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/9ff83543
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/9ff83543
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/9ff83543

Branch: refs/heads/master
Commit: 9ff8354313cb3d2c469022d88df129a631223f08
Parents: e9d3e3b
Author: Yuqi Gu <yu...@arm.com>
Authored: Thu Mar 29 08:10:55 2018 +0000
Committer: Jun He <ju...@apache.org>
Committed: Fri Mar 30 02:21:12 2018 +0000

----------------------------------------------------------------------
 bigtop-packages/src/common/hbase/do-component-build | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/9ff83543/bigtop-packages/src/common/hbase/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build
index 4c7dde0..4b69afb 100644
--- a/bigtop-packages/src/common/hbase/do-component-build
+++ b/bigtop-packages/src/common/hbase/do-component-build
@@ -32,6 +32,10 @@ fi
 
 rm -f hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkLoad.java
 
+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.6.1         \
     -Dhadoop-two.version=$HADOOP_VERSION      \
     -Dzookeeper.version=$ZOOKEEPER_VERSION    \