[MECLIPSE-758] Use mojo annotations

 Patch of Joseph Walton applied.


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

Author: khmarbaise

pom.xml

@@ -76,6 +76,11 @@ under the License.
       <artifactId>maven-plugin-api</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
@@ -282,10 +287,9 @@ under the License.
     </pluginManagement>
     <plugins>
       <plugin>
-        <!-- lock down to old version as newer version aborts build upon no mojos as required during ITs, see FIXME below -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>3.4</version>
       </plugin>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>

src/main/java/org/apache/maven/plugin/eclipse/AbstractWorkspaceMojo.java

@@ -20,27 +20,19 @@
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Parameter;
 
-/**
- * @requiresProject true
- */
 public abstract class AbstractWorkspaceMojo
     extends AbstractMojo
 {
 
     /**
      * Directory location of the <code>Eclipse</code> workspace.
-     * 
-     * @parameter expression="${eclipse.workspace}"
-     * @required
      */
+    @Parameter( property = "eclipse.workspace", required = true )
     private String workspace;
 
-    /**
-     * @parameter expression="${localRepository}"
-     * @required
-     * @readonly
-     */
+    @Parameter( property = "localRepository", required = true, readonly = true )
     private ArtifactRepository localRepository;
 
     public ArtifactRepository getLocalRepository()

src/main/java/org/apache/maven/plugin/eclipse/ConfigureWorkspaceMojo.java

@@ -20,33 +20,31 @@
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.eclipse.writers.workspace.EclipseWorkspaceWriter;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 
 /**
  * Configures The following Eclipse Workspace features:
  * <ul>
  * <li>Adds the classpath variable MAVEN_REPO to Eclipse.</li>
  * <li>Optionally load Eclipse code style file via a URL.</li>
  * </ul>
- * 
- * @goal configure-workspace
- * @requiresProject false
  */
+@Mojo( name = "configure-workspace", requiresProject = false )
 public class ConfigureWorkspaceMojo
     extends AbstractWorkspaceMojo
 {
     /**
      * Point to a URL containing code styles content.
-     * 
-     * @parameter expression="${eclipse.workspaceCodeStylesURL}"
      */
+    @Parameter( property = "eclipse.workspaceCodeStylesURL" )
     private String workspaceCodeStylesURL;
 
     /**
      * Name of a profile in <code>workspaceCodeStylesURL</code> to activate. Default is the first profile name in the
      * code style file in <code>workspaceCodeStylesURL</code>
-     * 
-     * @parameter expression="${eclipse.workspaceActiveCodeStyleProfileName}"
      */
+    @Parameter( property = "eclipse.workspaceActiveCodeStyleProfileName" )
     private String workspaceActiveCodeStyleProfileName;
 
     public void execute()

src/main/java/org/apache/maven/plugin/eclipse/EclipseCleanMojo.java

@@ -22,14 +22,15 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.eclipse.writers.workspace.EclipseWorkspaceWriter;
 import org.apache.maven.plugin.ide.IdeUtils;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 
 import java.io.File;
 
 /**
  * Deletes the .project, .classpath, .wtpmodules files and .settings folder used by Eclipse.
- *
- * @goal clean
  */
+@Mojo( name = "clean" )
 public class EclipseCleanMojo
     extends AbstractMojo
 {
@@ -51,30 +52,26 @@ public class EclipseCleanMojo
 
     /**
      * Packaging for the current project.
-     *
-     * @parameter expression="${project.packaging}"
      */
+    @Parameter( property = "project.packaging" )
     private String packaging;
 
     /**
      * The root directory of the project
-     *
-     * @parameter expression="${basedir}"
      */
+    @Parameter( property = "basedir" )
     private File basedir;
 
     /**
      * Skip the operation when true.
-     *
-     * @parameter expression="${eclipse.skip}" default-value="false"
      */
+    @Parameter( property = "eclipse.skip", defaultValue = "false" )
     private boolean skip;
 
     /**
      * additional generic configuration files for eclipse
-     *
-     * @parameter
      */
+    @Parameter
     private EclipseConfigFile[] additionalConfig;
 
     /**