ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xav...@apache.org
Subject svn commit: r619514 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java test/java/org/apache/ivy/ant/IvyInfoTest.java
Date Thu, 07 Feb 2008 17:22:22 GMT
Author: xavier
Date: Thu Feb  7 09:22:12 2008
New Revision: 619514

URL: http://svn.apache.org/viewvc?rev=619514&view=rev
Log:
FIX: Branch attribute considered as both a standard and extra attribute on module info (IVY-726)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
    ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInfoTest.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=619514&r1=619513&r2=619514&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Thu Feb  7 09:22:12 2008
@@ -78,6 +78,7 @@
 - IMPROVEMENT: Downgrade Ant version requirement to 1.6 to build Ivy (IVY-687)
 - IMPROVEMENT: In the ResolveReport class, add the possibility to filter the evicted module
while getting the list of DownloadArtifact (IVY-704) (thanks to Nicolas Lalevée)
 
+- FIX: Branch attribute considered as both a standard and extra attribute on module info
(IVY-726)
 - FIX: Branch attribute not set on deliver when using a non default branch (IVY-724)
 - FIX: NullPointerException reported instead of error in ivy:cachepath (IVY-690)
 - FIX: NPE when calling retrieve if some artifacts are not available locally (IVY-712)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java?rev=619514&r1=619513&r2=619514&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
Thu Feb  7 09:22:12 2008
@@ -533,7 +533,7 @@
             md.setModuleRevisionId(ModuleRevisionId.newInstance(org, module, branch,
                 revision, ExtendableItemHelper.getExtraAttributes(attributes, new String[]
{
                         "organisation", "module", "revision", "status", "publication",
-                        "namespace", "default", "resolver"})));
+                        "branch", "namespace", "default", "resolver"})));
 
             String namespace = ivy.substitute(attributes.getValue("namespace"));
             if (namespace != null) {

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInfoTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInfoTest.java?rev=619514&r1=619513&r2=619514&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInfoTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/ant/IvyInfoTest.java Thu Feb  7 09:22:12 2008
@@ -58,4 +58,11 @@
         assertEquals("myvalue", info.getProject().getProperty("ivy.extra.myextraatt"));
     }
 
+    public void testIVY726() throws Exception {
+        info.setFile(new File("test/java/org/apache/ivy/ant/ivy-info-all.xml"));
+        info.execute();
+        
+        assertTrue(info.getProject().getProperty("ivy.extra.branch") == null);
+    }
+
 }



Mime
View raw message