|
 |
4590971 |
From 7c0d68e08d528e64af70882de52804974990a651 Mon Sep 17 00:00:00 2001
|
|
|
ebdff7f |
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
|
ebdff7f |
Date: Wed, 6 Feb 2013 12:40:00 +0100
|
|
|
9f3b9ac |
Subject: [PATCH 1/2] Don't require maven-plugin-annotations
|
|
|
ebdff7f |
|
|
|
ebdff7f |
---
|
|
|
ebdff7f |
xmvn-mojo/pom.xml | 5 -----
|
|
|
ebdff7f |
.../maven/rpminstall/plugin/BuilddepMojo.java | 15 ++++++++++-----
|
|
|
ebdff7f |
.../maven/rpminstall/plugin/InstallMojo.java | 20 ++++++++++++++------
|
|
|
ebdff7f |
3 files changed, 24 insertions(+), 16 deletions(-)
|
|
|
ebdff7f |
|
|
|
ebdff7f |
diff --git a/xmvn-mojo/pom.xml b/xmvn-mojo/pom.xml
|
|
|
ebdff7f |
index 61cfc4e..ef6f612 100644
|
|
|
ebdff7f |
--- a/xmvn-mojo/pom.xml
|
|
|
ebdff7f |
+++ b/xmvn-mojo/pom.xml
|
|
|
ebdff7f |
@@ -37,11 +37,6 @@
|
|
|
ebdff7f |
<version>${mavenVersion}</version>
|
|
|
ebdff7f |
</dependency>
|
|
|
ebdff7f |
<dependency>
|
|
|
ebdff7f |
- <groupId>org.apache.maven.plugin-tools</groupId>
|
|
|
ebdff7f |
- <artifactId>maven-plugin-annotations</artifactId>
|
|
|
ebdff7f |
- <version>3.2</version>
|
|
|
ebdff7f |
- </dependency>
|
|
|
ebdff7f |
- <dependency>
|
|
|
ebdff7f |
<groupId>org.fedoraproject.xmvn</groupId>
|
|
|
ebdff7f |
<artifactId>xmvn-core</artifactId>
|
|
|
ebdff7f |
<version>0.2.3</version>
|
|
|
ebdff7f |
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
|
|
|
9f3b9ac |
index 0d16ced..baced1b 100644
|
|
|
ebdff7f |
--- a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/BuilddepMojo.java
|
|
|
ebdff7f |
+++ b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/BuilddepMojo.java
|
|
|
ebdff7f |
@@ -26,17 +26,22 @@ import org.apache.maven.model.Model;
|
|
|
ebdff7f |
import org.apache.maven.plugin.AbstractMojo;
|
|
|
ebdff7f |
import org.apache.maven.plugin.MojoExecutionException;
|
|
|
ebdff7f |
import org.apache.maven.plugin.MojoFailureException;
|
|
|
ebdff7f |
-import org.apache.maven.plugins.annotations.Mojo;
|
|
|
ebdff7f |
-import org.apache.maven.plugins.annotations.Parameter;
|
|
|
ebdff7f |
-import org.apache.maven.plugins.annotations.ResolutionScope;
|
|
|
ebdff7f |
import org.apache.maven.project.MavenProject;
|
|
|
ebdff7f |
|
|
|
ebdff7f |
-@Mojo( name = "builddep", aggregator = true, requiresDependencyResolution = ResolutionScope.TEST )
|
|
|
ebdff7f |
+/**
|
|
|
ebdff7f |
+ * @goal builddep
|
|
|
ebdff7f |
+ * @aggregator
|
|
|
ebdff7f |
+ * @requiresDependencyResolution test
|
|
|
ebdff7f |
+ */
|
|
|
ebdff7f |
public class BuilddepMojo
|
|
|
ebdff7f |
extends AbstractMojo
|
|
|
ebdff7f |
implements DependencyVisitor
|
|
|
ebdff7f |
{
|
|
|
ebdff7f |
- @Parameter( defaultValue = "${reactorProjects}", readonly = true, required = true )
|
|
|
ebdff7f |
+ /**
|
|
|
ebdff7f |
+ * @parameter expression="${reactorProjects}"
|
|
|
ebdff7f |
+ * @readonly
|
|
|
ebdff7f |
+ * @required
|
|
|
ebdff7f |
+ */
|
|
|
ebdff7f |
private List<MavenProject> reactorProjects;
|
|
|
ebdff7f |
|
|
|
ebdff7f |
private final Set<String> buildDeps = new TreeSet<>();
|
|
|
ebdff7f |
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
|
|
|
9f3b9ac |
index 4d0ccf0..f35075b 100644
|
|
|
ebdff7f |
--- a/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
|
|
|
ebdff7f |
+++ b/xmvn-mojo/src/main/java/org/fedoraproject/maven/rpminstall/plugin/InstallMojo.java
|
|
|
ebdff7f |
@@ -29,21 +29,29 @@ import org.apache.maven.model.Model;
|
|
|
ebdff7f |
import org.apache.maven.plugin.AbstractMojo;
|
|
|
ebdff7f |
import org.apache.maven.plugin.MojoExecutionException;
|
|
|
ebdff7f |
import org.apache.maven.plugin.MojoFailureException;
|
|
|
ebdff7f |
-import org.apache.maven.plugins.annotations.Mojo;
|
|
|
ebdff7f |
-import org.apache.maven.plugins.annotations.Parameter;
|
|
|
ebdff7f |
-import org.apache.maven.plugins.annotations.ResolutionScope;
|
|
|
ebdff7f |
import org.apache.maven.project.MavenProject;
|
|
|
ebdff7f |
import org.fedoraproject.maven.Configuration;
|
|
|
ebdff7f |
import org.fedoraproject.maven.Rule;
|
|
|
ebdff7f |
|
|
|
ebdff7f |
-@Mojo( name = "install", aggregator = true, requiresDependencyResolution = ResolutionScope.NONE )
|
|
|
ebdff7f |
+/**
|
|
|
ebdff7f |
+ * @goal install
|
|
|
ebdff7f |
+ * @aggregator
|
|
|
ebdff7f |
+ */
|
|
|
ebdff7f |
public class InstallMojo
|
|
|
ebdff7f |
extends AbstractMojo
|
|
|
ebdff7f |
{
|
|
|
ebdff7f |
- @Parameter( defaultValue = "${project}", readonly = true, required = true )
|
|
|
ebdff7f |
+ /**
|
|
|
ebdff7f |
+ * @parameter expression="${project}"
|
|
|
ebdff7f |
+ * @readonly
|
|
|
ebdff7f |
+ * @required
|
|
|
ebdff7f |
+ */
|
|
|
ebdff7f |
private MavenProject rootProject;
|
|
|
ebdff7f |
|
|
|
ebdff7f |
- @Parameter( defaultValue = "${reactorProjects}", readonly = true, required = true )
|
|
|
ebdff7f |
+ /**
|
|
|
ebdff7f |
+ * @parameter default-value="${reactorProjects}"
|
|
|
ebdff7f |
+ * @readonly
|
|
|
ebdff7f |
+ * @required
|
|
|
ebdff7f |
+ */
|
|
|
ebdff7f |
private List<MavenProject> reactorProjects;
|
|
|
ebdff7f |
|
|
|
ebdff7f |
private void installProject( MavenProject project, Package targetPackage )
|
|
|
ebdff7f |
--
|
|
|
ebdff7f |
1.8.1
|
|
|
ebdff7f |
|