svn commit: r698327 - in /ant/ivy/core/branches/2.0.x: ./ CHANGES.txt src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java

[maartenc]

Author: maartenc
Date: Tue Sep 23 13:08:19 2008
New Revision: 698327

URL: http://svn.apache.org/viewvc?rev=698327&view=rev
Log:
Merged fix for IVY-913 from trunk into 2.0.x branch

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

Propchange: ant/ivy/core/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 23 13:08:19 2008
@@ -1 +1 @@
-/ant/ivy/core/trunk:695737,696014-696031
+/ant/ivy/core/trunk:695737,696014-696031,698324

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=698327&r1=698326&r2=698327&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.0.x/CHANGES.txt Tue Sep 23 13:08:19 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/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=698327&r1=698326&r2=698327&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 13:08:19 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);