diff options
author | Kengo Seki <sekikn@apache.org> | 2016-10-25 15:08:36 +0000 |
---|---|---|
committer | Youngwoo Kim <ywkim@apache.org> | 2016-11-01 11:54:08 +0900 |
commit | 702b02951f962a3c233fe3d28fa14c7ec478ad11 (patch) | |
tree | b8f08a8e1164175005a43956f992ee02ce9a9877 | |
parent | 00611578db040e5c77a1412a2af28f898f30a894 (diff) |
BIGTOP-2497: Upgrade Apache Phoenix to 4.8.1
Signed-off-by: Youngwoo Kim <ywkim@apache.org>
-rw-r--r-- | bigtop-packages/src/common/phoenix/do-component-build | 3 | ||||
-rw-r--r-- | bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec | 2 | ||||
-rw-r--r-- | bigtop.bom | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/bigtop-packages/src/common/phoenix/do-component-build b/bigtop-packages/src/common/phoenix/do-component-build index 84716399..eeee0cac 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/; diff --git a/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec b/bigtop-packages/src/rpm/phoenix/SPECS/phoenix.spec index 04a0d80c..3f33574c 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} @@ -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}" } } |