You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by om...@apache.org on 2011/04/06 08:22:49 UTC
svn commit: r1089321 - in /hadoop/hdfs/branches/yahoo-merge: CHANGES.txt
build.xml
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 <om...@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