You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/11/14 07:08:21 UTC

svn commit: r713920 - /maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

Author: sisbell
Date: Thu Nov 13 22:08:21 2008
New Revision: 713920

URL: http://svn.apache.org/viewvc?rev=713920&view=rev
Log:
Fix for when interpolation key is ${project.groupId}, when no groupId is present.

Modified:
    maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

Modified: maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=713920&r1=713919&r2=713920&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original)
+++ maven/components/branches/sisbell-maven-3.0-mercury/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Thu Nov 13 22:08:21 2008
@@ -509,7 +509,7 @@
                                            DomainModel domainModel)
             throws IOException
     {
-        interpolateModelProperties( modelProperties, interpolatorProperties, (PomClassicDomainModel) domainModel);
+        interpolateModelProperties( new ArrayList<ModelProperty>(modelProperties), interpolatorProperties, (PomClassicDomainModel) domainModel);
     }
 
     public static String interpolateXmlString( String xml, List<InterpolatorProperty> interpolatorProperties )
@@ -605,6 +605,11 @@
             aliases.put("\\$\\{project.version\\}", "\\$\\{version\\}");
         }
 
+        if(!interpolatorProperties.contains(new InterpolatorProperty("${project.groupId}", ""))) {
+            interpolatorProperties.add(new InterpolatorProperty("${project.groupId}", 
+                    interpolatorProperties.get(interpolatorProperties.indexOf(new InterpolatorProperty("${project.parent.groupId}", ""))).getValue()));
+        }
+        
         List<ModelProperty> firstPassModelProperties = new ArrayList<ModelProperty>();
         List<ModelProperty> secondPassModelProperties = new ArrayList<ModelProperty>();