Repository: bigtop Updated Branches: refs/heads/master cdf31c209 -> 6b0adb5e2
BIGTOP-2514. Upgrade to Zeppelin 0.6.2 This also includes the following changes: * Change do-component-build to replace Maven dependency version properties directly in the pom.xml files like we do for several other applications. * Remove all references to Zeppelin being an Apache Incubating project now that Apache Zeppelin has graduated to a top-level project. Signed-off-by: Amir Sanjar <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6b0adb5e Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6b0adb5e Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6b0adb5e Branch: refs/heads/master Commit: 6b0adb5e260ad5bee25f209ad05b5ec0f28004cd Parents: cdf31c2 Author: Jonathan Kelly <[email protected]> Authored: Mon Jun 27 11:17:48 2016 -0700 Committer: Amir Sanjar <[email protected]> Committed: Sun Nov 20 08:38:11 2016 -0600 ---------------------------------------------------------------------- .../src/common/zeppelin/do-component-build | 20 ++++++++++++++++---- bigtop-packages/src/deb/zeppelin/control | 2 +- bigtop-packages/src/deb/zeppelin/copyright | 4 ++-- .../src/rpm/zeppelin/SPECS/zeppelin.spec | 4 ++-- bigtop.bom | 8 ++++---- 5 files changed, 25 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/6b0adb5e/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 f013e01..f1ab095 100644 --- a/bigtop-packages/src/common/zeppelin/do-component-build +++ b/bigtop-packages/src/common/zeppelin/do-component-build @@ -30,13 +30,25 @@ if [ $HOSTTYPE = "powerpc64le" ] ; then sed -i "s|<version>0.0.23</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.version" +find . -name pom.xml -exec sed -i "s#<$t>.*</$t>#<$t>${HBASE_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 \ - -Dignite.version=$IGNITE_HADOOP_VERSION \ - -Pspark-1.5 -Dspark.version=$SPARK_VERSION \ - -Phadoop-2.6 -Dhadoop.version=$HADOOP_VERSION \ - -Pyarn \ + -Pscala-${SCALA_VERSION%.*} \ -Pbuild-distr" if [ "$ZEPPELIN_RUN_TESTS" = "true" ]; then http://git-wip-us.apache.org/repos/asf/bigtop/blob/6b0adb5e/bigtop-packages/src/deb/zeppelin/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zeppelin/control b/bigtop-packages/src/deb/zeppelin/control index 4ddf6e4..70d44ce 100644 --- a/bigtop-packages/src/deb/zeppelin/control +++ b/bigtop-packages/src/deb/zeppelin/control @@ -19,7 +19,7 @@ Priority: extra Maintainer: Bigtop <[email protected]> Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.9.4 -Homepage: http://zeppelin.incubator.apache.org/ +Homepage: http://zeppelin.apache.org/ Package: zeppelin Architecture: all http://git-wip-us.apache.org/repos/asf/bigtop/blob/6b0adb5e/bigtop-packages/src/deb/zeppelin/copyright ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/zeppelin/copyright b/bigtop-packages/src/deb/zeppelin/copyright index 554e6c9..b860e71 100644 --- a/bigtop-packages/src/deb/zeppelin/copyright +++ b/bigtop-packages/src/deb/zeppelin/copyright @@ -1,6 +1,6 @@ Format: http://dep.debian.net/deps/dep5 -Source: http://zeppelin.incubator.apache.org/ -Upstream-Name: Apache Zeppelin (Incubating) +Source: http://zeppelin.apache.org/ +Upstream-Name: Apache Zeppelin Files: * Copyright: 2013-2015, The Apache Software Foundation http://git-wip-us.apache.org/repos/asf/bigtop/blob/6b0adb5e/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 da10e5c..73b7b3f 100644 --- a/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec +++ b/bigtop-packages/src/rpm/zeppelin/SPECS/zeppelin.spec @@ -38,7 +38,7 @@ Name: zeppelin Version: %{zeppelin_version} Release: %{zeppelin_release} Summary: Web-based notebook for Apache Spark -URL: http://zeppelin.incubator.apache.org/ +URL: http://zeppelin.apache.org/ Group: Applications/Engineering BuildArch: noarch Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -73,7 +73,7 @@ Zeppelin is a web-based notebook that enables interactive data analytics with Ap You can make beautiful data-driven, interactive and collaborative documents with SQL, Scala and more. %prep -%setup -n %{name}-%{zeppelin_base_version}-incubating +%setup -n %{name}-%{zeppelin_base_version} %build bash $RPM_SOURCE_DIR/do-component-build http://git-wip-us.apache.org/repos/asf/bigtop/blob/6b0adb5e/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 3a5b1c5..ecef020 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -421,11 +421,11 @@ bigtop { } 'zeppelin' { name = 'zeppelin' - relNotes = 'Apache Zeppelin (incubating)' - version { base = '0.5.6'; pkg = base; release = 1 } - tarball { source = "$name-${version.base}-incubating.tgz" + relNotes = 'Apache Zeppelin' + version { base = '0.6.2'; pkg = base; release = 1 } + tarball { source = "$name-${version.base}.tgz" destination = "$name-${version.base}.tar.gz" } - url { download_path = "/incubator/$name/${version.base}-incubating/" + url { download_path = "/$name/$name-${version.base}/" site = "${apache.APACHE_MIRROR}/${download_path}" archive = "${apache.APACHE_ARCHIVE}/${download_path}" } }
