From 309809fa1489b3f5aed921d7a11ada79c9b911a0 Mon Sep 17 00:00:00 2001
From: YoungWoo Kim <ywkim@apache.org>
Date: Tue, 4 Aug 2015 14:08:28 +0900
Subject: [PATCH] BIGTOP-1888. Upgrade Flume to 1.6.0

---
 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(-)

diff --git a/bigtop-packages/src/common/flume/do-component-build b/bigtop-packages/src/common/flume/do-component-build
index 9a8a4c3417..98f22e9845 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 "$@"
diff --git a/bigtop-packages/src/common/flume/install_flume.sh b/bigtop-packages/src/common/flume/install_flume.sh
index 65eeabd2db..8927e19eac 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
diff --git a/bigtop.mk b/bigtop.mk
index 5c31fb9649..5a2e1a6f86 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)