Return-Path: 
 <bigtop-commits-return-169-apmail-incubator-bigtop-commits-archive=incubator.apache.org@incubator.apache.org>
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 92EEE76F2
	for <apmail-incubator-bigtop-commits-archive@minotaur.apache.org>;
 Wed, 28 Sep 2011 18:43:06 +0000 (UTC)
Received: (qmail 49814 invoked by uid 500); 28 Sep 2011 18:43:06 -0000
Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org
Received: (qmail 49782 invoked by uid 500); 28 Sep 2011 18:43:06 -0000
Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:bigtop-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:bigtop-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:bigtop-commits@incubator.apache.org>
List-Id: <bigtop-commits.incubator.apache.org>
Reply-To: bigtop-dev@incubator.apache.org
Delivered-To: mailing list bigtop-commits@incubator.apache.org
Received: (qmail 49775 invoked by uid 99); 28 Sep 2011 18:43:06 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2011 18:43:06 +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; Wed, 28 Sep 2011 18:43:03 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D405A23888FE;
	Wed, 28 Sep 2011 18:42:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1177012 - in /incubator/bigtop/branches/hadoop-0.22:
 bigtop-packages/src/common/sqoop/patch bigtop-packages/src/deb/sqoop/rules
 bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec bigtop.mk
Date: Wed, 28 Sep 2011 18:42:41 -0000
To: bigtop-commits@incubator.apache.org
From: rvs@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20110928184241.D405A23888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rvs
Date: Wed Sep 28 18:42:41 2011
New Revision: 1177012

URL: http://svn.apache.org/viewvc?rev=1177012&view=rev
Log:
Enabling sqoop

Added:
    incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch
Modified:
    incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules
    incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
    incubator/bigtop/branches/hadoop-0.22/bigtop.mk

Added: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch?rev=1177012&view=auto
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch (added)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/sqoop/patch Wed Sep 28 18:42:41 2011
@@ -0,0 +1,43 @@
+Index: sqoop-1.3.0/ivy.xml
+===================================================================
+--- sqoop-1.3.0.orig/ivy.xml	2011-09-27 10:28:59.474837063 -0700
++++ sqoop-1.3.0/ivy.xml	2011-09-27 10:28:46.733590903 -0700
+@@ -66,10 +66,18 @@
+   </publications>
+   <dependencies>
+     <!-- Dependencies for Cloudera's Distribution for Hadoop -->
+-    <dependency org="com.cloudera.hadoop" name="hadoop-core"
+-      rev="${hadoop-core.cloudera.version}" conf="cloudera->default"/>
+-    <dependency org="com.cloudera.hadoop" name="hadoop-test"
+-      rev="${hadoop-core.cloudera.version}" conf="clouderatest->default"/>
++    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
++      conf="cloudera->default"/> 
++    <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}"
++      conf="clouderatest->default"/> 
++    <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}"
++      conf="cloudera->default"/>
++    <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}"
++      conf="clouderatest->default"/>
++    <dependency org="org.apache.hadoop" name="hadoop-mapred" rev="${hadoop-mapred.version}"
++       conf="cloudera->default"/>
++    <dependency org="org.apache.hadoop" name="hadoop-mapred-test" rev="${hadoop-mapred.version}"
++      conf="clouderatest->default"/>
+
+ 
+     <!-- Common dependencies for Sqoop -->
+     <dependency org="commons-cli" name="commons-cli"
+Index: sqoop-1.3.0/ivy/libraries.properties
+===================================================================
+--- sqoop-1.3.0.orig/ivy/libraries.properties	2011-09-27 10:30:10.136087155 -0700
++++ sqoop-1.3.0/ivy/libraries.properties	2011-09-27 10:29:29.734839438 -0700
+@@ -27,7 +27,9 @@
+ commons-logging.version=1.0.4
+ 
+ # Cloudera Distribution dependency version
+-hadoop-core.cloudera.version=0.20.2-737
++hadoop-common.version=0.22.0-SNAPSHOT
++hadoop-hdfs.version=0.22.0-SNAPSHOT
++hadoop-mapred.version=0.22.0-SNAPSHOT
+ 
+ hbase.version=0.89.20100924-28
+ zookeeper.version=3.3.1+7

Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules?rev=1177012&r1=1177011&r2=1177012&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/sqoop/rules Wed Sep 28 18:42:41 2011
@@ -25,6 +25,7 @@ export DH_OPTIONS
 
 patch: patch-stamp
 patch-stamp:	
+	patch -p1 < debian/patch
 	touch $@
 
 clean:	

Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1177012&r1=1177011&r2=1177012&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Wed Sep 28 18:42:41 2011
@@ -40,6 +40,7 @@ Source1: do-component-build
 Source2: install_%{name}.sh
 Source3: sqoop-metastore.sh
 Source4: sqoop-metastore.sh.suse
+Patch0: patch
 Buildarch: noarch
 BuildRequires:  asciidoc, xmlto
 Prereq: hadoop
@@ -69,6 +70,7 @@ server for Sqoop clients across a networ
 
 %prep
 %setup -n sqoop-%{sqoop_base_version}
+%patch0 -p1
 
 %build
 bash %{SOURCE1} -Dversion=%{version}

Modified: incubator/bigtop/branches/hadoop-0.22/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop.mk?rev=1177012&r1=1177011&r2=1177012&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop.mk Wed Sep 28 18:42:41 2011
@@ -83,8 +83,8 @@ $(eval $(call PACKAGE,hive,HIVE))
 SQOOP_NAME=sqoop
 SQOOP_RELNOTES_NAME=Sqoop
 SQOOP_PKG_NAME=sqoop
-SQOOP_BASE_VERSION=1.2.0
-SQOOP_PKG_VERSION=1.2.0
+SQOOP_BASE_VERSION=1.3.0
+SQOOP_PKG_VERSION=1.3.0
 SQOOP_RELEASE_VERSION=1
 SQOOP_TARBALL_DST=sqoop-$(SQOOP_BASE_VERSION).tar.gz
 SQOOP_TARBALL_SRC=$(SQOOP_TARBALL_DST)