You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2014/10/05 04:50:58 UTC
[2/2] git commit: BIGTOP-1460. maven dependencies broken
BIGTOP-1460. maven dependencies broken
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6ba4971c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6ba4971c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6ba4971c
Branch: refs/heads/master
Commit: 6ba4971c1f6b8cd597d069132c58cecf7b5edbf1
Parents: 0c3e64b
Author: Olaf Flebbe <o....@science-computing.de>
Authored: Sat Oct 4 19:49:48 2014 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Sat Oct 4 19:49:48 2014 -0700
----------------------------------------------------------------------
bigtop.mk | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6ba4971c/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 64c941a..5a19970 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -21,19 +21,6 @@ JDK_BASE_VERSION=$(JDK_VERSION)
$(eval BIGTOP_BOM += JDK_VERSION=$(JDK_VERSION))
-# Hadoop 0.20.0-based hadoop package
-HADOOP_NAME=hadoop
-HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=2.4.1
-HADOOP_PKG_VERSION=2.4.1
-HADOOP_RELEASE_VERSION=1
-HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
-HADOOP_TARBALL_SRC=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz
-HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)
-HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH)
-HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
-$(eval $(call PACKAGE,hadoop,HADOOP))
-
# ZooKeeper
ZOOKEEPER_NAME=zookeeper
ZOOKEEPER_RELNOTES_NAME=Apache Zookeeper
@@ -48,6 +35,19 @@ ZOOKEEPER_SITE=$(APACHE_MIRROR)$(ZOOKEEPER_DOWNLOAD_PATH)
ZOOKEEPER_ARCHIVE=$(APACHE_ARCHIVE)$(ZOOKEEPER_DOWNLOAD_PATH)
$(eval $(call PACKAGE,zookeeper,ZOOKEEPER))
+# Hadoop 0.20.0-based hadoop package
+HADOOP_NAME=hadoop
+HADOOP_RELNOTES_NAME=Apache Hadoop
+HADOOP_BASE_VERSION=2.4.1
+HADOOP_PKG_VERSION=2.4.1
+HADOOP_RELEASE_VERSION=1
+HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
+HADOOP_TARBALL_SRC=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)-src.tar.gz
+HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)
+HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH)
+HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
+$(eval $(call PACKAGE,hadoop,HADOOP))
+
# HBase
HBASE_NAME=hbase
HBASE_RELNOTES_NAME=Apache HBase