diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
index 2c99934..56c5c04 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
@@ -45,13 +45,14 @@ public abstract class AbstractGeneratorMojo
      *
      * @parameter expression="${project}"
      * @required
+     * @readonly
      */
     protected MavenProject project;
 
     /**
      * The component used for scanning the source tree for mojos.
      *
-     * @parameter expression="${component.org.apache.maven.tools.plugin.scanner.MojoScanner}"
+     * @component
      * @required
      */
     protected MojoScanner mojoScanner;
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
index de2646c..120bd07 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
@@ -31,6 +31,7 @@ import java.io.File;
  *
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$
+ * @since 2.0
  * @goal descriptor
  * @phase generate-resources
  * @requiresDependencyResolution runtime
@@ -41,8 +42,7 @@ public class DescriptorGeneratorMojo
     /**
      * The directory where the generated plugin.xml file will be put.
      *
-     * @parameter expression="${project.build.outputDirectory}/META-INF/maven"
-     * @required
+     * @parameter default-value="${project.build.outputDirectory}/META-INF/maven"
      */
     protected File outputDirectory;
 
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
index f7f2aa1..e009800 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
@@ -40,8 +40,7 @@ public class HelpGeneratorMojo
     /**
      * The directory where the generated <code>HelpMojo</code> file will be put.
      *
-     * @parameter expression="${project.build.directory}/generated-sources/plugin"
-     * @required
+     * @parameter default-value="${project.build.directory}/generated-sources/plugin"
      */
     protected File outputDirectory;
 
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
index cb3d251..890788f 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
@@ -50,6 +50,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
  * @author <a href="snicoll@apache.org">Stephane Nicoll</a>
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
+ * @since 2.0
  * @goal report
  * @execute phase="compile"
  */
@@ -59,8 +60,7 @@ public class PluginReport
     /**
      * Report output directory.
      *
-     * @parameter expression="${project.build.directory}/generated-site/xdoc"
-     * @required
+     * @parameter default-value="${project.build.directory}/generated-site/xdoc"
      */
     private String outputDirectory;
 
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/UpdatePluginRegistryMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/UpdatePluginRegistryMojo.java
index 1137cfa..f8432f3 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/UpdatePluginRegistryMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/UpdatePluginRegistryMojo.java
@@ -42,6 +42,7 @@ import java.util.Date;
 /**
  * Update the user plugin registry (if it's in use) to reflect the version we're installing.
  *
+ * @since 2.0
  * @goal updateRegistry
  * @phase install
  * @version $Id$
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java
index 2d494d2..4b9902a 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/XdocGeneratorMojo.java
@@ -29,6 +29,7 @@ import java.io.File;
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
+ * @since 2.0
  * @goal xdoc
  */
 public class XdocGeneratorMojo
@@ -37,8 +38,7 @@ public class XdocGeneratorMojo
     /**
      * The directory where the generated Xdoc files will be put.
      *
-     * @parameter expression="${project.build.directory}/generated-site/xdoc"
-     * @required
+     * @parameter default-value="${project.build.directory}/generated-site/xdoc"
      */
     protected File outputDirectory;
 
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
index 85fb061..04439ad 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
@@ -33,6 +33,7 @@ import org.apache.maven.project.MavenProject;
  * and deployment. The first use-case for this is to add the LATEST metadata (which is plugin-specific)
  * for shipping alongside the plugin's artifact.
  *
+ * @since 2.0
  * @phase package
  * @goal addPluginArtifactMetadata
  */