*** empty log message ***

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163279 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/GoalAttainmentPhase.java

@@ -124,6 +124,14 @@ public class GoalAttainmentPhase
 
                 Object value = PluginParameterExpressionEvaluator.evaluate( expression, context );
 
+                if ( value == null )
+                {
+                    if ( parameter.getDefaultValue() != null )
+                    {
+                        value = parameter.getDefaultValue();
+                    }
+                }
+
                 map.put( key, value );
             }
 

maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/AbstractGenerator.java

@@ -264,6 +264,8 @@ public abstract class AbstractGenerator
 
             pd.setDescription( parameter.getNamedParameter( "description" ) );
 
+            pd.setDefaultValue( parameter.getNamedParameter( "default" ) );
+
             parameters.add( pd );
         }
 

maven-plugin-tools/src/main/java/org/apache/maven/plugin/generator/PluginDescriptorGenerator.java

@@ -152,7 +152,7 @@ public class PluginDescriptorGenerator
 
             element( w, "description", parameter.getDescription() );
 
-            element( w, "defaultValue", parameter.getDefaultValue() );
+            element( w, "default", parameter.getDefaultValue() );
 
             w.endElement();
         }