Repository: james-project Updated Branches: refs/heads/master 7882e36f5 -> d75a3b4d0
MAILET-123 Upgrade maven-plugin-* & use annotation in Mailetdocs mojo Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b303bc2d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b303bc2d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b303bc2d Branch: refs/heads/master Commit: b303bc2d577d5a31a6c475e5fa628dd9523ac2ff Parents: 2caf9c0 Author: Antoine Duprat <adup...@linagora.com> Authored: Wed Aug 31 17:34:44 2016 +0200 Committer: Antoine Duprat <adup...@apache.org> Committed: Tue Oct 25 10:33:25 2016 +0200 ---------------------------------------------------------------------- mailet/mailetdocs-maven-plugin/pom.xml | 9 ++++++++ .../james/mailet/AbstractMailetdocsReport.java | 22 +++++++------------- .../james/mailet/AggregateMailetdocsReport.java | 16 +++++++------- .../apache/james/mailet/MailetdocsReport.java | 7 ++++--- mailet/pom.xml | 8 ++++++- pom.xml | 2 +- 6 files changed, 37 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/b303bc2d/mailet/mailetdocs-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/pom.xml b/mailet/mailetdocs-maven-plugin/pom.xml index b529f03..71f263f 100644 --- a/mailet/mailetdocs-maven-plugin/pom.xml +++ b/mailet/mailetdocs-maven-plugin/pom.xml @@ -48,6 +48,11 @@ <artifactId>maven-plugin-api</artifactId> </dependency> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> </dependency> @@ -60,6 +65,10 @@ <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/b303bc2d/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java index efe5970..2aa31b7 100644 --- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java +++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AbstractMailetdocsReport.java @@ -27,6 +27,8 @@ import java.util.Locale; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Predicate; import org.apache.maven.doxia.siterenderer.Renderer; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.MavenReportException; @@ -42,25 +44,17 @@ public abstract class AbstractMailetdocsReport extends AbstractMavenReport { /** * Directory where reports will go. - * - * @parameter expression="${project.reporting.outputDirectory}" - * @required - * @readonly */ + @Parameter(defaultValue = "${project.reporting.outputDirectory}", + required = true) private String outputDirectory; - /** - * @parameter default-value="${project}" - * @required - * @readonly - */ + @Parameter(defaultValue = "${project}", + required = true, + readonly = true) private MavenProject project; - /** - * @component - * @required - * @readonly - */ + @Component private Renderer siteRenderer; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/b303bc2d/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java index 7be8886..3a55340 100644 --- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java +++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/AggregateMailetdocsReport.java @@ -21,6 +21,9 @@ package org.apache.james.mailet; import java.util.List; +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; @@ -35,17 +38,14 @@ import org.apache.maven.project.MavenProject; * <li>Should only used as a report.</li> * <li>Mailets are instantiated during report production. </li> * </ul> - * @goal aggregate - * @since 0.2 - * @requiresDependencyResolution compile - * @aggregator */ +@Mojo(name = "aggregate", + requiresDependencyResolution = ResolutionScope.COMPILE, + aggregator = true) public class AggregateMailetdocsReport extends AbstractMailetdocsReport { - /** - * @parameter expression="${reactorProjects}" - * @readonly - */ + @Parameter(defaultValue = "${reactorProjects}", + readonly = true) private List<MavenProject> reactorProjects; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/b303bc2d/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java ---------------------------------------------------------------------- diff --git a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java index d338d4e..575a86a 100644 --- a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java +++ b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/MailetdocsReport.java @@ -21,6 +21,8 @@ package org.apache.james.mailet; import java.util.List; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; @@ -31,10 +33,9 @@ import org.apache.maven.project.MavenProject; * <li>Should only used as a report.</li> * <li>Mailets are instantiated during report production. </li> * </ul> - * @goal mailetdocs - * @since 0.1 - * @requiresDependencyResolution compile */ +@Mojo(name = "mailetdocs", + requiresDependencyResolution = ResolutionScope.COMPILE) public class MailetdocsReport extends AbstractMailetdocsReport { /** http://git-wip-us.apache.org/repos/asf/james-project/blob/b303bc2d/mailet/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/pom.xml b/mailet/pom.xml index a7c1047..fa72cf6 100644 --- a/mailet/pom.xml +++ b/mailet/pom.xml @@ -50,7 +50,8 @@ <httpclient-osgi.version>4.5.1</httpclient-osgi.version> <!-- maven-mailetdocs-plugin artifacts --> <maven-artifact.version>3.0-alpha-1</maven-artifact.version> - <maven-plugin-api.version>3.0.4</maven-plugin-api.version> + <maven-plugin-annotations.version>3.4</maven-plugin-annotations.version> + <maven-plugin-api.version>3.2.5</maven-plugin-api.version> <maven-reporting-impl.version>2.2</maven-reporting-impl.version> <maven-reporting-api.version>3.0</maven-reporting-api.version> <qdox.version>1.12.1</qdox.version> @@ -111,6 +112,11 @@ <version>${maven-plugin-api.version}</version> </dependency> <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${maven-plugin-annotations.version}</version> + </dependency> + <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> <version>${maven-reporting-impl.version}</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/b303bc2d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2ebcc30..0d8adcf 100644 --- a/pom.xml +++ b/pom.xml @@ -724,7 +724,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.2</version> + <version>3.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
