svn commit: r698324 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java

[maartenc]

Author: maartenc
Date: Tue Sep 23 13:03:04 2008
New Revision: 698324

URL: http://svn.apache.org/viewvc?rev=698324&view=rev
Log:
FIX: Ivy can't handle bare POM ${groupId} property (IVY-913) (thanks to Tom 
Widmer)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=698324&r1=698323&r2=698324&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Tue Sep 23 13:03:04 2008
@@ -71,6 +71,7 @@
        Jason Trump
        Tjeerd Verhagen
        James P. White
+       Tom Widmer
        John Williams
        Patrick Woodworth
        Jaroslaw Wypychowski
@@ -84,6 +85,7 @@
 - FIX: Cannot configure items with java.io.File attributes (IVY-905)
 - 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)
 
    2.0.0-rc1
 =====================================

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=698324&r1=698323&r2=698324&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 Sep 23 13:03:04 2008
@@ -190,8 +190,10 @@
             } else {                            
                 domReader.setProperty("project.groupId", groupId);
                 domReader.setProperty("pom.groupId", groupId);
+                domReader.setProperty("groupId", groupId);
                 domReader.setProperty("project.artifactId", artifactId);
                 domReader.setProperty("pom.artifactId", artifactId);
+                domReader.setProperty("artifactId", artifactId);
                 domReader.setProperty("project.version", version);
                 domReader.setProperty("pom.version", version);
                 domReader.setProperty("version", version);