Author: maartenc Date: Tue Sep 23 14:02:10 2008 New Revision: 698347 URL: http://svn.apache.org/viewvc?rev=698347&view=rev Log: Merged changes for IVY-914 from trunk.
Modified: ant/ivy/core/branches/2.0.x/ (props changed) ant/ivy/core/branches/2.0.x/CHANGES.txt ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom Propchange: ant/ivy/core/branches/2.0.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 23 14:02:10 2008 @@ -1 +1 @@ -/ant/ivy/core/trunk:695737,696014-696031,698324 +/ant/ivy/core/trunk:695737,696014-696031,698324,698345 Modified: ant/ivy/core/branches/2.0.x/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/CHANGES.txt?rev=698347&r1=698346&r2=698347&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/CHANGES.txt (original) +++ ant/ivy/core/branches/2.0.x/CHANGES.txt Tue Sep 23 14:02:10 2008 @@ -86,6 +86,7 @@ - FIX: Environment properties in ivy settings are no longer resolved (IVY-907) - FIX: Resolve failed on certain proxy environment (IVY-911) - FIX: Ivy can't handle bare POM ${groupId} property (IVY-913) (thanks to Tom Widmer) +- FIX: Properties needed to parse version in POM (IVY-914) (thanks to Tom Widmer) 2.0.0-rc1 Modified: ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java?rev=698347&r1=698346&r2=698347&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java (original) +++ ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java Tue Sep 23 14:02:10 2008 @@ -113,6 +113,13 @@ try { PomReader domReader = new PomReader(descriptorURL, res); domReader.setProperty("parent.version", domReader.getParentVersion()); + + 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()); + mdBuilder.addProperty((String) prop.getKey(), (String) prop.getValue()); + } ModuleDescriptor parentDescr = null; if (domReader.hasParent()) { @@ -198,13 +205,6 @@ domReader.setProperty("pom.version", version); domReader.setProperty("version", version); - 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()); - mdBuilder.addProperty((String) prop.getKey(), (String) prop.getValue()); - } - if (parentDescr != null) { mdBuilder.addExtraInfos(parentDescr.getExtraInfo()); Modified: ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom?rev=698347&r1=698346&r2=698347&view=diff ============================================================================== --- ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom (original) +++ ant/ivy/core/branches/2.0.x/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom Tue Sep 23 14:02:10 2008 @@ -21,7 +21,7 @@ <groupId>drools</groupId> <artifactId>drools-smf</artifactId> <name>Drools :: Semantics Module Framework</name> - <version>2.0-beta-18</version> + <version>${my-version}</version> <dependencies> <dependency> <groupId>${pom.groupId}</groupId> @@ -29,4 +29,7 @@ <version>${pom.version}</version> </dependency> </dependencies> + <properties> + <my-version>2.0-beta-18</my-version> + </properties> </project>