Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 28EFD9B63 for ; Mon, 16 Apr 2012 16:13:05 +0000 (UTC) Received: (qmail 60834 invoked by uid 500); 16 Apr 2012 16:13:02 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 60739 invoked by uid 500); 16 Apr 2012 16:13:01 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 60613 invoked by uid 99); 16 Apr 2012 16:13:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Apr 2012 16:13:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Apr 2012 16:12:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9763D2388CB3; Mon, 16 Apr 2012 16:10:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1326670 [47/47] - in /incubator/bigtop/trunk: ./ bigtop-deploy/puppet/manifests/ bigtop-deploy/puppet/modules/hadoop-hbase/manifests/ bigtop-deploy/puppet/modules/hadoop-hbase/templates/ bigtop-deploy/puppet/modules/hadoop-oozie/manifests/... Date: Mon, 16 Apr 2012 16:10:32 -0000 To: bigtop-commits@incubator.apache.org From: rvs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120416161050.9763D2388CB3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml Mon Apr 16 16:10:22 2012 @@ -21,22 +21,22 @@ org.apache.bigtop bigtop - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../../pom.xml org.apache.bigtop.itest bigtop-smokes pom - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT bigtop-smokes hadoop - hive package oozie + hive hbase flume sqoop @@ -45,11 +45,11 @@ 4.8.2 - 0.3.0-incubating-SNAPSHOT - 0.20.205.0 - 0.9.1 - 1.3.0 - 0.90.4 + 0.4.0-incubating-SNAPSHOT + 0.23.1 + 0.9.2 + 1.4.0-incubating + 0.92.0 @@ -66,6 +66,28 @@ org.apache.hadoop + hadoop-common + ${hadoop.version} + + + org.apache.hadoop + hadoop-mapreduce-client-core + ${hadoop.version} + + + org.apache.hbase + hbase + ${hbase.version} + + + org.apache.hbase + hbase + test-jar + ${hbase.version} + + Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop-smokes/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop-smokes/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop-smokes/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop-smokes/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,12 +23,12 @@ org.apache.bigtop.itest bigtop-smokes - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml org.apache.bigtop.itest sqoopsmokes - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT sqoopsmokes Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,12 +23,12 @@ org.apache.bigtop.itest bigtop-smokes - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml org.apache.bigtop.itest sqoop-integration - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT sqoop-integration Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/common/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/common/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/common/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/common/pom.xml Mon Apr 16 16:10:22 2012 @@ -24,14 +24,14 @@ org.apache.bigtop bigtop - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../../../pom.xml org.apache.bigtop.itest stacks-common pom - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT stacks-validation-common @@ -117,7 +117,7 @@ org.apache.bigtop.itest itest-common - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT test Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/conf/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/conf/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/conf/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/conf/pom.xml Mon Apr 16 16:10:22 2012 @@ -21,13 +21,13 @@ org.apache.bigtop.itest stacks-common - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../common/pom.xml 4.0.0 org.apache.bigtop.itest smoke-tests-conf - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT smoke-tests-conf Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/integration/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/integration/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/integration/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/integration/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,7 +22,7 @@ org.apache.bigtop.itest stacks-common - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../common/pom.xml @@ -30,16 +30,16 @@ org.apache.bigtop.itest integration-tests pom - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT hadoop-stack-integration - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/integration/sqoop/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/integration/sqoop/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/integration/sqoop/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/integration/sqoop/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ org.apache.bigtop.itest integration-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml 4.0.0 org.apache.bigtop.itest sqoop-integration-execution - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT sqoop-integration-execution Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/package/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/package/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/package/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/package/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,13 +23,13 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../smokes/pom.xml org.apache.bigtop.itest package-smoke-execution - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT packagesmokes Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/pom.xml Mon Apr 16 16:10:22 2012 @@ -21,14 +21,14 @@ org.apache.bigtop bigtop - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../../pom.xml org.apache.bigtop.itest bigtop-test-execution pom - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT bigtop-smokes Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/flume/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/flume/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/flume/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/flume/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml 4.0.0 org.apache.bigtop.itest flume-smoke-execution - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT Flume smoke test execution Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,13 +23,13 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml org.apache.bigtop.itest hadoop-smoke-execution - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT Hadoop smoke test execution @@ -55,7 +55,13 @@ org.apache.hadoop - hadoop-core + hadoop-common + ${hadoop.version} + + + org.apache.hadoop + hadoop-hdfs + ${hadoop.version} Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hbase/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hbase/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hbase/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hbase/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml 4.0.0 org.apache.bigtop.itest hbase-smoke-execution - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT HBase smoke test execution Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hive/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hive/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hive/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hive/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml 4.0.0 org.apache.bigtop.itest hive-smoke-execution - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT Hive smoke test execution @@ -46,7 +46,7 @@ org.apache.hadoop - hadoop-core + hadoop-common org.apache.bigtop.itest Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/mahout/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/mahout/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/mahout/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/mahout/pom.xml Mon Apr 16 16:10:22 2012 @@ -23,12 +23,12 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml org.apache.bigtop.itest mahout-smoke-execution - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT Mahout smoke test execution Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/oozie/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/oozie/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/oozie/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/oozie/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml 4.0.0 org.apache.bigtop.itest oozie-smoke-test - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT Oozie smoke test execution Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pig/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pig/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pig/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pig/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,7 +22,7 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml @@ -30,7 +30,7 @@ org.apache.bigtop.itest pig-smoke-execution jar - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT pigsmokes @@ -55,7 +55,7 @@ org.apache.hadoop - hadoop-core + hadoop-common Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,7 +22,7 @@ org.apache.bigtop.itest stacks-common - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../common/pom.xml @@ -30,7 +30,7 @@ org.apache.bigtop.itest smoke-tests pom - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT hadoop-stack-validation @@ -41,15 +41,15 @@ 0.9.2 0.9.2-SNAPSHOT 1.4.1-incubating - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT @@ -59,14 +59,18 @@ List of modules which should be executed as a part of stack testing run --> + hadoop + @@ -104,17 +108,45 @@ BOM definitions --> + org.apache.bigtop.itest @@ -127,6 +159,7 @@ Same goes for the rest of the bunch here--> test + Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop-smokes/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop-smokes/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop-smokes/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop-smokes/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml 4.0.0 org.apache.bigtop.itest sqoop-smoke-execution - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT Sqoop smoke test execution @@ -38,7 +38,7 @@ org.apache.bigtop.itest sqoopsmokes - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT jar Modified: incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop/pom.xml (original) +++ incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop/pom.xml Mon Apr 16 16:10:22 2012 @@ -22,14 +22,14 @@ org.apache.bigtop.itest smoke-tests - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../pom.xml 4.0.0 org.apache.bigtop.itest sqoop-test-execution - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT Sqoop smoke test execution @@ -58,7 +58,7 @@ org.apache.hadoop - hadoop-core + hadoop-common Modified: incubator/bigtop/trunk/bigtop.mk URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop.mk (original) +++ incubator/bigtop/trunk/bigtop.mk Mon Apr 16 16:10:22 2012 @@ -13,19 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -BIGTOP_VERSION=0.3.0-incubating +BIGTOP_VERSION=0.4.0-incubating # Hadoop 0.20.0-based hadoop package HADOOP_NAME=hadoop HADOOP_RELNOTES_NAME=Apache Hadoop -HADOOP_BASE_VERSION=1.0.1 -HADOOP_PKG_VERSION=$(HADOOP_BASE_VERSION) +HADOOP_BASE_VERSION=2.0.0-SNAPSHOT +HADOOP_PKG_VERSION=2.0.0 HADOOP_RELEASE_VERSION=1 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz -HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST) -HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION) -HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH) -HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH) +#HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION) +#HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH) +#HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH) +HADOOP_TARBALL_SRC=8c0466d +HADOOP_SITE=https://github.com/apache/hadoop-common/tarball +HADOOP_ARCHIVE=$(HADOOP_SITE) $(eval $(call PACKAGE,hadoop,HADOOP)) # ZooKeeper @@ -124,7 +126,6 @@ WHIRR_TARBALL_SRC=$(WHIRR_TARBALL_DST) WHIRR_DOWNLOAD_PATH=/whirr/whirr-$(WHIRR_BASE_VERSION) WHIRR_SITE=$(APACHE_MIRROR)$(WHIRR_DOWNLOAD_PATH) WHIRR_ARCHIVE=$(APACHE_ARCHIVE)$(WHIRR_DOWNLOAD_PATH) - $(eval $(call PACKAGE,whirr,WHIRR)) # Mahout @@ -163,3 +164,27 @@ BIGTOP_UTILS_BASE_VERSION=$(subst -,.,$( BIGTOP_UTILS_PKG_VERSION=$(BIGTOP_UTILS_BASE_VERSION) BIGTOP_UTILS_RELEASE_VERSION=1 $(eval $(call PACKAGE,bigtop-utils,BIGTOP_UTILS)) + +# Bigtop-jsvc +BIGTOP_JSVC_NAME=bigtop-jsvc +BIGTOP_JSVC_RELNOTES_NAME=Apache Commons Daemon (jsvc) +BIGTOP_JSVC_PKG_NAME=bigtop-jsvc +BIGTOP_JSVC_BASE_VERSION=1.0.10 +BIGTOP_JSVC_PKG_VERSION=1.0.10 +BIGTOP_JSVC_RELEASE_VERSION=1 +BIGTOP_JSVC_TARBALL_SRC=commons-daemon-$(BIGTOP_JSVC_BASE_VERSION)-native-src.tar.gz +BIGTOP_JSVC_TARBALL_DST=commons-daemon-$(BIGTOP_JSVC_BASE_VERSION).tar.gz +BIGTOP_JSVC_SITE=$(APACHE_MIRROR)/commons/daemon/source/ +$(eval $(call PACKAGE,bigtop-jsvc,BIGTOP_JSVC)) + +# Bigtop-tomcat +BIGTOP_TOMCAT_NAME=bigtop-tomcat +BIGTOP_TOMCAT_RELNOTES_NAME=Apache Tomcat +BIGTOP_TOMCAT_PKG_NAME=bigtop-tomcat +BIGTOP_TOMCAT_BASE_VERSION=6.0.35 +BIGTOP_TOMCAT_PKG_VERSION=$(BIGTOP_TOMCAT_BASE_VERSION) +BIGTOP_TOMCAT_RELEASE_VERSION=1 +BIGTOP_TOMCAT_TARBALL_SRC=apache-tomcat-$(BIGTOP_TOMCAT_BASE_VERSION)-src.tar.gz +BIGTOP_TOMCAT_TARBALL_DST=apache-tomcat-$(BIGTOP_TOMCAT_BASE_VERSION).tar.gz +BIGTOP_TOMCAT_SITE=$(APACHE_MIRROR)/tomcat/tomcat-6/v$(BIGTOP_TOMCAT_BASE_VERSION)/src/ +$(eval $(call PACKAGE,bigtop-tomcat,BIGTOP_TOMCAT)) Modified: incubator/bigtop/trunk/package.mk URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/package.mk?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/package.mk (original) +++ incubator/bigtop/trunk/package.mk Mon Apr 16 16:10:22 2012 @@ -23,6 +23,27 @@ $(BUILD_DIR)/%/.download: [ -z "$($(PKG)_TARBALL_SRC)" -o -f $($(PKG)_DOWNLOAD_DST) ] || (cd $(DL_DIR) && curl --retry 5 -# -L -k -o $($(PKG)_TARBALL_DST) $($(PKG)_DOWNLOAD_URL)) touch $@ +# Untar and patch +$(BUILD_DIR)/%/.tar: + -rm -rf $(PKG_BUILD_DIR)/tar/ + mkdir -p $(PKG_BUILD_DIR)/tar/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) + if [ -n "$($(PKG)_TARBALL_SRC)" ]; then \ + cp $($(PKG)_DOWNLOAD_DST) $(PKG_BUILD_DIR)/tar/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz ;\ + tar -C $(PKG_BUILD_DIR)/tar/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) \ + --strip-components 1 -xzvf $(PKG_BUILD_DIR)/tar/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).orig.tar.gz; \ + fi + if [ -f $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/series ]; then \ + PATCHES="`cat $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/series`" ;\ + elif [ -f $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/patch ]; then \ + PATCHES="patch" ;\ + else \ + PATCHES="/dev/null" ;\ + fi ; (cd $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME); cat $$PATCHES)| \ + (cd $(PKG_BUILD_DIR)/tar/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) ; patch -p0) + tar -C $(PKG_BUILD_DIR)/tar -czf $(PKG_BUILD_DIR)/tar/$($(PKG)_PKG_NAME)_$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP).patched.tar.gz \ + $($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) + touch $@ + # Make source RPMs $(BUILD_DIR)/%/.srpm: -rm -rf $(PKG_BUILD_DIR)/rpm/ @@ -105,6 +126,7 @@ $(BUILD_DIR)/%/.deb: --preserve-envvar JAVA5_HOME \ --preserve-envvar FORREST_HOME \ --preserve-envvar MAVEN3_HOME \ + --preserve-envvar MAVEN_OPTS \ --preserve-envvar JAVA_HOME \ --set-envvar=$(PKG)_BASE_VERSION=$($(PKG)_BASE_VERSION) \ --set-envvar=$(PKG)_VERSION=$($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP) \ @@ -147,6 +169,7 @@ ifneq ($$(shell curl -o /dev/null --sile endif $(2)_TARGET_DL = $$($(2)_BUILD_DIR)/.download +$(2)_TARGET_TAR = $$($(2)_BUILD_DIR)/.tar $(2)_TARGET_SRPM = $$($(2)_BUILD_DIR)/.srpm $(2)_TARGET_RPM = $$($(2)_BUILD_DIR)/.rpm $(2)_TARGET_YUM = $$($(2)_BUILD_DIR)/.yum @@ -158,6 +181,9 @@ $(2)_TARGET_RELNOTES = $$($(2)_BUILD_DIR # We download target when the source is not in the download directory $(1)-download: $$($(2)_TARGET_DL) +# Make a patched tarball (patch could be null) +$(1)-tar: $(1)-download $$($(2)_TARGET_TAR) + # To make srpms, we need to build the package $(1)-srpm: $(1)-download $$($(2)_TARGET_SRPM) @@ -209,11 +235,11 @@ $(1)-info: # Implicit rules with PKG variable $$($(2)_TARGET_DL): PKG=$(2) -$$($(2)_TARGET_APT) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG=$(2) -$$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_BASE_VERSION=$$($(2)_BASE_VERSION) -$$($(2)_TARGET_APT) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_PKG_VERSION=$$($(2)_PKG_VERSION) -$$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_SOURCE_DIR=$$($(2)_SOURCE_DIR) -$$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_BUILD_DIR=$$($(2)_BUILD_DIR) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_APT) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG=$(2) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_BASE_VERSION=$$($(2)_BASE_VERSION) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_APT) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_PKG_VERSION=$$($(2)_PKG_VERSION) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_SOURCE_DIR=$$($(2)_SOURCE_DIR) +$$($(2)_TARGET_TAR) $$($(2)_TARGET_RPM) $$($(2)_TARGET_SRPM) $$($(2)_TARGET_SDEB) $$($(2)_TARGET_DEB): PKG_BUILD_DIR=$$($(2)_BUILD_DIR) TARGETS += $(1) Modified: incubator/bigtop/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/pom.xml?rev=1326670&r1=1326669&r2=1326670&view=diff ============================================================================== --- incubator/bigtop/trunk/pom.xml (original) +++ incubator/bigtop/trunk/pom.xml Mon Apr 16 16:10:22 2012 @@ -27,7 +27,7 @@ org.apache.bigtop bigtop - 0.3.0-incubating-SNAPSHOT + 0.4.0-incubating-SNAPSHOT pom Bigtop