svn commit: r551837 - in /incubator/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom

[xavier]

Author: xavier
Date: Fri Jun 29 02:43:27 2007
New Revision: 551837

URL: http://svn.apache.org/viewvc?view=rev&rev=551837
Log:
FIX: pom.groupId is not recognized in maven 2 pom parser (IVY-550)

Modified:
    incubator/ivy/core/trunk/CHANGES.txt
    
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
    
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom

Modified: incubator/ivy/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=551837&r1=551836&r2=551837
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Fri Jun 29 02:43:27 2007
@@ -63,6 +63,7 @@
 - IMPROVEMENT: Javadoc improvements (IVY-544) (with contribution from Tjeerd 
Verhagen)
 - IMPROVEMENT: Unit test improvements (IVY-545) (thanks to Tjeerd Verhagen)
 
+- FIX: pom.groupId is not recognized in maven 2 pom parser (IVY-550)
 - FIX: Evicted modules report depends on the order of the dependencies 
(IVY-526)
 - FIX: Ivy does not work on Turkish machines (IVY-65)
 - FIX: Ivy does not handle multiple version dependencies in maven2 poms 
correctly (IVY-494)

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java?view=diff&rev=551837&r1=551836&r2=551837
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
 (original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
 Fri Jun 29 02:43:27 2007
@@ -197,7 +197,9 @@
             }
             ModuleRevisionId mrid = ModuleRevisionId.newInstance(organisation, 
module, revision);
             properties.put("project.groupId", organisation);
+            properties.put("pom.groupId", organisation);
             properties.put("project.artifactId", module);
+            properties.put("pom.artifactId", module);
             properties.put("project.version", revision);
             properties.put("pom.version", revision);
             properties.put("version", revision);

Modified: 
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom?view=diff&rev=551837&r1=551836&r2=551837
==============================================================================
--- 
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom
 (original)
+++ 
incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/m2/test-properties.pom
 Fri Jun 29 02:43:27 2007
@@ -24,7 +24,7 @@
   <version>2.0-beta-18</version>
   <dependencies>
     <dependency>
-      <groupId>drools</groupId>
+      <groupId>${pom.groupId}</groupId>
       <artifactId>drools-core</artifactId>
       <version>${pom.version}</version>
     </dependency>