big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-7289. In ivy.xml, test conf should not extend common conf. Contributed by Eric Yang

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1102940 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tsz-wo Sze 2011-05-14 01:30:36 +00:00
parent 5b456040c7
commit 8f57b5102a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -153,6 +153,9 @@ Trunk (unreleased changes)
HADOOP-7285. Refactor the test command to conform to new FsCommand HADOOP-7285. Refactor the test command to conform to new FsCommand
class. (Daryn Sharp via todd) class. (Daryn Sharp via todd)
HADOOP-7289. In ivy.xml, test conf should not extend common conf.
(Eric Yang via szetszwo)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
build.xml
View File

@ -212,10 +212,10 @@
<pathelement location="${build.examples}"/> <pathelement location="${build.examples}"/>
<pathelement location="${build.tools}"/> <pathelement location="${build.tools}"/>
<pathelement path="${clover.jar}"/> <pathelement path="${clover.jar}"/>
<path refid="ivy-common.classpath"/>
<path refid="ivy-test.classpath"/> <path refid="ivy-test.classpath"/>
<pathelement location="${build.classes}"/> <pathelement location="${build.classes}"/>
<pathelement location="${test.conf.dir}"/> <pathelement location="${test.conf.dir}"/>
<path refid="ivy-common.classpath"/>
</path> </path>
<!-- <!--
<path id="test.hdfs.classpath"> <path id="test.hdfs.classpath">

8
ivy.xml
View File

@ -53,7 +53,7 @@
<conf name="common" extends="runtime,mandatory,httpclient,ftp,jetty,jdiff" <conf name="common" extends="runtime,mandatory,httpclient,ftp,jetty,jdiff"
description="common artifacts"/> description="common artifacts"/>
<!--Testing pulls in everything--> <!--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. --> <!--Private configurations. -->
@ -219,7 +219,7 @@
<dependency org="junit" <dependency org="junit"
name="junit" name="junit"
rev="${junit.version}" rev="${junit.version}"
conf="common->default"/> conf="test->default"/>
<dependency org="org.apache.rat" <dependency org="org.apache.rat"
name="apache-rat-tasks" name="apache-rat-tasks"
rev="${rats-lib.version}" rev="${rats-lib.version}"
@ -247,7 +247,7 @@
<dependency org="org.slf4j" <dependency org="org.slf4j"
name="slf4j-api" name="slf4j-api"
rev="${slf4j-api.version}" rev="${slf4j-api.version}"
conf="common->master"/> conf="common->default"/>
<dependency org="org.eclipse.jdt" <dependency org="org.eclipse.jdt"
name="core" name="core"
rev="${core.version}" rev="${core.version}"
@ -294,7 +294,7 @@
<dependency org="org.mockito" <dependency org="org.mockito"
name="mockito-all" name="mockito-all"
rev="${mockito-all.version}" rev="${mockito-all.version}"
conf="common->default"> conf="test->default">
</dependency> </dependency>
<dependency org="com.jcraft" <dependency org="com.jcraft"
name="jsch" name="jsch"