svn commit: r713052 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

[be...@apache.org]

Author: bentmann
Date: Tue Nov 11 06:44:19 2008
New Revision: 713052

URL: http://svn.apache.org/viewvc?rev=713052&view=rev
Log:
[MNG-3831] Expressions without project/pom prefix are no longer interpolated with model values

Modified:
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java?rev=713052&r1=713051&r2=713052&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java Tue Nov 11 06:44:19 2008
@@ -590,28 +590,35 @@
         return false;
     }
 
-    private static void putProjectAliasIn(Map<String, String> map, String s)
+    private static final Map<String, String> aliases = new HashMap<String, String>();
+
+    private static void addProjectAlias( String element, boolean leaf )
     {
-        map.put( "\\$\\{project." + s + "\\}", "\\$\\{" + s + "\\}");
+        String suffix = leaf ? "\\}" : "\\.";
+        aliases.put( "\\$\\{project\\." + element + suffix, "\\$\\{" + element + suffix );
     }
 
-    private static Map<String, String> aliases = new HashMap<String, String>();
-
     static
     {
-        aliases.put( "project.", "pom.");
-        aliases.put( "\\$\\{project.build.", "\\$\\{build.");
-
-        List<String> aliasList = Arrays.asList("artifactId", "groupId", "version", "packaging", "name", "description",
-            "url", "inceptionYear", "scm.url", "ciManagement.url",
-            "distributionManagement.repository.name",
-            "distributionManagement.site.url",
-            "reporting.outputDirectory", "parent.groupId", "parent.artifactId",
-            "parent.version", "prerequisites.maven", "issueManagement.url", "organization.name");
-        for(String alias : aliasList) {
-            putProjectAliasIn(aliases, alias);
-        }
-
+        aliases.put( "\\$\\{project\\.", "\\$\\{pom\\.");
+        addProjectAlias( "modelVersion", true );
+        addProjectAlias( "groupId", true );
+        addProjectAlias( "artifactId", true );
+        addProjectAlias( "version", true );
+        addProjectAlias( "packaging", true );
+        addProjectAlias( "name", true );
+        addProjectAlias( "description", true );
+        addProjectAlias( "inceptionYear", true );
+        addProjectAlias( "url", true );
+        addProjectAlias( "parent", false );
+        addProjectAlias( "prerequisites", false );
+        addProjectAlias( "organization", false );
+        addProjectAlias( "build", false );
+        addProjectAlias( "reporting", false );
+        addProjectAlias( "scm", false );
+        addProjectAlias( "distributionManagement", false );
+        addProjectAlias( "issueManagement", false );
+        addProjectAlias( "ciManagement", false );
     }
 
     private static void interpolateModelProperties(List<ModelProperty> modelProperties,