svn commit: r1347704 - in /incubator/bigtop/trunk: bigtop-packages/src/common/hive/do-component-build bigtop.mk

[rv...@apache.org]

Author: rvs
Date: Thu Jun  7 16:29:32 2012
New Revision: 1347704

URL: http://svn.apache.org/viewvc?rev=1347704&view=rev
Log:
BIGTOP-604. Bump version of Hive to 0.9.0

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop.mk

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build?rev=1347704&r1=1347703&r2=1347704&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build Thu Jun  7 16:29:32 2012
@@ -15,4 +15,27 @@
 # limitations under the License.
 
 set -ex
-ant -f src/build.xml -Dhadoop.version=0.23.0 -Dhadoop.security.version=0.23.0 -Dhadoop.security.version.prefix=0.23 package "$@"
+
+. `dirname ${0}`/bigtop.bom
+
+bom2props() {
+cat <<__EOT__ 
+hbase.version=$HBASE_VERSION
+zookeeper.version=$ZOOKEEPER_VERSION
+hadoop.version=$HADOOP_VERSION
+hadoop.security.version=$HADOOP_VERSION
+hadoop-0.23.version=$HADOOP_VERSION
+__EOT__
+}
+
+bom2props >> src/ivy/libraries.properties
+bom2props >> src/build.properties 
+
+# The following is a workaround for Hadoop 0.23 layout
+cat >> src/build.properties << __EOT__
+hadoop.mapreduce.jar=\${hadoop.root}/share/hadoop/mapreduce/hadoop-mapreduce-client-core-\${hadoop.version.ant-internal}.jar
+hadoop.mapreduce.test.jar=\${hadoop.root}/share/hadoop/mapreduce/hadoop-mapreduce-test-\${hadoop.version.ant-internal}.jar
+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 "$@"

Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1347704&r1=1347703&r2=1347704&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Thu Jun  7 16:29:32 2012
@@ -76,7 +76,7 @@ $(eval $(call PACKAGE,pig,PIG))
 HIVE_NAME=hive
 HIVE_RELNOTES_NAME=Apache Hive
 HIVE_PKG_NAME=hive
-HIVE_BASE_VERSION=0.8.1
+HIVE_BASE_VERSION=0.9.0
 HIVE_PKG_VERSION=$(HIVE_BASE_VERSION)
 HIVE_RELEASE_VERSION=1
 HIVE_TARBALL_DST=hive-$(HIVE_BASE_VERSION).tar.gz