Updated Branches: refs/heads/master 3605222e0 -> db277329e
BIGTOP-824. Bump version of Hive to 0.10 (Sean Mackrory via rvs) Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/db277329 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/db277329 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/db277329 Branch: refs/heads/master Commit: db277329e33cbe3900bb4d024f542210aeec4aa6 Parents: 3605222 Author: Roman Shaposhnik <[email protected]> Authored: Fri Mar 15 12:35:32 2013 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Fri Mar 15 12:35:32 2013 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/hive/do-component-build | 3 ++- bigtop-packages/src/common/hive/hive-site.xml | 2 +- bigtop-packages/src/common/hive/install_hive.sh | 1 + bigtop.mk | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/db277329/bigtop-packages/src/common/hive/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hive/do-component-build b/bigtop-packages/src/common/hive/do-component-build index b1205f0..6ff84e0 100644 --- a/bigtop-packages/src/common/hive/do-component-build +++ b/bigtop-packages/src/common/hive/do-component-build @@ -38,4 +38,5 @@ hadoop.mapreduce.test.jar=\${hadoop.root}/share/hadoop/mapreduce/hadoop-mapreduc hadoop.mapreduce.tools.jar=\${hadoop.root}/share/hadoop/mapreduce/hadoop-mapreduce-tools-\${hadoop.version.ant-internal}.jar __EOT__ -ant -f src/build.xml `bom2props | sed -e 's#^#-D#'` -Dhadoop.security.version.prefix=0.23 package "$@" +ant -f src/build.xml `bom2props | sed -e 's#^#-D#'` -Dhadoop.security.version.prefix=0.23 \ + -Dversion=$HIVE_VERSION -Dinclude.postgres=true package "$@" http://git-wip-us.apache.org/repos/asf/bigtop/blob/db277329/bigtop-packages/src/common/hive/hive-site.xml ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hive/hive-site.xml b/bigtop-packages/src/common/hive/hive-site.xml index 5651eba..cce35f1 100644 --- a/bigtop-packages/src/common/hive/hive-site.xml +++ b/bigtop-packages/src/common/hive/hive-site.xml @@ -41,7 +41,7 @@ <property> <name>hive.hwi.war.file</name> - <value>/usr/lib/hive/lib/hive-hwi-0.7.0-cdh3u1-SNAPSHOT.war</value> + <value>/usr/lib/hive/lib/hive-hwi-@[email protected]</value> <description>This is the WAR file with the jsp content for Hive Web Interface</description> </property> http://git-wip-us.apache.org/repos/asf/bigtop/blob/db277329/bigtop-packages/src/common/hive/install_hive.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hive/install_hive.sh b/bigtop-packages/src/common/hive/install_hive.sh index 9606b08..67759b5 100755 --- a/bigtop-packages/src/common/hive/install_hive.sh +++ b/bigtop-packages/src/common/hive/install_hive.sh @@ -140,6 +140,7 @@ do mv ${PREFIX}${CONF_DIST_DIR}/${template}.template ${PREFIX}${CONF_DIST_DIR}/${template} done cp hive-site.xml ${PREFIX}${CONF_DIST_DIR} +sed -i -e "s|@VERSION@|${HIVE_VERSION}|" ${PREFIX}${CONF_DIST_DIR}/hive-site.xml ln -s ${CONF_DIR}/conf $PREFIX/$LIB_DIR/conf http://git-wip-us.apache.org/repos/asf/bigtop/blob/db277329/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 96f2257..fa6c36c 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -74,7 +74,7 @@ $(eval $(call PACKAGE,pig,PIG)) HIVE_NAME=hive HIVE_RELNOTES_NAME=Apache Hive HIVE_PKG_NAME=hive -HIVE_BASE_VERSION=0.9.0 +HIVE_BASE_VERSION=0.10.0 HIVE_PKG_VERSION=$(HIVE_BASE_VERSION) HIVE_RELEASE_VERSION=1 HIVE_TARBALL_DST=hive-$(HIVE_BASE_VERSION).tar.gz
