BIGTOP-2812: Upgrade Zeppelin version to 0.7.2

2 files changed, 17 insertions, 22 deletions

diff --git a/bigtop-packages/src/common/zeppelin/do-component-build b/bigtop-packages/src/common/zeppelin/do-component-build
index 9906fb46..05d93f33 100644
--- a/bigtop-packages/src/common/zeppelin/do-component-build
+++ b/bigtop-packages/src/common/zeppelin/do-component-build
@@ -30,29 +30,24 @@ if [ $HOSTTYPE = "powerpc64le" ] ; then
   sed  -i "s|<version>0.0.25</version>|<version>1.1</version>|" zeppelin-web/pom.xml
 fi
 
-t="scala.version"
-find . -name pom.xml -exec sed -i "s#<$t>.*</$t>#<$t>${SCALA_VERSION}</$t>#" {} \;
-t="scala.binary.version"
-find . -name pom.xml -exec sed -i "s#<$t>.*</$t>#<$t>${SCALA_VERSION%.*}</$t>#" {} \;
-t="scala.macros.version"
-find . -name pom.xml -exec sed -i "s#<$t>.*</$t>#<$t>2.1.0</$t>#" {} \;
-t="spark.version"
-find . -name pom.xml -exec sed -i "s#<$t>.*</$t>#<$t>${SPARK_VERSION}</$t>#" {} \;
-t="hadoop.version"
-find . -name pom.xml -exec sed -i "s#<$t>.*</$t>#<$t>${HADOOP_VERSION}</$t>#" {} \;
-t="hbase.hbase.version"
-find . -name pom.xml -exec sed -i "s#<$t>.*</$t>#<$t>${HBASE_VERSION}</$t>#" {} \;
-t="hbase.hadoop.version"
-find . -name pom.xml -exec sed -i "s#<$t>.*</$t>#<$t>${HADOOP_VERSION}</$t>#" {} \;
-t="ignite.version"
-find . -name pom.xml -exec sed -i "s#<$t>.*</$t>#<$t>${IGNITE_HADOOP_VERSION}</$t>#" {} \;
-
-BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${HOME} \
-            -Drepo.maven.org=$IVY_MIRROR_PROP \
-            -Dreactor.repo=file://${HOME}/.m2/repository \
+./dev/change_scala_version.sh ${SCALA_VERSION%.*}
+
+BUILD_OPTS="-Dscala.version=${SCALA_VERSION} \
+            -Dscala.binary.version=${SCALA_VERSION%.*} \
+            -Dscala.macros.version=2.1.0 \
+            -Dspark.version=${SPARK_VERSION} \
+            -Dhadoop.version=${HADOOP_VERSION} \
+            -Dhbase.hbase.version=${HBASE_VERSION} \
+            -Dhbase.hadoop.version=${HADOOP_VERSION} \
+            -Dignite.version=${IGNITE_HADOOP_VERSION} \
+            -Dflink.version=${FLINK_VERSION} \
+            -Pspark-${SPARK_VERSION%.*} \
+            -Phadoop-${HADOOP_VERSION%.*} \
             -Pscala-${SCALA_VERSION%.*} \
+            -Ppyspark \
+            -Psparkr \
             -Pbuild-distr"
-            
+
 if [ "$ZEPPELIN_RUN_TESTS" = "true" ]; then
   BUILD_OPTS="$BUILD_OPTS -DskipTests=false"
 else
diff --git a/bigtop.bom b/bigtop.bom
index e24bc5f7..72b2b943 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -427,7 +427,7 @@ bigtop {
     'zeppelin' {
       name    = 'zeppelin'
       relNotes = 'Apache Zeppelin'
-      version { base = '0.7.0'; pkg = base; release = 1 }
+      version { base = '0.7.2'; pkg = base; release = 1 }
       tarball { source      = "$name-${version.base}.tgz"
                 destination = "$name-${version.base}.tar.gz" }
       url     { download_path = "/$name/$name-${version.base}/"