Author: szetszwo
Date: Sat May 14 01:30:36 2011
New Revision: 1102940
URL: http://svn.apache.org/viewvc?rev=1102940&view=rev
Log:
HADOOP-7289. In ivy.xml, test conf should not extend common conf. Contributed
by Eric Yang
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/build.xml
hadoop/common/trunk/ivy.xml
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1102940&r1=1102939&r2=1102940&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Sat May 14 01:30:36 2011
@@ -153,6 +153,9 @@ Trunk (unreleased changes)
HADOOP-7285. Refactor the test command to conform to new FsCommand
class. (Daryn Sharp via todd)
+ HADOOP-7289. In ivy.xml, test conf should not extend common conf.
+ (Eric Yang via szetszwo)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=1102940&r1=1102939&r2=1102940&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Sat May 14 01:30:36 2011
@@ -212,10 +212,10 @@
<pathelement location="${build.examples}"/>
<pathelement location="${build.tools}"/>
<pathelement path="${clover.jar}"/>
+ <path refid="ivy-common.classpath"/>
<path refid="ivy-test.classpath"/>
<pathelement location="${build.classes}"/>
<pathelement location="${test.conf.dir}"/>
- <path refid="ivy-common.classpath"/>
</path>
<!--
<path id="test.hdfs.classpath">
Modified: hadoop/common/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/ivy.xml?rev=1102940&r1=1102939&r2=1102940&view=diff
==============================================================================
--- hadoop/common/trunk/ivy.xml (original)
+++ hadoop/common/trunk/ivy.xml Sat May 14 01:30:36 2011
@@ -53,7 +53,7 @@
<conf name="common" extends="runtime,mandatory,httpclient,ftp,jetty,jdiff"
description="common artifacts"/>
<!--Testing pulls in everything-->
- <conf name="test" extends="master,common" description="the classpath needed
to run tests"/>
+ <conf name="test" extends="master" description="the classpath needed to run
tests"/>
<!--Private configurations. -->
@@ -219,7 +219,7 @@
<dependency org="junit"
name="junit"
rev="${junit.version}"
- conf="common->default"/>
+ conf="test->default"/>
<dependency org="org.apache.rat"
name="apache-rat-tasks"
rev="${rats-lib.version}"
@@ -247,7 +247,7 @@
<dependency org="org.slf4j"
name="slf4j-api"
rev="${slf4j-api.version}"
- conf="common->master"/>
+ conf="common->default"/>
<dependency org="org.eclipse.jdt"
name="core"
rev="${core.version}"
@@ -294,7 +294,7 @@
<dependency org="org.mockito"
name="mockito-all"
rev="${mockito-all.version}"
- conf="common->default">
+ conf="test->default">
</dependency>
<dependency org="com.jcraft"
name="jsch"
