You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by yw...@apache.org on 2017/03/10 01:11:01 UTC
bigtop git commit: BIGTOP-2689: Upgrade Zeppelin to version 0.7
Repository: bigtop
Updated Branches:
refs/heads/master 286b31ca3 -> 8e9b02303
BIGTOP-2689: Upgrade Zeppelin to version 0.7
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8e9b0230
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8e9b0230
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8e9b0230
Branch: refs/heads/master
Commit: 8e9b0230347785df080d4e8ceabd1074d3ff88b2
Parents: 286b31c
Author: Youngwoo Kim <yw...@apache.org>
Authored: Tue Feb 7 12:10:28 2017 +0900
Committer: Youngwoo Kim <yw...@apache.org>
Committed: Fri Mar 10 10:10:10 2017 +0900
----------------------------------------------------------------------
bigtop-packages/src/common/zeppelin/do-component-build | 7 ++++++-
.../src/common/zeppelin/install_zeppelin.sh | 13 ++++---------
bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec | 3 ---
bigtop.bom | 2 +-
4 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8e9b0230/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 755627e..2939b2a 100644
--- a/bigtop-packages/src/common/zeppelin/do-component-build
+++ b/bigtop-packages/src/common/zeppelin/do-component-build
@@ -40,8 +40,10 @@ 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.version"
+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>#" {} \;
@@ -60,3 +62,6 @@ fi
export MAVEN_OPTS="-Xmx1500m -Xms1500m -XX:MaxPermSize=256m"
mvn $BUILD_OPTS clean package
+
+mkdir -p build/dist
+tar -C build/dist --strip-components=1 -xzf zeppelin-distribution/target/zeppelin-*.tar.gz
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8e9b0230/bigtop-packages/src/common/zeppelin/install_zeppelin.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zeppelin/install_zeppelin.sh b/bigtop-packages/src/common/zeppelin/install_zeppelin.sh
index 0e305c6..b7e31df 100644
--- a/bigtop-packages/src/common/zeppelin/install_zeppelin.sh
+++ b/bigtop-packages/src/common/zeppelin/install_zeppelin.sh
@@ -115,19 +115,14 @@ install -d -m 0755 $PREFIX/var/log/zeppelin/
install -d -m 0755 $PREFIX/var/run/zeppelin/
install -d -m 0755 $PREFIX/var/run/zeppelin/webapps
-tar --wildcards --strip-components=1 -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/zeppelin-distribution/target/zeppelin-*.tar.gz \*/bin/\*
-tar --wildcards --strip-components=1 -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/zeppelin-distribution/target/zeppelin-*.tar.gz \*/interpreter/\*
-tar --wildcards --strip-components=1 -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/zeppelin-distribution/target/zeppelin-*.tar.gz \*/lib/\*
-tar --wildcards --strip-components=1 -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/zeppelin-distribution/target/zeppelin-*.tar.gz \*zeppelin-server\*.jar
-tar --wildcards --strip-components=1 -C $PREFIX/$LIB_DIR -zxf ${BUILD_DIR}/zeppelin-distribution/target/zeppelin-*.tar.gz \*zeppelin-web\*.war
-tar --wildcards --strip-components=1 -C $PREFIX/var/lib/zeppelin -zxf ${BUILD_DIR}/zeppelin-distribution/target/zeppelin-*.tar.gz \*/notebook/\*
+cp -a ${BUILD_DIR}/build/dist/{bin,interpreter,lib,zeppelin-web-${ZEPPELIN_VERSION}.war} $PREFIX/$LIB_DIR/
+cp -a ${BUILD_DIR}/build/dist/{LICENSE,NOTICE,README.md,licenses} $PREFIX/$DOC_DIR
+cp -a ${BUILD_DIR}/build/dist/conf/* $PREFIX/$CONF_DIR
+cp -a ${BUILD_DIR}/build/dist/notebook $PREFIX/var/lib/zeppelin/
rm -f $PREFIX/$LIB_DIR/bin/*.cmd
chmod 755 $PREFIX/$LIB_DIR/bin/*
-cp -a ${BUILD_DIR}/{LICENSE,README.md} $PREFIX/$LIB_DIR
-
-cp -a ${BUILD_DIR}/conf/* $PREFIX/$CONF_DIR
rm -f $PREFIX/$CONF_DIR/*.cmd.*
cp -a ${SOURCE_DIR}/zeppelin-env.sh $PREFIX/$CONF_DIR
ln -s /etc/zeppelin/conf $PREFIX/$LIB_DIR/conf
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8e9b0230/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec b/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec
index 73b7b3f..cf59e98 100644
--- a/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec
+++ b/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec
@@ -120,9 +120,6 @@ chkconfig --del %{name}
%defattr(-,root,root,755)
%config(noreplace) %{config_zeppelin}.dist
%doc %{doc_zeppelin}
-%{lib_zeppelin}/LICENSE
-%{lib_zeppelin}/README.md
-%{lib_zeppelin}/*.jar
%{lib_zeppelin}/*.war
%{lib_zeppelin}/bin
%{lib_zeppelin}/conf
http://git-wip-us.apache.org/repos/asf/bigtop/blob/8e9b0230/bigtop.bom
----------------------------------------------------------------------
diff --git a/bigtop.bom b/bigtop.bom
index e99ca88..1874d19 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -423,7 +423,7 @@ bigtop {
'zeppelin' {
name = 'zeppelin'
relNotes = 'Apache Zeppelin'
- version { base = '0.6.2'; pkg = base; release = 1 }
+ version { base = '0.7.0'; pkg = base; release = 1 }
tarball { source = "$name-${version.base}.tgz"
destination = "$name-${version.base}.tar.gz" }
url { download_path = "/$name/$name-${version.base}/"