bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [2/3] git commit: BIGTOP-1293. Include Hive 0.13 into the stack
Date Fri, 09 May 2014 19:18:42 GMT
BIGTOP-1293. Include Hive 0.13 into the stack


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ee16d820
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ee16d820
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ee16d820

Branch: refs/heads/master
Commit: ee16d820cf1f35740f5a4fbcc3be31448e137fb6
Parents: 9ff5abc
Author: Giridharan Kesavan <gkesavan@apache.org>
Authored: Thu May 8 21:14:40 2014 -0700
Committer: Konstantin Boudnik <cos@apache.org>
Committed: Fri May 9 12:05:46 2014 -0700

----------------------------------------------------------------------
 .../src/common/hive/do-component-build          |  36 +++---
 bigtop-packages/src/common/hive/install_hive.sh |  20 ++-
 bigtop-packages/src/deb/hive/control            |   1 +
 bigtop-packages/src/deb/hive/copyright          |   4 +-
 bigtop-packages/src/deb/hive/hive-jdbc.install  |   1 -
 bigtop-packages/src/deb/hive/hive.install       | 128 +++++++++++--------
 bigtop-packages/src/deb/hive/rules              |   4 +-
 bigtop-packages/src/rpm/hive/SPECS/hive.spec    |  32 ++---
 bigtop.mk                                       |   6 +-
 9 files changed, 125 insertions(+), 107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/ee16d820/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 0d6cc48..7bc89d5 100644
--- a/bigtop-packages/src/common/hive/do-component-build
+++ b/bigtop-packages/src/common/hive/do-component-build
@@ -28,23 +28,19 @@ 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__
-
-sed -i.orig -e 's#<module organisation="org.apache.hadoop" name="hadoop-\*".*#<module
organisation="org.apache.hadoop" name=".*" resolver="internal"/>#' src/ivy/ivysettings.xml
-
-ant -f src/build.xml `bom2props | sed -e 's#^#-D#'` -Dhadoop.security.version.prefix=0.23
\
-    -Dversion=$HIVE_VERSION -Dinclude.postgres=true package "$@"
-
-# Install Hive artifacts needed by other components into the local Maven cache
-mvn install:install-file -DgroupId=org.apache.hive -DartifactId=hive-builtins -Dversion=$HIVE_VERSION
-Dpackaging=jar -Dfile=src/build/builtins/hive-builtins-$HIVE_VERSION.jar
-mvn install:install-file -DgroupId=org.apache.hive -DartifactId=hive-cli -Dversion=$HIVE_VERSION
-Dpackaging=jar -Dfile=src/build/cli/hive-cli-$HIVE_VERSION.jar
-mvn install:install-file -DgroupId=org.apache.hive -DartifactId=hive-contrib -Dversion=$HIVE_VERSION
-Dpackaging=jar -Dfile=src/build/contrib/hive-contrib-$HIVE_VERSION.jar
-mvn install:install-file -DgroupId=org.apache.hive -DartifactId=hive-exec -Dversion=$HIVE_VERSION
-Dpackaging=jar -Dfile=src/build/ql/hive-exec-$HIVE_VERSION.jar
+HIVE_MAVEN_OPTS=" -Dhbase.version=$HBASE_VERSION \
+-Dzookeeper.version=$ZOOKEEPER_VERSION \
+-Dhadoop.mr.rev=23 \
+-Dhadoop.security.version=$HADOOP_VERSION \
+-Dhadoop-23.version=$HADOOP_VERSION \
+-Dhbase.hadoop2.version=$HBASE_VERSION \
+-Dmvn.hadoop.profile=hadoop23 \
+-Dmaven.test.skip=true \
+-Dhbase.version.with.hadoop.version=$HBASE_VERSION \
+"
+
+export MAVEN_OPTS="-Xmx1500m -Xms1500m -XX:MaxPermSize=256m"
+mvn ${HIVE_MAVEN_OPTS} clean install -Phadoop-2,dist "$@"
+
+mkdir -p build/dist
+tar -C build/dist --strip-components=1 -xzf packaging/target/apache-hive-${HIVE_VERSION}-bin.tar.gz

http://git-wip-us.apache.org/repos/asf/bigtop/blob/ee16d820/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 a842783..266cc4e 100755
--- a/bigtop-packages/src/common/hive/install_hive.sh
+++ b/bigtop-packages/src/common/hive/install_hive.sh
@@ -113,6 +113,7 @@ BIN_DIR=${BIN_DIR:-$PREFIX/usr/bin}
 PYTHON_DIR=${PYTHON_DIR:-$HIVE_DIR/lib/py}
 HCATALOG_DIR=${HCATALOG_DIR:-$PREFIX/usr/lib/hive-hcatalog}
 HCATALOG_SHARE_DIR=${HCATALOG_DIR}/share/hcatalog
+HBASE_STORAGE_HANDLER_DIR=${HCATALOG_SHARE_DIR}/storage-handlers/hbase/lib
 INSTALLED_HCATALOG_DIR=${INSTALLED_HCATALOG_DIR:-/usr/lib/hive-hcatalog}
 CONF_DIR=/etc/hive
 CONF_DIST_DIR=/etc/hive/conf.dist
@@ -120,7 +121,7 @@ CONF_DIST_DIR=/etc/hive/conf.dist
 # First we'll move everything into lib
 install -d -m 0755 ${HIVE_DIR}
 (cd ${BUILD_DIR} && tar -cf - .)|(cd ${HIVE_DIR} && tar -xf -)
-
+rm -f ${HIVE_DIR}/lib/hive-shims-0.2*.jar
 for jar in `ls ${HIVE_DIR}/lib/hive-*.jar`; do
     base=`basename $jar`
     (cd ${HIVE_DIR}/lib && ln -s $base ${base/-[0-9].*/.jar})
@@ -139,7 +140,9 @@ do
 #!/bin/bash
 
 # Autodetect JAVA_HOME if not defined
-. /usr/lib/bigtop-utils/bigtop-detect-javahome
+if [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  . /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
 
 BIGTOP_DEFAULTS_DIR=\${BIGTOP_DEFAULTS_DIR-/etc/default}
 [ -n "\${BIGTOP_DEFAULTS_DIR}" -a -r \${BIGTOP_DEFAULTS_DIR}/hbase ] && . \${BIGTOP_DEFAULTS_DIR}/hbase
@@ -215,7 +218,9 @@ BIGTOP_DEFAULTS_DIR=${BIGTOP_DEFAULTS_DIR-/etc/default}
 [ -n "${BIGTOP_DEFAULTS_DIR}" -a -r ${BIGTOP_DEFAULTS_DIR}/hadoop ] && . ${BIGTOP_DEFAULTS_DIR}/hadoop
 
 # Autodetect JAVA_HOME if not defined
-. /usr/lib/bigtop-utils/bigtop-detect-javahome
+if [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  . /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
 
 # FIXME: HCATALOG-636 (and also HIVE-2757)
 export HIVE_HOME=/usr/lib/hive
@@ -241,3 +246,12 @@ install -d -m 0755 $PREFIX/var/log/hive
 
 install -d -m 0755 $PREFIX/var/lib/hive-hcatalog
 install -d -m 0755 $PREFIX/var/log/hive-hcatalog
+for DIR in ${HBASE_STORAGE_HANDLER_DIR} ${HCATALOG_SHARE_DIR} ; do
+    (cd $DIR &&
+     for j in hive-hcatalog-*.jar; do
+       if [[ $j =~ hive-hcatalog-(.*)-${HIVE_VERSION}.jar ]]; then
+         name=${BASH_REMATCH[1]}
+         ln -s $j hive-hcatalog-$name.jar
+       fi
+    done)
+done

http://git-wip-us.apache.org/repos/asf/bigtop/blob/ee16d820/bigtop-packages/src/deb/hive/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hive/control b/bigtop-packages/src/deb/hive/control
index 0e48eb3..35e6db7 100644
--- a/bigtop-packages/src/deb/hive/control
+++ b/bigtop-packages/src/deb/hive/control
@@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 7.0.50~)
 Standards-Version: 3.8.0
 Homepage: http://hive.apache.org/
 
+
 Package: hive
 Architecture: all
 Depends: adduser, hadoop-client, bigtop-utils (>= 0.7), zookeeper, hive-jdbc (= ${source:Version})

http://git-wip-us.apache.org/repos/asf/bigtop/blob/ee16d820/bigtop-packages/src/deb/hive/copyright
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hive/copyright b/bigtop-packages/src/deb/hive/copyright
index 6225a97..8c8d0a8 100644
--- a/bigtop-packages/src/deb/hive/copyright
+++ b/bigtop-packages/src/deb/hive/copyright
@@ -3,11 +3,11 @@ Source: http://hive.apache.org/
 Upstream-Name: Apache Hive
 
 Files: *
-Copyright: 2008-2011, The Apache Software Foundation
+Copyright: 2008-2014, The Apache Software Foundation
 License: Apache-2.0
 
 Files debian/*
-Copyright: 2011, The Apache Software Foundation
+Copyright: 2014, The Apache Software Foundation
 License: Apache-2.0
 
 License: Apache-2.0

http://git-wip-us.apache.org/repos/asf/bigtop/blob/ee16d820/bigtop-packages/src/deb/hive/hive-jdbc.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hive/hive-jdbc.install b/bigtop-packages/src/deb/hive/hive-jdbc.install
index f2c7204..ccd2a26 100644
--- a/bigtop-packages/src/deb/hive/hive-jdbc.install
+++ b/bigtop-packages/src/deb/hive/hive-jdbc.install
@@ -7,4 +7,3 @@
 /usr/lib/hive/lib/libfb303-*.jar
 /usr/lib/hive/lib/libthrift-*.jar
 /usr/lib/hive/lib/log4j-*.jar
-/usr/lib/hive/lib/slf4j-*.jar

http://git-wip-us.apache.org/repos/asf/bigtop/blob/ee16d820/bigtop-packages/src/deb/hive/hive.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hive/hive.install b/bigtop-packages/src/deb/hive/hive.install
index edc2a0d..58a13cc 100644
--- a/bigtop-packages/src/deb/hive/hive.install
+++ b/bigtop-packages/src/deb/hive/hive.install
@@ -1,55 +1,73 @@
-/etc/hive
-/usr/bin/hive
-/usr/bin/beeline
-/usr/bin/hiveserver2
-/usr/lib/hive/bin
-/usr/lib/hive/conf
-/usr/lib/hive/scripts
-/usr/share/man/man1/hive.1.gz
-/usr/share/doc/hive
-/usr/lib/hive/lib/antlr-runtime-*.jar
-/usr/lib/hive/lib/avro-*.jar
-/usr/lib/hive/lib/avro-mapred-*.jar
-/usr/lib/hive/lib/commons-cli-*.jar
-/usr/lib/hive/lib/commons-codec-*.jar
-/usr/lib/hive/lib/commons-collections-*.jar
-/usr/lib/hive/lib/commons-compress-*.jar
-/usr/lib/hive/lib/commons-configuration-*.jar
-/usr/lib/hive/lib/commons-dbcp-*.jar
-/usr/lib/hive/lib/commons-io-*.jar
-/usr/lib/hive/lib/commons-lang-*.jar
-/usr/lib/hive/lib/commons-pool-*.jar
-/usr/lib/hive/lib/datanucleus-connectionpool-*.jar
-/usr/lib/hive/lib/datanucleus-core-*.jar
-/usr/lib/hive/lib/datanucleus-enhancer-*.jar
-/usr/lib/hive/lib/datanucleus-rdbms-*.jar
-/usr/lib/hive/lib/derby-*.jar
-/usr/lib/hive/lib/guava-*.jar
-/usr/lib/hive/lib/hive-beeline*.jar
-/usr/lib/hive/lib/hive-cli*.jar
-/usr/lib/hive/lib/hive-common*.jar
-/usr/lib/hive/lib/hive-contrib*.jar
-/usr/lib/hive/lib/hive-hbase-handler*.jar
-/usr/lib/hive/lib/hive-hwi*.jar
-/usr/lib/hive/lib/hive-shims*.jar
-/usr/lib/hive/lib/jackson-core-asl-*.jar
-/usr/lib/hive/lib/jackson-jaxrs-*.jar
-/usr/lib/hive/lib/jackson-mapper-asl-*.jar
-/usr/lib/hive/lib/jackson-xc-*.jar
-/usr/lib/hive/lib/JavaEWAH-*.jar
-/usr/lib/hive/lib/javolution-*.jar
-/usr/lib/hive/lib/jdo2-api-*.jar
-/usr/lib/hive/lib/jetty-*.jar
-/usr/lib/hive/lib/jetty-util-*.jar
-/usr/lib/hive/lib/jline-*.jar
-/usr/lib/hive/lib/json-*.jar
-/usr/lib/hive/lib/maven-ant-tasks-*.jar
-/usr/lib/hive/lib/metrics-core-*.jar
-/usr/lib/hive/lib/php
-/usr/lib/hive/lib/protobuf-java-*.jar
-/usr/lib/hive/lib/py
-/usr/lib/hive/lib/servlet-api-*.jar
-/usr/lib/hive/lib/snappy-*.jar
-/usr/lib/hive/lib/ST4-*.jar
-/usr/lib/hive/lib/tempus-fugit-*.jar
-/usr/lib/hive/lib/xz-*.jar
+etc/hive
+usr/bin/hive
+usr/bin/beeline
+usr/bin/hiveserver2
+usr/lib/hive/bin
+usr/lib/hive/conf
+usr/lib/hive/scripts
+usr/share/man/man1/hive.1.gz
+usr/share/doc/hive
+usr/lib/hive/lib/activation-*.jar
+usr/lib/hive/lib/ant-*.jar
+usr/lib/hive/lib/ant-launcher-*.jar
+usr/lib/hive/lib/antlr-*.jar
+usr/lib/hive/lib/antlr-runtime-*.jar
+usr/lib/hive/lib/asm-*.jar
+usr/lib/hive/lib/asm-commons-*.jar
+usr/lib/hive/lib/asm-tree-*.jar
+usr/lib/hive/lib/avro-*.jar
+usr/lib/hive/lib/bonecp-0.8.0.RELEASE.jar
+usr/lib/hive/lib/commons-cli-*.jar
+usr/lib/hive/lib/commons-codec-*.jar
+usr/lib/hive/lib/commons-collections-*.jar
+usr/lib/hive/lib/commons-compress-*.jar
+usr/lib/hive/lib/commons-httpclient-*.jar
+usr/lib/hive/lib/commons-io-*.jar
+usr/lib/hive/lib/commons-lang-*.jar
+usr/lib/hive/lib/commons-lang3-*.jar
+usr/lib/hive/lib/datanucleus-api-jdo-*.jar
+usr/lib/hive/lib/datanucleus-core-*.jar
+usr/lib/hive/lib/datanucleus-rdbms-*.jar
+usr/lib/hive/lib/derby-*.jar
+usr/lib/hive/lib/geronimo-annotation_1.0_spec-*.jar
+usr/lib/hive/lib/geronimo-jaspic_1.0_spec-*.jar
+usr/lib/hive/lib/geronimo-jta_1.1_spec-*.jar
+usr/lib/hive/lib/groovy-all-*.jar
+usr/lib/hive/lib/guava-*.jar
+usr/lib/hive/lib/hamcrest-core-*.jar
+usr/lib/hive/lib/hive-ant*.jar
+usr/lib/hive/lib/hive-beeline*.jar
+usr/lib/hive/lib/hive-cli*.jar
+usr/lib/hive/lib/hive-common*.jar
+usr/lib/hive/lib/hive-contrib*.jar
+usr/lib/hive/lib/hive-hbase-handler*.jar
+usr/lib/hive/lib/hive-hwi*.jar
+usr/lib/hive/lib/hive-shims*.jar
+usr/lib/hive/lib/hive-testutils*.jar
+usr/lib/hive/lib/httpclient-*.jar
+usr/lib/hive/lib/httpcore-*.jar
+usr/lib/hive/lib/jdo-api-*.jar
+usr/lib/hive/lib/jetty-*.jar
+usr/lib/hive/lib/jetty-all-*.jar
+usr/lib/hive/lib/jetty-util-*.jar
+usr/lib/hive/lib/jline-*.jar
+usr/lib/hive/lib/jpam-*.jar
+usr/lib/hive/lib/jsr305-*.jar
+usr/lib/hive/lib/jta-*.jar
+usr/lib/hive/lib/junit-*.jar
+usr/lib/hive/lib/mail-*.jar
+usr/lib/hive/lib/netty-*.jar
+usr/lib/hive/lib/oro-*.jar
+usr/lib/hive/lib/paranamer-*.jar
+usr/lib/hive/lib/php
+usr/lib/hive/lib/py
+usr/lib/hive/lib/servlet-api-*.jar
+usr/lib/hive/lib/servlet-api-*.jar
+usr/lib/hive/lib/snappy-java-*.jar
+usr/lib/hive/lib/ST4-*.jar
+usr/lib/hive/lib/stax-api-*.jar
+usr/lib/hive/lib/stringtemplate-*.jar
+usr/lib/hive/lib/tempus-fugit-*.jar
+usr/lib/hive/lib/velocity-*.jar
+usr/lib/hive/lib/xz-*.jar
+usr/lib/hive/lib/zookeeper*.jar

http://git-wip-us.apache.org/repos/asf/bigtop/blob/ee16d820/bigtop-packages/src/deb/hive/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hive/rules b/bigtop-packages/src/deb/hive/rules
index 34e46c3..d4d5a58 100755
--- a/bigtop-packages/src/deb/hive/rules
+++ b/bigtop-packages/src/deb/hive/rules
@@ -30,7 +30,7 @@ hive_pkg_name=hive
 
 override_dh_auto_build:
 	mkdir -p /tmp/debian-hive/.ivy
-	bash debian/do-component-build  -Divy.home=${HOME}/.ivy2
+	bash debian/do-component-build
 	touch $@
 
 server server2 metastore hcatalog-server webhcat-server:
@@ -42,7 +42,7 @@ override_dh_auto_install: metastore server server2 hcatalog-server webhcat-serve
 	cp debian/hive-hcatalog.1 .
 	bash debian/install_hive.sh \
 	  --prefix=debian/tmp \
-	  --build-dir=src/build/dist \
+	  --build-dir=build/dist \
 	  --doc-dir=debian/tmp/usr/share/doc/${hive_pkg_name}
 	# We need to get rid of jars that happen to be shipped in other CDH packages
 	rm -f debian/tmp/usr/lib/hive/lib/hbase-*.jar debian/tmp/usr/lib/hive/lib/zookeeper-*.jar

http://git-wip-us.apache.org/repos/asf/bigtop/blob/ee16d820/bigtop-packages/src/rpm/hive/SPECS/hive.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hive/SPECS/hive.spec b/bigtop-packages/src/rpm/hive/SPECS/hive.spec
index dac5264..6b81d72 100644
--- a/bigtop-packages/src/rpm/hive/SPECS/hive.spec
+++ b/bigtop-packages/src/rpm/hive/SPECS/hive.spec
@@ -27,7 +27,7 @@
 %define man_dir %{_mandir}
 %define hive_services hive-server hive-metastore hive-server2 hive-hcatalog-server hive-webhcat-server
 # After we run "ant package" we'll find the distribution here
-%define hive_dist src/build/dist
+%define hive_dist build/dist
 
 %if  %{!?suse_version:1}0
 
@@ -65,7 +65,7 @@ URL: http://hive.apache.org/
 Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 BuildArch: noarch
-Source0: %{name}-%{hive_base_version}.tar.gz
+Source0: apache-%{name}-%{hive_base_version}-src.tar.gz
 Source1: do-component-build
 Source2: install_hive.sh
 Source3: init.d.tmpl
@@ -143,15 +143,6 @@ Requires: redhat-lsb
 This optional package hosts a metadata server for Hive clients across a network to use.
 
 
-%package hbase
-Summary: Provides integration between Apache HBase and Apache Hive
-Group: Development/Libraries
-Requires: hive = %{version}-%{release}, hbase
-
-
-%description hbase
-This optional package provides integration between Apache HBase and Apache Hive
-
 %package jdbc
 Summary: Provides libraries necessary to connect to Apache Hive via JDBC
 Group: Development/Libraries
@@ -163,7 +154,7 @@ This package provides libraries necessary to connect to Apache Hive via
JDBC
 %package hcatalog
 Summary: Apache Hcatalog is a data warehouse infrastructure built on top of Hadoop
 Group: Development/Libraries
-Requires: hadoop, hive, bigtop-utils >= 0.6
+Requires: hadoop, hive, bigtop-utils >= 0.7
 
 %description hcatalog
 Apache HCatalog is a table and storage management service for data created using Apache Hadoop.
@@ -226,6 +217,12 @@ Requires: initscripts
 # CentOS 5 does not have any dist macro
 # So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora
 %if %{!?suse_version:1}0 && %{!?mgaversion:1}0
+%define __os_install_post \
+    /usr/lib/rpm/redhat/brp-compress ; \
+    /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} ; \
+    /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} ; \
+    /usr/lib/rpm/brp-python-bytecompile ; \
+    %{nil}
 # Required for init scripts
 Requires: redhat-lsb
 %endif
@@ -234,7 +231,7 @@ Requires: redhat-lsb
 Init scripts for WebHcat server.
 
 %prep
-%setup -n %{name}-%{hive_base_version}
+%setup -q -n apache-%{name}-%{hive_base_version}-src
 
 %build
 bash %{SOURCE1}
@@ -338,7 +335,6 @@ fi
 %{man_dir}/man1/hive.1.*
 %exclude %dir %{usr_lib_hive}
 %exclude %dir %{usr_lib_hive}/lib
-%exclude %{usr_lib_hive}/lib/hbase.jar
 %exclude %{usr_lib_hive}/lib/hive-jdbc-*.jar
 %exclude %{usr_lib_hive}/lib/hive-metastore-*.jar
 %exclude %{usr_lib_hive}/lib/hive-serde-*.jar
@@ -346,14 +342,9 @@ fi
 %exclude %{usr_lib_hive}/lib/libthrift-*.jar
 %exclude %{usr_lib_hive}/lib/hive-service-*.jar
 %exclude %{usr_lib_hive}/lib/libfb303-*.jar
-%exclude %{usr_lib_hive}/lib/slf4j-*.jar
 %exclude %{usr_lib_hive}/lib/log4j-*.jar
 %exclude %{usr_lib_hive}/lib/commons-logging-*.jar
 
-%files hbase
-%defattr(-,root,root,755)
-%{usr_lib_hive}/lib/hbase.jar
-
 %files jdbc
 %defattr(-,root,root,755)
 %dir %{usr_lib_hive}
@@ -365,7 +356,6 @@ fi
 %{usr_lib_hive}/lib/libthrift-*.jar
 %{usr_lib_hive}/lib/hive-service-*.jar
 %{usr_lib_hive}/lib/libfb303-*.jar
-%{usr_lib_hive}/lib/slf4j-*.jar
 %{usr_lib_hive}/lib/log4j-*.jar
 %{usr_lib_hive}/lib/commons-logging-*.jar
 
@@ -405,7 +395,7 @@ if [ "$1" = 0 ] ; then \
 fi \
 %postun %1 \
 if [ $1 -ge 1 ]; then \
-	service %{name}-%1 condrestart >/dev/null 2>&1 || : \
+   service %{name}-%1 condrestart >/dev/null 2>&1 || : \
 fi
 %service_macro server
 %service_macro server2

http://git-wip-us.apache.org/repos/asf/bigtop/blob/ee16d820/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 672562a..6e21ea6 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -74,11 +74,11 @@ $(eval $(call PACKAGE,pig,PIG))
 HIVE_NAME=hive
 HIVE_RELNOTES_NAME=Apache Hive
 HIVE_PKG_NAME=hive
-HIVE_BASE_VERSION=0.12.0
+HIVE_BASE_VERSION=0.13.0
 HIVE_PKG_VERSION=$(HIVE_BASE_VERSION)
 HIVE_RELEASE_VERSION=1
-HIVE_TARBALL_DST=hive-$(HIVE_BASE_VERSION).tar.gz
-HIVE_TARBALL_SRC=$(HIVE_TARBALL_DST)
+HIVE_TARBALL_DST=apache-hive-$(HIVE_BASE_VERSION)-src.tar.gz
+HIVE_TARBALL_SRC=${HIVE_TARBALL_DST}
 HIVE_DOWNLOAD_PATH=/hive/hive-$(HIVE_BASE_VERSION)
 HIVE_SITE=$(APACHE_MIRROR)$(HIVE_DOWNLOAD_PATH)
 HIVE_ARCHIVE=$(APACHE_ARCHIVE)$(HIVE_DOWNLOAD_PATH)


Mime
View raw message