From 7c0d68e08d528e64af70882de52804974990a651 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 6 Feb 2013 12:40:00 +0100
Subject: [PATCH 1/2] Don't require maven-plugin-annotations

---
 xmvn-mojo/pom.xml                                    |  5 -----
 .../maven/rpminstall/plugin/BuilddepMojo.java        | 15 ++++++++++-----
 .../maven/rpminstall/plugin/InstallMojo.java         | 20 ++++++++++++++------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/xmvn-mojo/pom.xml b/xmvn-mojo/pom.xml
index 61cfc4e..ef6f612 100644
--- a/xmvn-mojo/pom.xml
+++ b/xmvn-mojo/pom.xml
@@ -37,11 +37,6 @@
       <version>${mavenVersion}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.2</version>
-    </dependency>
-    <dependency>
       <groupId>org.fedoraproject.xmvn</groupId>
       <artifactId>xmvn-core</artifactId>
       <version>0.2.3</version>
diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/BuilddepMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/BuilddepMojo.java
index 0d16ced..baced1b 100644
--- a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/BuilddepMojo.java
+++ b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/BuilddepMojo.java
@@ -26,17 +26,22 @@ import org.apache.maven.model.Model;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 
-@Mojo( name = "builddep", aggregator = true, requiresDependencyResolution = ResolutionScope.TEST )
+/**
+ * @goal builddep
+ * @aggregator
+ * @requiresDependencyResolution test
+ */
 public class BuilddepMojo
     extends AbstractMojo
     implements DependencyVisitor
 {
-    @Parameter( defaultValue = "${reactorProjects}", readonly = true, required = true )
+    /**
+     * @parameter expression="${reactorProjects}"
+     * @readonly
+     * @required
+     */
     private List<MavenProject> reactorProjects;
 
     private final Set<String> buildDeps = new TreeSet<>();
diff --git a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
index 4d0ccf0..f35075b 100644
--- a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
+++ b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
@@ -29,21 +29,29 @@ import org.apache.maven.model.Model;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 import org.fedoraproject.maven.Configuration;
 import org.fedoraproject.maven.Rule;
 
-@Mojo( name = "install", aggregator = true, requiresDependencyResolution = ResolutionScope.NONE )
+/**
+ * @goal install
+ * @aggregator
+ */
 public class InstallMojo
     extends AbstractMojo
 {
-    @Parameter( defaultValue = "${project}", readonly = true, required = true )
+    /**
+     * @parameter expression="${project}"
+     * @readonly
+     * @required
+     */
     private MavenProject rootProject;
 
-    @Parameter( defaultValue = "${reactorProjects}", readonly = true, required = true )
+    /**
+     * @parameter default-value="${reactorProjects}"
+     * @readonly
+     * @required
+     */
     private List<MavenProject> reactorProjects;
 
     private void installProject( MavenProject project, Package targetPackage )
-- 
1.8.1