Repository: bigtop Updated Branches: refs/heads/master 140949830 -> 70927c2bd
BIGTOP-2026 Phoenix build defines HBASE_VERSION in two different places Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/70927c2b Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/70927c2b Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/70927c2b Branch: refs/heads/master Commit: 70927c2bd470307f97f677b8cd8f5d36e62097b8 Parents: 1409498 Author: Andrew Purtell <[email protected]> Authored: Thu Sep 10 13:36:12 2015 -0700 Committer: Andrew Purtell <[email protected]> Committed: Thu Sep 10 16:26:54 2015 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/phoenix/do-component-build | 4 +--- bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec | 5 ++--- bigtop.bom | 11 ++++++++--- 3 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/70927c2b/bigtop-packages/src/common/phoenix/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/phoenix/do-component-build b/bigtop-packages/src/common/phoenix/do-component-build index 81d0fb4..9eaf3bd 100644 --- a/bigtop-packages/src/common/phoenix/do-component-build +++ b/bigtop-packages/src/common/phoenix/do-component-build @@ -18,8 +18,6 @@ set -ex . `dirname $0`/bigtop.bom -PHOENIX_HBASE_VERSION=HBase-0.98 - mvn -DskipTests \ -Dhadoop-two.version=$HADOOP_VERSION \ -Dhbase.version=$HBASE_VERSION-hadoop2 \ @@ -29,4 +27,4 @@ mvn -DskipTests \ clean install package "$@" rm -rf build mkdir build -tar -C build --strip-components=1 -xzf phoenix-assembly/target/phoenix-$PHOENIX_VERSION-${PHOENIX_HBASE_VERSION}.tar.gz +tar -C build --strip-components=1 -xzf phoenix-assembly/target/phoenix-$PHOENIX_VERSION.tar.gz http://git-wip-us.apache.org/repos/asf/bigtop/blob/70927c2b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec index dfbd7bb..84fd0bf 100644 --- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec +++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec @@ -26,7 +26,6 @@ %define hadoop_yarn_home /usr/lib/hadoop-yarn %define hadoop_hdfs_home /usr/lib/hadoop-hdfs %define hbase_home /usr/lib/hbase -%define phoenix_hbase_version HBase-0.98 %if %{?suse_version:1}0 @@ -83,7 +82,7 @@ URL: http://phoenix.apache.org Group: Development/Libraries Buildroot: %{_topdir}/INSTALL/%{name}-%{version} License: ASL 2.0 -Source0: %{name}-%{phoenix_base_version}-%{phoenix_hbase_version}-src.tar.gz +Source0: %{name}-%{phoenix_base_version}-src.tar.gz Source1: do-component-build Source2: install_phoenix.sh Source3: phoenix.default @@ -119,7 +118,7 @@ with Phoenix and HBase. Soon this will enable access from environments other than the JVM. %prep -%setup -n %{name}-%{phoenix_base_version}-%{phoenix_hbase_version}-src +%setup -n %{name}-%{phoenix_base_version}-src %build bash %{SOURCE1} http://git-wip-us.apache.org/repos/asf/bigtop/blob/70927c2b/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index ddc1894..04120a5 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -272,11 +272,16 @@ bigtop { 'phoenix' { name = 'phoenix' relNotes = 'Apache Phoenix: A SQL skin over HBase' - version { base = '4.4.0'; pkg = base; release = 1 } + /* + * phoenix.hbase is used to select the Phoenix release corresponding + * to the base HBase version. Update as needed whenever changing the + * HBase version in the BOM. + */ phoenix.hbase ='HBase-0.98' - tarball { destination = "$name-${version.base}-${phoenix.hbase}-src.tar.gz" + version { base = "4.4.0-${phoenix.hbase}"; pkg = '4.4.0'; release = 1 } + tarball { destination = "$name-${version.base}-src.tar.gz" source = destination } - url { download_path = "/$name/$name-${version.base}-${phoenix.hbase}/src" + url { download_path = "/$name/$name-${version.base}/src" site = "${apache.APACHE_MIRROR}/${download_path}" archive = "${apache.APACHE_ARCHIVE}/${download_path}" } }
