[bigtop] branch master updated: BIGTOP-3375. Bump Livy to 0.7.0 and build it with Python3. (#651)

[sekikn]

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 ac30d71  BIGTOP-3375. Bump Livy to 0.7.0 and build it with Python3. 
(#651)
ac30d71 is described below

commit ac30d718d225b6a35149bac6a00f0395b013c12f
Author: Kengo Seki <sek...@apache.org>
AuthorDate: Mon Jul 20 13:36:09 2020 +0900

    BIGTOP-3375. Bump Livy to 0.7.0 and build it with Python3. (#651)
---
 bigtop-packages/src/common/livy/do-component-build               | 9 +++++++--
 .../src/common/livy/patch0-python-executable-version.diff        | 4 ++--
 bigtop.bom                                                       | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bigtop-packages/src/common/livy/do-component-build 
b/bigtop-packages/src/common/livy/do-component-build
index ebde7f5..62e259c 100644
--- a/bigtop-packages/src/common/livy/do-component-build
+++ b/bigtop-packages/src/common/livy/do-component-build
@@ -20,9 +20,14 @@ set -ex
 
 LIVY_BUILD_OPTS="-Drat.skip=true \
                  -DskipTests \
+                 -Dskip=true \
                  -DskipITs=true \
-                 -Dspark.version=$SPARK_VERSION \
-                 -Dhadoop.version=$HADOOP_VERSION"
+                 -Dscala.version=${SCALA_VERSION} \
+                 -Dscala.binary.version=${SCALA_VERSION%.*} \
+                 -Dzookeeper.version=${ZOOKEEPER_VERSION} \
+                 -Dhadoop.version=${HADOOP_VERSION} \
+                 -Dspark.version=${SPARK_VERSION} \
+                 -Pspark-${SPARK_VERSION%.*}"
 
 mvn install $LIVY_BUILD_OPTS "$@"
 
diff --git 
a/bigtop-packages/src/common/livy/patch0-python-executable-version.diff 
b/bigtop-packages/src/common/livy/patch0-python-executable-version.diff
index 603c58e..0924496 100644
--- a/bigtop-packages/src/common/livy/patch0-python-executable-version.diff
+++ b/bigtop-packages/src/common/livy/patch0-python-executable-version.diff
@@ -7,7 +7,7 @@ index 8e5cdab..f042e73 100644
              </goals>
              <configuration>
 -            <executable>python</executable>
-+            <executable>python2</executable>
++            <executable>python3</executable>
                <arguments>
                  <argument>setup.py</argument>
                  <argument>sdist</argument>
@@ -16,7 +16,7 @@ index 8e5cdab..f042e73 100644
              </goals>
              <configuration>
 -              <executable>python</executable>
-+              <executable>python2</executable>
++              <executable>python3</executable>
                <skip>${skipTests}</skip>
                <arguments>
                  <argument>setup.py</argument>
diff --git a/bigtop.bom b/bigtop.bom
index fbbe018..c197f81 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -418,7 +418,7 @@ bigtop {
     'livy' {
       name    = 'livy'
       relNotes = 'Apache Livy'
-      version { base = '0.6.0'; pkg = base; release = 1 }
+      version { base = '0.7.0'; pkg = base; release = 1 }
       tarball { destination = "${name}-${version.base}.tar.gz"
                 source      = destination  }
       git {