Author Login
Post Reply
On Feb 19, 2008 10:03 PM, <gscokart@(protected):
> Author: gscokart
> Date: Tue Feb 19 13:03:21 2008
> New Revision: 629230
>
> URL: http://svn.apache.org/viewvc?rev=629230&view=rev
> Log:
> IVY-637 m2 incompatibility - IVY does not recognize property section
> (partial fix, the case of properties inherited from parent is not yet
> covered
>
> Modified:
>
> ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
>
> ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
>
> ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParserTest.java
> ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-
> version.pom
>
> Modified:
> ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
> URL:
> http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java?rev=629230&r1=629229&r2=629230&view=diff
>
> ==============================================================================
> ---
> ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
> (original)
> +++
> ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
> Tue Feb 19 13:03:21 2008
> @@(protected) @@
> import java.text.ParseException;
> import java.util.Date;
> import java.util.Iterator;
> +import java.util.Map;
>
> import org.apache.ivy.core.IvyContext;
> import org.apache.ivy.core.module.descriptor.Artifact;
> @@(protected) @@
> parentModRevID);
> parentDescr = parentModule.getDescriptor();
> }
> +
> + Map pomProperties = domReader.getPomProperties();
> + for (Iterator iter = pomProperties.entrySet().iterator();
> iter.hasNext();) {
> + Map.Entry prop = (Map.Entry) iter.next();
> + domReader.setProperty((String) prop.getKey(),
> (String) prop.getValue());
> + }
> + //TODO add also the properties to the moduleDescriptor so
> that it can be inherited
Sounds like we'll finally need properties in module descriptors (I'll get my
0.01++ :-) )
Xavier
--
Xavier Hanin - Independent Java Consultant
http://xhab.blogspot.com/
http://ant.apache.org/ivy/
http://www.xoocode.org/