Author: acmurthy
Date: Tue Aug 23 22:04:10 2011
New Revision: 1160896
URL: http://svn.apache.org/viewvc?rev=1160896&view=rev
Log:
MAPREDUCE-2838. Fix MapReduce builds to use new hadoop-common test jars. Contributed by gkesavan.
Modified:
hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce/build.xml
hadoop/common/trunk/hadoop-mapreduce/ivy.xml
hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/build-contrib.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/capacity-scheduler/ivy.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/data_join/ivy.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/fairscheduler/ivy.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/gridmix/ivy.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/index/ivy.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/mumak/ivy.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/raid/ivy.xml
hadoop/common/trunk/hadoop-mapreduce/src/contrib/streaming/ivy.xml
Modified: hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce/CHANGES.txt Tue Aug 23 22:04:10 2011
@@ -1130,6 +1130,9 @@ Trunk (unreleased changes)
MAPREDUCE-2649. Handling of finished applications in RM. (Thomas Graves
via acmurthy)
+ MAPREDUCE-2838. Fix MapReduce builds to use new hadoop-common test jars.
+ (gkesavan via acmurthy)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-mapreduce/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/build.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/build.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/build.xml Tue Aug 23 22:04:10 2011
@@ -211,7 +211,7 @@
<property name="hadoop-mapred-tools.pom" location="${ivy.dir}/hadoop-mapred-tools.xml"/>
<!--this is the naming policy for artifacts we want pulled down-->
- <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
+ <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision](-[classifier]).[ext]"/>
<!--this is how artifacts that get built are named-->
<property name="ivy.publish.pattern" value="hadoop-[revision]-core.[ext]"/>
Modified: hadoop/common/trunk/hadoop-mapreduce/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/ivy.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/ivy.xml Tue Aug 23 22:04:10 2011
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}" revision="${version}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -59,15 +59,16 @@
<dependencies>
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}"
conf="compile->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
- rev="${hadoop-common.version}" conf="compile->default" />
- <dependency org="org.apache.hadoop" name="hadoop-common-test"
- rev="${hadoop-common.version}" conf="compile->default" />
+ rev="${hadoop-common.version}" conf="compile->default">
+ <artifact name="hadoop-common" ext="jar" />
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests" />
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-hdfs.version}" conf="compile->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common-instrumented"
rev="${hadoop-common.version}" conf="system->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs-instrumented"
- rev="${hadoop-common.version}" conf="system->default"/>
+ rev="${hadoop-hdfs.version}" conf="system->default"/>
<dependency org="commons-logging" name="commons-logging"
rev="${commons-logging.version}" conf="compile->master"/>
<!-- <dependency org="log4j" name="log4j" rev="${log4j.version}"
@@ -77,11 +78,14 @@
conf="compile->master"/>
<dependency org="org.slf4j" name="slf4j-log4j12"
rev="${slf4j-log4j12.version}" conf="mapred->master"/>
- <dependency org="org.apache.hadoop" name="hadoop-common-test"
- rev="${hadoop-common.version}" conf="test->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
- rev="${hadoop-hdfs.version}" conf="test->default"/>
-
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs"
+ rev="${hadoop-hdfs.version}" conf="test->default">
+ <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
+ <dependency org="org.apache.hadoop" name="hadoop-common"
+ rev="${hadoop-common.version}" conf="test->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests" />
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-yarn-server-common"
rev="${yarn.version}" conf="compile->default"/>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
Modified: hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/ivy/ivysettings.xml Tue Aug 23 22:04:10 2011
@@ -31,7 +31,7 @@
-->
<property name="repo.maven.org" value="http://repo1.maven.org/maven2/" override="false"/>
<property name="snapshot.apache.org" value="https://repository.apache.org/content/repositories/snapshots/"
override="false"/>
- <property name="maven2.pattern" value="[organisation]/[module]/[revision]/[module]-[revision]"/>
+ <property name="maven2.pattern" value="[organisation]/[module]/[revision]/[module]-[revision](-[classifier])"/>
<property name="repo.dir" value="${user.home}/.m2/repository"/>
<property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
<property name="resolvers" value="default" override="false"/>
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/build-contrib.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/build-contrib.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/build-contrib.xml Tue Aug 23 22:04:10
2011
@@ -92,7 +92,7 @@
<!--this is the naming policy for artifacts we want pulled down-->
<property name="ivy.artifact.retrieve.pattern"
- value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
+ value="${ant.project.name}/[conf]/[artifact]-[revision](-[classifier]).[ext]"/>
<!-- the normal classpath -->
<path id="contrib-classpath">
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/capacity-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/capacity-scheduler/ivy.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/capacity-scheduler/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/capacity-scheduler/ivy.xml Tue Aug 23
22:04:10 2011
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -44,12 +44,16 @@
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}"
conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}" conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-common-test"
- rev="${hadoop-common.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common"
+ rev="${hadoop-common.version}" conf="test->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-hdfs.version}" conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
- rev="${hadoop-hdfs.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs"
+ rev="${hadoop-hdfs.version}" conf="test->default">
+ <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
rev="${yarn.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common"
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/data_join/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/data_join/ivy.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/data_join/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/data_join/ivy.xml Tue Aug 23 22:04:10
2011
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -42,10 +42,14 @@
</publications>
<dependencies>
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}"
conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ <artifact name="hadoop-common" ext="jar"/>
+ </dependency>
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}"
conf="common->default">
+ <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests"/>
+ <artifact name="hadoop-hdfs" ext="jar"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
rev="${yarn.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common"
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/fairscheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/fairscheduler/ivy.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/fairscheduler/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/fairscheduler/ivy.xml Tue Aug 23 22:04:10
2011
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -43,12 +43,16 @@
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}"
conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}" conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-common-test"
- rev="${hadoop-common.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common"
+ rev="${hadoop-common.version}" conf="test->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-common.version}" conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
- rev="${hadoop-common.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs"
+ rev="${hadoop-common.version}" conf="test->default">
+ <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
rev="${yarn.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common"
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/gridmix/ivy.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/gridmix/ivy.xml Tue Aug 23 22:04:10 2011
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<description>Rumen</description>
@@ -45,17 +45,21 @@
rev="${hadoop-common.version}"
conf="common->default"/>
<dependency org="org.apache.hadoop"
- name="hadoop-common-test"
+ name="hadoop-common"
rev="${hadoop-common.version}"
- conf="test->default"/>
+ conf="test->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop"
name="hadoop-hdfs"
rev="${hadoop-hdfs.version}"
conf="common->default"/>
<dependency org="org.apache.hadoop"
- name="hadoop-hdfs-test"
+ name="hadoop-hdfs"
rev="${hadoop-hdfs.version}"
- conf="test->default"/>
+ conf="test->default">
+ <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
rev="${yarn.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common"
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/index/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/index/ivy.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/index/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/index/ivy.xml Tue Aug 23 22:04:10 2011
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -42,10 +42,14 @@
</publications>
<dependencies>
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}"
conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}"
conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ <artifact name="hadoop-common" ext="jar"/>
+ </dependency>
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}"
conf="common->default">
+ <artifact name="hadoop-hdfs" ext="jar"/>
+ <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
rev="${yarn.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common"
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/mumak/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/mumak/ivy.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/mumak/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/mumak/ivy.xml Tue Aug 23 22:04:10 2011
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<description>
@@ -44,16 +44,19 @@
rev="${hadoop-common.version}"
conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
- rev="${hadoop-common.version}" conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-common-test"
- rev="${hadoop-common.version}" conf="common->default"/>
+ rev="${hadoop-common.version}" conf="common->default">
+ <artifact name="hadoop-common" ext="jar"/>
+ <artifact name="hadoop-common" type="test" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-hdfs.version}" conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
- rev="${hadoop-hdfs.version}" conf="test->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs"
+ rev="${hadoop-hdfs.version}" conf="test->default">
+ <artifact name="hadoop-hdfs" type="test" ext="jar" m:classifier="tests"/>
+ </dependency>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
rev="${yarn.version}" conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
+ <dependency org="org.apache.hadoop" name="hadoop-yarn-common"
rev="${yarn.version}" conf="common->default"/>
<dependency org="commons-logging"
name="commons-logging"
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/raid/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/raid/ivy.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/raid/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/raid/ivy.xml Tue Aug 23 22:04:10 2011
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="1.0">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<description>Rumen</description>
@@ -42,17 +42,21 @@
rev="${hadoop-common.version}"
conf="common->default"/>
<dependency org="org.apache.hadoop"
- name="hadoop-common-test"
+ name="hadoop-common"
rev="${hadoop-common.version}"
- conf="test->default"/>
+ conf="test->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop"
name="hadoop-hdfs"
rev="${hadoop-hdfs.version}"
conf="common->default"/>
<dependency org="org.apache.hadoop"
- name="hadoop-hdfs-test"
+ name="hadoop-hdfs"
rev="${hadoop-hdfs.version}"
- conf="test->default"/>
+ conf="test->default">
+ <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
rev="${yarn.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common"
Modified: hadoop/common/trunk/hadoop-mapreduce/src/contrib/streaming/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce/src/contrib/streaming/ivy.xml?rev=1160896&r1=1160895&r2=1160896&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce/src/contrib/streaming/ivy.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce/src/contrib/streaming/ivy.xml Tue Aug 23 22:04:10
2011
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<ivy-module version="1.0">
+
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
@@ -43,12 +44,16 @@
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${hadoop-common.version}"
conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-common"
rev="${hadoop-common.version}" conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-common-test"
- rev="${hadoop-common.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common"
+ rev="${hadoop-common.version}" conf="test->default">
+ <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-hdfs.version}" conf="common->default"/>
- <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"
- rev="${hadoop-hdfs.version}" conf="test->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs"
+ rev="${hadoop-hdfs.version}" conf="test->default">
+ <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests"/>
+ </dependency>
<dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core"
rev="${yarn.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-yarn-common"
|