natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix failing tests due to IVY-739 changes 

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@632990 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Xavier Hanin 2008-03-03 08:57:06 +00:00
parent a9ba2122fe
commit 0dfdcb94d6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
View File

@ -203,6 +203,7 @@ public class DefaultDependencyDescriptor implements DependencyDescriptor {
public DefaultDependencyDescriptor(ModuleRevisionId mrid, boolean force, boolean changing) {
md = null;
revId = mrid;
dynamicRevId = mrid;
isForce = force;
isChanging = changing;
}

3
src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
View File

@ -384,7 +384,8 @@ public final class XmlModuleDescriptorUpdater {
String rev = (String) resolvedRevisions.get(systemMrid);
if (rev != null) {
write(" rev=\"" + rev + "\"");
if (attributes.getIndex("revConstraint") == -1) {
if (attributes.getIndex("revConstraint") == -1
&& !rev.equals(systemMrid.getRevision())) {
write(" revConstraint=\"" + systemMrid.getRevision() + "\"");
}
} else {