Return-Path: 
 <hdfs-commits-return-1324-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Received: (qmail 2349 invoked from network); 6 Apr 2011 06:23:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 6 Apr 2011 06:23:21 -0000
Received: (qmail 27934 invoked by uid 500); 6 Apr 2011 06:23:20 -0000
Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org
Received: (qmail 27784 invoked by uid 500); 6 Apr 2011 06:23:20 -0000
Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdfs-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:hdfs-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:hdfs-commits@hadoop.apache.org>
List-Id: <hdfs-commits.hadoop.apache.org>
Reply-To: hdfs-dev@hadoop.apache.org
Delivered-To: mailing list hdfs-commits@hadoop.apache.org
Received: (qmail 27762 invoked by uid 99); 6 Apr 2011 06:23:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2011 06:23:19 +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, 06 Apr 2011 06:23:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id BDB9323889DA; Wed,  6 Apr 2011 06:22:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1089321 - in /hadoop/hdfs/branches/yahoo-merge:
 CHANGES.txt
 build.xml
Date: Wed, 06 Apr 2011 06:22:49 -0000
To: hdfs-commits@hadoop.apache.org
From: omalley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110406062249.BDB9323889DA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: omalley
Date: Wed Apr  6 06:22:49 2011
New Revision: 1089321

URL: http://svn.apache.org/viewvc?rev=1089321&view=rev
Log:
commit a678adf587c14722912a4df0293a4f50fd6a3486
Author: Owen O'Malley <omalley@apache.org>
Date:   Tue Apr 5 16:19:53 2011 -0700

    HDFS-1543 Factor si artifacts out of mvn-install
    
    Conflicts:
    
    	build.xml

Modified:
    hadoop/hdfs/branches/yahoo-merge/CHANGES.txt
    hadoop/hdfs/branches/yahoo-merge/build.xml

Modified: hadoop/hdfs/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/CHANGES.txt?rev=1089321&r1=1089320&r2=1089321&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/hdfs/branches/yahoo-merge/CHANGES.txt Wed Apr  6 06:22:49 2011
@@ -232,6 +232,8 @@ Trunk (unreleased changes)
 
     HDFS-1810. Remove duplicate jars from ivy. (Luke Lu)
 
+    HDFS-1543. Remove system test artifacts from default build. (Luke Lu)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/hdfs/branches/yahoo-merge/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/build.xml?rev=1089321&r1=1089320&r2=1089321&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/build.xml (original)
+++ hadoop/hdfs/branches/yahoo-merge/build.xml Wed Apr  6 06:22:49 2011
@@ -1487,7 +1487,7 @@
          uri="urn:maven-artifact-ant" classpathref="mvn-ant-task.classpath"/>
   </target>   
 
-  <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,set-version,-mvn-system-install"
+  <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,set-version"
      description="To install hadoop hdfs and test jars to local filesystem's m2 cache">
      <artifact:pom file="${hadoop-hdfs.pom}" id="hadoop.hdfs"/>
      <artifact:pom file="${hadoop-hdfs-test.pom}" id="hadoop.hdfs.test"/>
@@ -1500,7 +1500,10 @@
         <attach file="${hadoop-hdfs-test-sources.jar}" classifier="sources" />
      </artifact:install>
    </target>
-  
+
+   <target name="mvn-si-install" depends="mvn-install,-mvn-system-install"
+           description="Install system integration tests jars as well"/>
+
    <target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test,
      jar-system, jar-test-system, set-version, signanddeploy, simpledeploy"
      description="To deploy hadoop hdfs and test jar's to apache