You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2014/04/25 22:42:47 UTC
[2/4] git commit: BIGTOP-1281. bump hbase version to 0.98.2
BIGTOP-1281. bump hbase version to 0.98.2
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/aed632f4
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/aed632f4
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/aed632f4
Branch: refs/heads/master.fixed
Commit: aed632f4e1a6883b93f433a5df38f56f98aee64a
Parents: adee704
Author: Konstantin Boudnik <co...@apache.org>
Authored: Thu Apr 24 16:01:57 2014 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Thu Apr 24 16:01:57 2014 -0700
----------------------------------------------------------------------
bigtop-packages/src/common/hbase/do-component-build | 7 +++----
bigtop-packages/src/common/hbase/install_hbase.sh | 14 ++++++++++----
bigtop.mk | 4 ++--
3 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/aed632f4/bigtop-packages/src/common/hbase/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/do-component-build b/bigtop-packages/src/common/hbase/do-component-build
index 44d97d0..4802006 100644
--- a/bigtop-packages/src/common/hbase/do-component-build
+++ b/bigtop-packages/src/common/hbase/do-component-build
@@ -18,11 +18,10 @@ set -ex
. `dirname $0`/bigtop.bom
-mvn -DskipTests -Dhadoop.profile=23 \
- -Dslf4j.version=1.6.1 \
+mvn -DskipTests -Dslf4j.version=1.6.1 \
-Dhadoop.version=$HADOOP_VERSION \
-Dzookeeper.version=$ZOOKEEPER_VERSION \
- clean install site assembly:assembly "$@"
+ clean install site assembly:single "$@"
rm -rf build
mkdir build
-tar -C build --strip-components=1 -xzf target/hbase*.tar.gz
+tar -C build --strip-components=1 -xzf hbase-assembly/target/hbase*.tar.gz
http://git-wip-us.apache.org/repos/asf/bigtop/blob/aed632f4/bigtop-packages/src/common/hbase/install_hbase.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hbase/install_hbase.sh b/bigtop-packages/src/common/hbase/install_hbase.sh
index e2d8a0e..469d498 100755
--- a/bigtop-packages/src/common/hbase/install_hbase.sh
+++ b/bigtop-packages/src/common/hbase/install_hbase.sh
@@ -113,7 +113,7 @@ install -d -m 0755 $PREFIX/$MAN_DIR
install -d -m 0755 $PREFIX/$THRIFT_DIR
cp -ra $BUILD_DIR/lib/* ${PREFIX}/${LIB_DIR}/lib/
-cp $BUILD_DIR/hbase*.jar $PREFIX/$LIB_DIR
+cp $BUILD_DIR/lib/hbase*.jar $PREFIX/$LIB_DIR
cp -a $BUILD_DIR/docs/* $PREFIX/$DOC_DIR
cp $BUILD_DIR/*.txt $PREFIX/$DOC_DIR/
cp -a $BUILD_DIR/hbase-webapps $PREFIX/$LIB_DIR
@@ -127,13 +127,19 @@ for file in rolling-restart.sh graceful_stop.sh local-regionservers.sh \
rm -f $PREFIX/$BIN_DIR/$file
done
-cp $BUILD_DIR/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift $PREFIX/$THRIFT_DIR/hbase1.thrift
-cp $BUILD_DIR/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift $PREFIX/$THRIFT_DIR/hbase2.thrift
+cp $BUILD_DIR/../hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift/Hbase.thrift $PREFIX/$THRIFT_DIR/hbase1.thrift
+cp $BUILD_DIR/../hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift $PREFIX/$THRIFT_DIR/hbase2.thrift
ln -s $ETC_DIR/conf $PREFIX/$LIB_DIR/conf
# Make a symlink of hbase.jar to hbase-version.jar
-ln -s `cd $PREFIX/$LIB_DIR ; ls hbase*jar | grep -v tests.jar` $PREFIX/$LIB_DIR/hbase.jar
+pushd `pwd`
+cd $PREFIX/$LIB_DIR
+for i in `ls hbase*jar | grep -v tests.jar`
+do
+ ln -s $i `echo $i | sed -n 's/\(.*\)\(-[0-9].*\)\(.jar\)/\1\3/p'`
+done
+popd
wrapper=$PREFIX/usr/bin/hbase
mkdir -p `dirname $wrapper`
http://git-wip-us.apache.org/repos/asf/bigtop/blob/aed632f4/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 6396818..1b072f9 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -46,11 +46,11 @@ $(eval $(call PACKAGE,zookeeper,ZOOKEEPER))
HBASE_NAME=hbase
HBASE_RELNOTES_NAME=Apache HBase
HBASE_PKG_NAME=hbase
-HBASE_BASE_VERSION=0.94.12
+HBASE_BASE_VERSION=0.98.2
HBASE_PKG_VERSION=$(HBASE_BASE_VERSION)
HBASE_RELEASE_VERSION=1
HBASE_TARBALL_DST=hbase-$(HBASE_BASE_VERSION).tar.gz
-HBASE_TARBALL_SRC=$(HBASE_TARBALL_DST)
+HBASE_TARBALL_SRC=hbase-$(HBASE_BASE_VERSION)-src.tar.gz
HBASE_DOWNLOAD_PATH=/hbase/hbase-$(HBASE_BASE_VERSION)
HBASE_SITE=$(APACHE_MIRROR)$(HBASE_DOWNLOAD_PATH)
HBASE_ARCHIVE=$(APACHE_ARCHIVE)$(HBASE_DOWNLOAD_PATH)