You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2017/07/01 13:37:23 UTC
[39/50] [abbrv] bigtop git commit: BIGTOP-2812: Upgrade Zeppelin
version to 0.7.2
BIGTOP-2812: Upgrade Zeppelin version to 0.7.2
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f8862af2
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f8862af2
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f8862af2
Branch: refs/heads/branch-1.2
Commit: f8862af26c0ee5a7517db413d8352fa31a8c0c5c
Parents: 1bb3513
Author: Youngwoo Kim <yw...@apache.org>
Authored: Sat Jun 17 16:06:21 2017 +0900
Committer: Evans Ye <ev...@apache.org>
Committed: Sat Jul 1 12:52:59 2017 +0000
----------------------------------------------------------------------
.../src/common/zeppelin/do-component-build | 37 +++++++++-----------
bigtop.bom | 2 +-
2 files changed, 17 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f8862af2/bigtop-packages/src/common/zeppelin/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zeppelin/do-component-build b/bigtop-packages/src/common/zeppelin/do-component-build
index 9906fb4..05d93f3 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
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f8862af2/bigtop.bom
----------------------------------------------------------------------
diff --git a/bigtop.bom b/bigtop.bom
index a428654..28e7d80 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}/"