Repository: bigtop Updated Branches: refs/heads/master be1fbfccd -> 927bf4d1d
BIGTOP-1888. Upgrade Flume to 1.6.0 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/927bf4d1 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/927bf4d1 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/927bf4d1 Branch: refs/heads/master Commit: 927bf4d1de36e71fff9d03f479cedb4c81b5b259 Parents: be1fbfc Author: YoungWoo Kim <[email protected]> Authored: Tue Aug 4 14:08:28 2015 +0900 Committer: YoungWoo Kim <[email protected]> Committed: Thu Aug 6 16:34:28 2015 +0900 ---------------------------------------------------------------------- bigtop-packages/src/common/flume/do-component-build | 2 ++ bigtop-packages/src/common/flume/install_flume.sh | 4 ++++ bigtop.mk | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/927bf4d1/bigtop-packages/src/common/flume/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/flume/do-component-build b/bigtop-packages/src/common/flume/do-component-build index 9a8a4c3..98f22e9 100755 --- a/bigtop-packages/src/common/flume/do-component-build +++ b/bigtop-packages/src/common/flume/do-component-build @@ -30,4 +30,6 @@ sed -i -e \ mvn -DskipTests -Dhadoop.profile=hbase-98 \ -Dhadoop2.version=$HADOOP_VERSION \ -Dhbase.version=${HBASE_VERSION}-hadoop2 \ + -Dkite.version=${KITE_VERSION} \ + -Dhive.version=${HIVE_VERSION} \ clean install "$@" http://git-wip-us.apache.org/repos/asf/bigtop/blob/927bf4d1/bigtop-packages/src/common/flume/install_flume.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/flume/install_flume.sh b/bigtop-packages/src/common/flume/install_flume.sh index 65eeabd..8927e19 100755 --- a/bigtop-packages/src/common/flume/install_flume.sh +++ b/bigtop-packages/src/common/flume/install_flume.sh @@ -167,3 +167,7 @@ for x in CHANGELOG \ cp -r $x $PREFIX/${DOC_DIR} fi done + +# Remove Windows files +rm -rf ${PREFIX}/${BIN_DIR}/*.cmd +rm -rf ${PREFIX}/${BIN_DIR}/*.ps1 http://git-wip-us.apache.org/repos/asf/bigtop/blob/927bf4d1/bigtop.mk ---------------------------------------------------------------------- diff --git a/bigtop.mk b/bigtop.mk index 5c31fb9..5a2e1a6 100644 --- a/bigtop.mk +++ b/bigtop.mk @@ -180,8 +180,8 @@ $(eval $(call PACKAGE,mahout,MAHOUT)) FLUME_NAME=flume FLUME_RELNOTES_NAME=Flume FLUME_PKG_NAME=flume -FLUME_BASE_VERSION=1.5.2 -FLUME_PKG_VERSION=1.5.2 +FLUME_BASE_VERSION=1.6.0 +FLUME_PKG_VERSION=1.6.0 FLUME_RELEASE_VERSION=1 FLUME_TARBALL_DST=apache-$(FLUME_NAME)-$(FLUME_BASE_VERSION)-src.tar.gz FLUME_TARBALL_SRC=$(FLUME_TARBALL_DST)
