svn commit: r1427565 - in /ant/ivy/core/branches/2.3.0: ./ src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java

[maartenc]

Author: maartenc
Date: Tue Jan  1 21:26:00 2013
New Revision: 1427565

URL: http://svn.apache.org/viewvc?rev=1427565&view=rev
Log:
Add '2.3' as allowed version in ivy.xml files. (merged from 2.3.x branch)

Modified:
    ant/ivy/core/branches/2.3.0/   (props changed)
    
ant/ivy/core/branches/2.3.0/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java

Propchange: ant/ivy/core/branches/2.3.0/
------------------------------------------------------------------------------
  Reverse-merged /ant/ivy/core/trunk:r695737,696014-696031,696442
  Merged /ant/ivy/core/branches/2.3.x:r1427564
  Merged /ant/ivy/core/trunk:r1427563

Modified: 
ant/ivy/core/branches/2.3.0/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.0/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java?rev=1427565&r1=1427564&r2=1427565&view=diff
==============================================================================
--- 
ant/ivy/core/branches/2.3.0/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
 (original)
+++ 
ant/ivy/core/branches/2.3.0/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
 Tue Jan  1 21:26:00 2013
@@ -207,7 +207,7 @@ public class XmlModuleDescriptorParser e
         }
 
         protected static final List ALLOWED_VERSIONS = Arrays.asList(
-            new String[] {"1.0", "1.1", "1.2", "1.3", "1.4", "2.0", "2.1", 
"2.2"});
+            new String[] {"1.0", "1.1", "1.2", "1.3", "1.4", "2.0", "2.1", 
"2.2", "2.3"});
 
         /* how and what do we have to parse */
         private ParserSettings settings;