Repository: bigtop Updated Branches: refs/heads/master 00611578d -> 702b02951
BIGTOP-2497: Upgrade Apache Phoenix to 4.8.1 Signed-off-by: Youngwoo Kim <yw...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/702b0295 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/702b0295 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/702b0295 Branch: refs/heads/master Commit: 702b02951f962a3c233fe3d28fa14c7ec478ad11 Parents: 0061157 Author: Kengo Seki <sek...@apache.org> Authored: Tue Oct 25 15:08:36 2016 +0000 Committer: Youngwoo Kim <yw...@apache.org> Committed: Tue Nov 1 11:54:08 2016 +0900 ---------------------------------------------------------------------- bigtop-packages/src/common/phoenix/do-component-build | 3 +-- bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec | 2 +- bigtop.bom | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/702b0295/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 8471639..eeee0ca 100644 --- a/bigtop-packages/src/common/phoenix/do-component-build +++ b/bigtop-packages/src/common/phoenix/do-component-build @@ -32,8 +32,7 @@ mkdir build # Make binary tar rm -rf $(find . -type d -name archive-tmp); -phoenix_jars=$(find -iname phoenix-*.jar) -cp $phoenix_jars build/; +find -iname phoenix-*.jar -exec cp -n {} build/ \; cp -R bin build/; http://git-wip-us.apache.org/repos/asf/bigtop/blob/702b0295/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 04a0d80..3f33574 100644 --- a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec +++ b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec @@ -116,7 +116,7 @@ with Phoenix and HBase. Soon this will enable access from environments other than the JVM. %prep -%setup -n %{name}-%{phoenix_base_version}-src +%setup -n apache-%{name}-%{phoenix_base_version}-src %build bash %{SOURCE1} http://git-wip-us.apache.org/repos/asf/bigtop/blob/702b0295/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 272ba5e..ff0d7fd 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -317,10 +317,10 @@ bigtop { * HBase version in the BOM. */ phoenix.hbase ='HBase-1.1' - version { base = "4.7.0-${phoenix.hbase}"; pkg = '4.7.0'; release = 1 } + version { base = "4.8.1-${phoenix.hbase}"; pkg = '4.8.1'; release = 1 } tarball { destination = "$name-${version.base}-src.tar.gz" - source = destination } - url { download_path = "/$name/$name-${version.base}/src" + source = "apache-$name-${version.base}-src.tar.gz" } + url { download_path = "/$name/apache-$name-${version.base}/src" site = "${apache.APACHE_MIRROR}/${download_path}" archive = "${apache.APACHE_ARCHIVE}/${download_path}" } }
