ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r632990 - in /ant/ivy/core/trunk/src/java/org/apache/ivy: core/module/descriptor/DefaultDependencyDescriptor.java plugins/parser/xml/XmlModuleDescriptorUpdater.java
Date Mon, 03 Mar 2008 08:57:07 GMT
Author: xavier
Date: Mon Mar  3 00:57:06 2008
New Revision: 632990

URL: http://svn.apache.org/viewvc?rev=632990&view=rev
Log:
fix failing tests due to IVY-739 changes

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java?rev=632990&r1=632989&r2=632990&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java
Mon Mar  3 00:57:06 2008
@@ -203,6 +203,7 @@
     public DefaultDependencyDescriptor(ModuleRevisionId mrid, boolean force, boolean changing)
{
         md = null;
         revId = mrid;
+        dynamicRevId = mrid;
         isForce = force;
         isChanging = changing;
     }

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java?rev=632990&r1=632989&r2=632990&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
Mon Mar  3 00:57:06 2008
@@ -384,7 +384,8 @@
                     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 {



Mime
View raw message