Author: tchemit Date: Tue Jul 10 16:57:48 2012 New Revision: 1359783 URL: http://svn.apache.org/viewvc?rev=1359783&view=rev Log: [MPIR-246] use maven-plugin-tools' java 5 annotations + reformat mojo code
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Tue Jul 10 16:57:48 2012 @@ -155,6 +155,13 @@ under the License. <version>1.1</version> </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>3.1</version> + <scope>compile</scope> + </dependency> + <!-- Wagon --> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -364,6 +371,14 @@ under the License. </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>3.1</version> + <configuration> + <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>keytool-maven-plugin</artifactId> <version>1.0</version> @@ -408,6 +423,18 @@ under the License. </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <executions> + <execution> + <id>mojo-descriptor</id> + <goals> + <goal>descriptor</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>keytool-maven-plugin</artifactId> <executions> Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Tue Jul 10 16:57:48 2012 @@ -33,6 +33,8 @@ import org.apache.maven.doxia.siterender import org.apache.maven.doxia.tools.SiteTool; import org.apache.maven.doxia.tools.SiteToolException; import org.apache.maven.plugin.MojoExecutionException; +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; @@ -80,36 +82,32 @@ public abstract class AbstractProjectInf * SiteTool component. * * @since 2.1 - * @component */ + @Component protected SiteTool siteTool; /** * Doxia Site Renderer component. - * - * @component */ + @Component protected Renderer siteRenderer; /** * Artifact Resolver component. - * - * @component */ + @Component protected ArtifactResolver resolver; /** * Artifact Factory component. - * - * @component */ + @Component protected ArtifactFactory factory; /** * Internationalization component, could support also custom bundle using {@link #customBundle}. - * - * @component */ + @Component private I18N i18n; // ---------------------------------------------------------------------- @@ -120,55 +118,45 @@ public abstract class AbstractProjectInf * The output directory for the report. Note that this parameter is only evaluated if the goal is run directly from * the command line. If the goal is run indirectly as part of a site generation, the output directory configured in * the Maven Site Plugin is used instead. - * - * @parameter expression="${project.reporting.outputDirectory}" - * @required */ + @Parameter( property = "project.reporting.outputDirectory", required = true ) protected File outputDirectory; /** * The Maven Project. - * - * @parameter expression="${project}" - * @required - * @readonly */ + @Component protected MavenProject project; /** * Local Repository. - * - * @parameter expression="${localRepository}" - * @required - * @readonly */ + @Parameter( property = "localRepository", required = true, readonly = true ) protected ArtifactRepository localRepository; /** * Remote repositories used for the project. * * @since 2.1 - * @parameter expression="${project.remoteArtifactRepositories}" */ + @Parameter( property = "project.remoteArtifactRepositories" ) protected List<ArtifactRepository> remoteRepositories; /** * The current user system settings for use in Maven. * - * @parameter expression="${settings}" - * @required - * @readonly * @since 2.3 */ + @Component protected Settings settings; /** * Path for a custom bundle instead of using the default one. <br/> * Using this field, you could change the texts in the generated reports. * - * @parameter expression="${project.basedir}/src/site/custom/project-info-report.properties" * @since 2.3 */ + @Parameter( defaultValue = "${project.basedir}/src/site/custom/project-info-report.properties" ) protected String customBundle; // ---------------------------------------------------------------------- Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java Tue Jul 10 16:57:48 2012 @@ -23,6 +23,7 @@ import org.apache.maven.doxia.sink.Sink; import org.apache.maven.model.CiManagement; import org.apache.maven.model.Model; import org.apache.maven.model.Notifier; +import org.apache.maven.plugins.annotations.Mojo; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.StringUtils; @@ -35,8 +36,8 @@ import java.util.Locale; * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.0 - * @goal cim */ +@Mojo( name = "cim" ) public class CimReport extends AbstractProjectInfoReport { Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Tue Jul 10 16:57:48 2012 @@ -19,14 +19,6 @@ package org.apache.maven.report.projecti * under the License. */ -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.LineNumberReader; -import java.util.Locale; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.manager.WagonManager; @@ -34,18 +26,30 @@ import org.apache.maven.artifact.metadat import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter; +import org.apache.maven.plugins.annotations.Component; +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.MavenProjectBuilder; import org.apache.maven.report.projectinfo.dependencies.Dependencies; import org.apache.maven.report.projectinfo.dependencies.DependenciesReportConfiguration; import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils; import org.apache.maven.report.projectinfo.dependencies.renderer.DependenciesRenderer; -import org.apache.maven.shared.dependency.graph.DependencyNode; import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder; import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException; +import org.apache.maven.shared.dependency.graph.DependencyNode; import org.apache.maven.shared.jar.classes.JarClassesAnalysis; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.util.Locale; + /** * Generates the Project Dependencies report. * @@ -53,13 +57,14 @@ import org.codehaus.plexus.util.ReaderFa * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.0 - * @goal dependencies - * @requiresDependencyResolution test */ +@Mojo( name = "dependencies", requiresDependencyResolution = ResolutionScope.TEST ) public class DependenciesReport extends AbstractProjectInfoReport { - /** Images resources dir */ + /** + * Images resources dir + */ private static final String RESOURCES_DIR = "org/apache/maven/report/projectinfo/resources"; // ---------------------------------------------------------------------- @@ -68,56 +73,54 @@ public class DependenciesReport /** * Maven Project Builder component. - * - * @component */ + @Component private MavenProjectBuilder mavenProjectBuilder; /** * Artifact metadata source component. - * - * @component */ + @Component protected ArtifactMetadataSource artifactMetadataSource; /** * Wagon manager component. * * @since 2.1 - * @component */ + @Component private WagonManager wagonManager; /** * Dependency graph builder component. * * @since 2.5 - * @component role-hint="default" */ + @Component( hint = "default" ) private DependencyGraphBuilder dependencyGraphBuilder; /** * Jar classes analyzer component. * * @since 2.1 - * @component */ + @Component private JarClassesAnalysis classesAnalyzer; /** * Repository metadata component. * * @since 2.1 - * @component */ + @Component private RepositoryMetadataManager repositoryMetadataManager; /** * Maven Artifact Factory component. * - * @component * @since 2.1 */ + @Component private ArtifactFactory artifactFactory; // ---------------------------------------------------------------------- @@ -129,8 +132,8 @@ public class DependenciesReport * classes, number of packages etc. * * @since 2.1 - * @parameter expression="${dependency.details.enabled}" default-value="true" */ + @Parameter( property = "dependency.details.enabled", defaultValue = "true" ) private boolean dependencyDetailsEnabled; /** @@ -138,11 +141,10 @@ public class DependenciesReport * will be ignored. * * @since 2.1 - * @parameter expression="${dependency.locations.enabled}" default-value="true" */ + @Parameter( property = "dependency.locations.enabled", defaultValue = "true" ) private boolean dependencyLocationsEnabled; - // ---------------------------------------------------------------------- // Public methods // ---------------------------------------------------------------------- @@ -165,12 +167,10 @@ public class DependenciesReport getLog().error( "Cannot copy ressources", e ); } - @SuppressWarnings( "unchecked" ) - RepositoryUtils repoUtils = - new RepositoryUtils( getLog(), wagonManager, settings, - mavenProjectBuilder, factory, resolver, project.getRemoteArtifactRepositories(), - project.getPluginArtifactRepositories(), localRepository, - repositoryMetadataManager ); + @SuppressWarnings( "unchecked" ) RepositoryUtils repoUtils = + new RepositoryUtils( getLog(), wagonManager, settings, mavenProjectBuilder, factory, resolver, + project.getRemoteArtifactRepositories(), project.getPluginArtifactRepositories(), + localRepository, repositoryMetadataManager ); DependencyNode dependencyNode = resolveProject(); @@ -186,7 +186,9 @@ public class DependenciesReport r.render(); } - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ public String getOutputName() { return "dependencies"; Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java Tue Jul 10 16:57:48 2012 @@ -23,6 +23,8 @@ import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; import org.apache.maven.model.Dependency; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.util.StringUtils; @@ -43,9 +45,8 @@ import java.util.TreeMap; * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.0 - * @goal dependency-convergence - * @aggregator */ +@Mojo( name = "dependency-convergence", aggregator = true ) public class DependencyConvergenceReport extends AbstractProjectInfoReport { @@ -58,11 +59,8 @@ public class DependencyConvergenceReport /** * The projects in the current build. The effective-POM for * each of these projects will written. - * - * @parameter expression="${reactorProjects}" - * @required - * @readonly */ + @Parameter( property = "reactorProjects", required = true, readonly = true ) private List<MavenProject> reactorProjects; // ---------------------------------------------------------------------- Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java Tue Jul 10 16:57:48 2012 @@ -1,20 +1,22 @@ package org.apache.maven.report.projectinfo; -import java.util.Formatter; -import java.util.Locale; - import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.i18n.I18N; +import java.util.Formatter; +import java.util.Locale; + /** * Generates the Dependency code snippets to be added to build tools. * * @author <a href="mailto:simonetrip...@apache.org">Simone Tripodi</a> * @version $Id$ * @since 2.4.1 - * @goal dependency-info */ +@Mojo( name = "dependency-info" ) public final class DependencyInformationReport extends AbstractProjectInfoReport { @@ -24,27 +26,23 @@ public final class DependencyInformation private static final String JAR_PACKAGING = "jar"; /** - * @parameter default-value="${project.groupId}" - * @required */ + @Parameter( defaultValue = "${project.groupId}", required = true ) protected String groupId; /** - * @parameter default-value="${project.artifactId}" - * @required */ + @Parameter( defaultValue = "${project.artifactId}", required = true ) protected String artifactId; /** - * @parameter default-value="${project.version}" - * @required */ + @Parameter( defaultValue = "${project.version}", required = true ) protected String version; /** - * @parameter default-value="${project.packaging}" - * @required */ + @Parameter( defaultValue = "${project.packaging", required = true ) protected String packaging; // ---------------------------------------------------------------------- @@ -75,16 +73,15 @@ public final class DependencyInformation protected void executeReport( Locale locale ) throws MavenReportException { - new DependencyInformationRenderer( getSink(), getI18N( locale ), locale, - groupId, artifactId, version, packaging ) - .render(); + new DependencyInformationRenderer( getSink(), getI18N( locale ), locale, groupId, artifactId, version, + packaging ).render(); } // ---------------------------------------------------------------------- // Private // ---------------------------------------------------------------------- - private static final class DependencyInformationRenderer + private static final class DependencyInformationRenderer extends AbstractProjectInfoRenderer { @@ -96,8 +93,8 @@ public final class DependencyInformation private final String packaging; - public DependencyInformationRenderer( Sink sink, I18N i18n, Locale locale, - String groupId, String artifactId, String version, String packaging ) + public DependencyInformationRenderer( Sink sink, I18N i18n, Locale locale, String groupId, String artifactId, + String version, String packaging ) { super( sink, i18n, locale ); this.groupId = groupId; @@ -123,11 +120,9 @@ public final class DependencyInformation { startSection( getTitle() ); - Formatter mavenDependency = new Formatter() - .format( "<dependency>%n" ) - .format( " <groupId>%s</groupId>%n", groupId ) - .format( " <artifactId>%s</artifactId>%n", artifactId ) - .format( " <version>%s</version>%n", version ); + Formatter mavenDependency = + new Formatter().format( "<dependency>%n" ).format( " <groupId>%s</groupId>%n", groupId ).format( + " <artifactId>%s</artifactId>%n", artifactId ).format( " <version>%s</version>%n", version ); if ( !JAR_PACKAGING.equals( packaging ) ) { @@ -136,26 +131,20 @@ public final class DependencyInformation renderDependencyInfo( "Apache Maven", mavenDependency.format( "</dependency>" ) ); - renderDependencyInfo( "Apache Buildr", new Formatter().format( "'%s:%s:%s:%s'", - groupId, artifactId, packaging, version ) ); + renderDependencyInfo( "Apache Buildr", + new Formatter().format( "'%s:%s:%s:%s'", groupId, artifactId, packaging, version ) ); + + renderDependencyInfo( "Apache Ant", + new Formatter().format( "<dependency org=\"%s\" name=\"%s\" rev=\"%s\">%n", groupId, + artifactId, version ).format( + " <artifact name=\"%s\" type=\"%s\" />%n", artifactId, packaging ).format( + "</dependency>" ) ); - renderDependencyInfo( "Apache Ant", new Formatter() - .format( "<dependency org=\"%s\" name=\"%s\" rev=\"%s\">%n", - groupId, artifactId, version ) - .format( " <artifact name=\"%s\" type=\"%s\" />%n", - artifactId, packaging ) - .format( "</dependency>" ) ); - - renderDependencyInfo( "Groovy Grape", new Formatter() - .format( "@Grapes(%n" ) - .format( "@Grab(group='%s', module='%s', version='%s')%n", - groupId, - artifactId, - version ) - .format( ")" ) ); + renderDependencyInfo( "Groovy Grape", new Formatter().format( "@Grapes(%n" ).format( + "@Grab(group='%s', module='%s', version='%s')%n", groupId, artifactId, version ).format( ")" ) ); - renderDependencyInfo( "Grails", new Formatter().format( "compile '%s:%s:%s'", - groupId, artifactId, version ) ); + renderDependencyInfo( "Grails", + new Formatter().format( "compile '%s:%s:%s'", groupId, artifactId, version ) ); // Leiningen Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java Tue Jul 10 16:57:48 2012 @@ -19,26 +19,28 @@ package org.apache.maven.report.projecti * under the License. */ -import java.util.Locale; - import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.manager.WagonManager; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.report.projectinfo.dependencies.ManagementDependencies; import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils; import org.apache.maven.report.projectinfo.dependencies.renderer.DependencyManagementRenderer; +import java.util.Locale; + /** * Generates the Project Dependency Management report. * * @author Nick Stolwijk * @version $Id$ * @since 2.1 - * @goal dependency-management - * @requiresDependencyResolution test */ +@Mojo( name = "dependency-management", requiresDependencyResolution = ResolutionScope.TEST ) public class DependencyManagementReport extends AbstractProjectInfoReport { @@ -48,40 +50,38 @@ public class DependencyManagementReport /** * Maven Project Builder component. - * - * @component */ + @Component private MavenProjectBuilder mavenProjectBuilder; /** * Artifact metadata source component. * - * @component * @since 2.4 */ + @Component protected ArtifactMetadataSource artifactMetadataSource; /** * Maven Artifact Factory component. - * - * @component */ + @Component private ArtifactFactory artifactFactory; /** * Wagon manager component. * * @since 2.3 - * @component */ + @Component private WagonManager wagonManager; /** * Repository metadata component. * * @since 2.3 - * @component */ + @Component private RepositoryMetadataManager repositoryMetadataManager; // ---------------------------------------------------------------------- @@ -100,21 +100,21 @@ public class DependencyManagementReport @Override public void executeReport( Locale locale ) { - @SuppressWarnings( "unchecked" ) - RepositoryUtils repoUtils = - new RepositoryUtils( getLog(), wagonManager, settings, - mavenProjectBuilder, factory, resolver, project.getRemoteArtifactRepositories(), - project.getPluginArtifactRepositories(), localRepository, - repositoryMetadataManager ); + @SuppressWarnings( "unchecked" ) RepositoryUtils repoUtils = + new RepositoryUtils( getLog(), wagonManager, settings, mavenProjectBuilder, factory, resolver, + project.getRemoteArtifactRepositories(), project.getPluginArtifactRepositories(), + localRepository, repositoryMetadataManager ); DependencyManagementRenderer r = - new DependencyManagementRenderer( getSink(), locale, getI18N( locale ), getLog(), getManagementDependencies(), - artifactMetadataSource, artifactFactory, mavenProjectBuilder, remoteRepositories, - localRepository, repoUtils ); + new DependencyManagementRenderer( getSink(), locale, getI18N( locale ), getLog(), + getManagementDependencies(), artifactMetadataSource, artifactFactory, + mavenProjectBuilder, remoteRepositories, localRepository, repoUtils ); r.render(); } - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ public String getOutputName() { return "dependency-management"; Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java Tue Jul 10 16:57:48 2012 @@ -19,22 +19,23 @@ package org.apache.maven.report.projecti * under the License. */ -import java.util.Locale; - import org.apache.maven.doxia.sink.Sink; import org.apache.maven.model.DistributionManagement; +import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.StringUtils; +import java.util.Locale; + /** * Generates the Project Distribution Management report. * * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.3 - * @goal distribution-management */ +@Mojo( name = "distribution-management" ) public class DistributionManagementReport extends AbstractProjectInfoReport { Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java Tue Jul 10 16:57:48 2012 @@ -22,6 +22,7 @@ package org.apache.maven.report.projecti import org.apache.maven.doxia.sink.Sink; import org.apache.maven.model.IssueManagement; import org.apache.maven.model.Model; +import org.apache.maven.plugins.annotations.Mojo; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.StringUtils; @@ -33,8 +34,8 @@ import java.util.Locale; * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.0 - * @goal issue-tracking */ +@Mojo( name = "issue-tracking" ) public class IssueTrackingReport extends AbstractProjectInfoReport { Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java Tue Jul 10 16:57:48 2012 @@ -23,6 +23,9 @@ import org.apache.commons.validator.UrlV import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.util.HtmlTools; import org.apache.maven.model.License; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Settings; import org.codehaus.plexus.i18n.I18N; @@ -43,8 +46,8 @@ import java.util.regex.Pattern; * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.0 - * @goal license */ +@Mojo( name = "license" ) public class LicenseReport extends AbstractProjectInfoReport { @@ -54,18 +57,14 @@ public class LicenseReport /** * The Maven Settings. - * - * @parameter default-value="${settings}" - * @required - * @readonly */ + @Component private Settings settings; /** * Whether the system is currently offline. - * - * @parameter expression="${settings.offline}" */ + @Parameter( property = "settings.offline" ) private boolean offline; /** @@ -73,9 +72,9 @@ public class LicenseReport * <br/> * If the system is in {@link #offline} mode, the linkOnly parameter will be always <code>true</code>. * - * @parameter default-value="false" * @since 2.3 */ + @Parameter( defaultValue = "false" ) private boolean linkOnly; // ---------------------------------------------------------------------- @@ -85,7 +84,8 @@ public class LicenseReport @Override public void executeReport( Locale locale ) { - LicenseRenderer r = new LicenseRenderer( getSink(), getProject(), getI18N( locale ), locale, settings, linkOnly ); + LicenseRenderer r = + new LicenseRenderer( getSink(), getProject(), getI18N( locale ), locale, settings, linkOnly ); r.render(); } @@ -121,8 +121,8 @@ public class LicenseReport return true; } - if ( licenseUrl != null - && ( licenseUrl.getProtocol().equals( "http" ) || licenseUrl.getProtocol().equals( "https" ) ) ) + if ( licenseUrl != null && + ( licenseUrl.getProtocol().equals( "http" ) || licenseUrl.getProtocol().equals( "https" ) ) ) { linkOnly = true; return true; @@ -132,7 +132,9 @@ public class LicenseReport return false; } - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ public String getOutputName() { return "license"; @@ -146,7 +148,7 @@ public class LicenseReport /** * @param project not null - * @param url not null + * @param url not null * @return a valid URL object from the url string * @throws IOException if any */ @@ -167,8 +169,8 @@ public class LicenseReport } catch ( MalformedURLException e ) { - throw new MalformedURLException( "The license url '" + url + "' seems to be invalid: " - + e.getMessage() ); + throw new MalformedURLException( + "The license url '" + url + "' seems to be invalid: " + e.getMessage() ); } } else @@ -190,8 +192,8 @@ public class LicenseReport } catch ( MalformedURLException e ) { - throw new MalformedURLException( "The license url '" + url + "' seems to be invalid: " - + e.getMessage() ); + throw new MalformedURLException( + "The license url '" + url + "' seems to be invalid: " + e.getMessage() ); } } @@ -214,7 +216,8 @@ public class LicenseReport private final boolean linkOnly; - LicenseRenderer( Sink sink, MavenProject project, I18N i18n, Locale locale, Settings settings, boolean linkOnly ) + LicenseRenderer( Sink sink, MavenProject project, I18N i18n, Locale locale, Settings settings, + boolean linkOnly ) { super( sink, i18n, locale ); @@ -269,7 +272,7 @@ public class LicenseReport for ( License license : licenses ) { String name = license.getName(); - + sink.listItem(); link( "#" + HtmlTools.encodeId( name ), name ); sink.listItem_(); @@ -341,8 +344,8 @@ public class LicenseReport int bodyStart = licenseContentLC.indexOf( "<body" ); int bodyEnd = licenseContentLC.indexOf( "</body>" ); - if ( ( licenseContentLC.contains( "<!doctype html" ) || licenseContentLC.contains( "<html>" ) ) - && ( ( bodyStart >= 0 ) && ( bodyEnd > bodyStart ) ) ) + if ( ( licenseContentLC.contains( "<!doctype html" ) || licenseContentLC.contains( "<html>" ) ) && + ( ( bodyStart >= 0 ) && ( bodyEnd > bodyStart ) ) ) { bodyStart = licenseContentLC.indexOf( ">", bodyStart ) + 1; String body = licenseContent.substring( bodyStart, bodyEnd ); Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java Tue Jul 10 16:57:48 2012 @@ -19,18 +19,20 @@ package org.apache.maven.report.projecti * under the License. */ -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; - import org.apache.maven.doxia.sink.Sink; import org.apache.maven.model.MailingList; import org.apache.maven.model.Model; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.StringUtils; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; + /** * Generates the Mailing List report. * @@ -38,8 +40,8 @@ import org.codehaus.plexus.util.StringUt * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.0 - * @goal mailing-list */ +@Mojo( name = "mailing-list" ) public class MailingListsReport extends AbstractProjectInfoReport { @@ -47,10 +49,10 @@ public class MailingListsReport /** * This can override the header text of the mailing list(s) report * - * @parameter * @since 2.2 * @deprecated since 2.3, you should use a custom bundle. */ + @Parameter protected String introduction; // ---------------------------------------------------------------------- @@ -67,7 +69,9 @@ public class MailingListsReport r.render(); } - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ public String getOutputName() { return "mail-lists"; @@ -135,8 +139,8 @@ public class MailingListsReport if ( StringUtils.isNotBlank( introduction ) ) { - log.warn( "Since 2.3, the <introduction/> parameter is deprecated. Please use a <customBundle/>" - + " parameter to configure a custom bundle." ); + log.warn( "Since 2.3, the <introduction/> parameter is deprecated. Please use a <customBundle/>" + + " parameter to configure a custom bundle." ); paragraph( introduction ); } else @@ -165,11 +169,11 @@ public class MailingListsReport if ( otherArchives ) { - tableHeader( new String[]{name, subscribe, unsubscribe, post, archive, archivesOther} ); + tableHeader( new String[]{ name, subscribe, unsubscribe, post, archive, archivesOther } ); } else { - tableHeader( new String[]{name, subscribe, unsubscribe, post, archive} ); + tableHeader( new String[]{ name, subscribe, unsubscribe, post, archive } ); } for ( MailingList mailingList : model.getMailingLists() ) Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java Tue Jul 10 16:57:48 2012 @@ -19,29 +19,29 @@ package org.apache.maven.report.projecti * under the License. */ -import java.io.File; -import java.io.IOException; -import java.io.Reader; -import java.util.List; -import java.util.Locale; - import org.apache.maven.doxia.sink.Sink; import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; - +import org.apache.maven.plugins.annotations.Mojo; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.ReaderFactory; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.util.List; +import java.util.Locale; + /** * Generates the Project Modules report. * * @author ltheussl * @version $Id$ * @since 2.2 - * @goal modules */ +@Mojo( name = "modules" ) public class ModulesReport extends AbstractProjectInfoReport { Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java Tue Jul 10 16:57:48 2012 @@ -19,12 +19,6 @@ package org.apache.maven.report.projecti * under the License. */ -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Locale; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -32,21 +26,29 @@ import org.apache.maven.artifact.version import org.apache.maven.doxia.sink.Sink; import org.apache.maven.model.Plugin; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.StringUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Locale; + /** * Generates the Project Plugin Management report. * * @author Nick Stolwijk * @version $Id$ * @since 2.1 - * @goal plugin-management - * @requiresDependencyResolution test */ +@Mojo( name = "plugin-management", requiresDependencyResolution = ResolutionScope.TEST ) public class PluginManagementReport extends AbstractProjectInfoReport { @@ -56,16 +58,14 @@ public class PluginManagementReport /** * Maven Project Builder component. - * - * @component */ + @Component private MavenProjectBuilder mavenProjectBuilder; /** * Maven Artifact Factory component. - * - * @component */ + @Component private ArtifactFactory artifactFactory; // ---------------------------------------------------------------------- Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java Tue Jul 10 16:57:48 2012 @@ -19,34 +19,36 @@ package org.apache.maven.report.projecti * under the License. */ -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Locale; -import java.util.Set; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.StringUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Locale; +import java.util.Set; + /** * Generates the Project Plugins report. * * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton</a> * @version $Id$ * @since 2.1 - * @goal plugins - * @requiresDependencyResolution test */ +@Mojo( name = "plugins", requiresDependencyResolution = ResolutionScope.TEST ) public class PluginsReport extends AbstractProjectInfoReport { @@ -56,16 +58,14 @@ public class PluginsReport /** * Maven Project Builder component. - * - * @component */ + @Component private MavenProjectBuilder mavenProjectBuilder; /** * Maven Artifact Factory component. - * - * @component */ + @Component private ArtifactFactory artifactFactory; // ---------------------------------------------------------------------- Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java Tue Jul 10 16:57:48 2012 @@ -20,6 +20,7 @@ package org.apache.maven.report.projecti */ import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.reporting.AbstractMavenReportRenderer; import java.util.Locale; @@ -31,8 +32,8 @@ import java.util.Locale; * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.0 - * @goal index */ +@Mojo( name = "index" ) public class ProjectIndexPageReport extends AbstractProjectInfoReport { Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java Tue Jul 10 16:57:48 2012 @@ -22,6 +22,7 @@ package org.apache.maven.report.projecti import org.apache.maven.doxia.sink.Sink; import org.apache.maven.model.DistributionManagement; import org.apache.maven.model.Organization; +import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.MavenReportException; import org.codehaus.plexus.util.FileUtils; @@ -38,8 +39,8 @@ import java.util.Locale; * @author Edwin Punzalan * @version $Id$ * @since 2.0 - * @goal summary */ +@Mojo( name = "summary" ) public class ProjectSummaryReport extends AbstractProjectInfoReport { Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java Tue Jul 10 16:57:48 2012 @@ -24,6 +24,9 @@ import org.apache.maven.doxia.sink.Sink; import org.apache.maven.model.Model; import org.apache.maven.model.Scm; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.scm.manager.NoSuchScmProviderException; import org.apache.maven.scm.manager.ScmManager; import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository; @@ -46,8 +49,8 @@ import java.util.Locale; * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.0 - * @goal scm */ +@Mojo( name = "scm" ) public class ScmReport extends AbstractProjectInfoReport { @@ -57,43 +60,40 @@ public class ScmReport /** * Maven SCM Manager. - * - * @component */ + @Component protected ScmManager scmManager; /** * The directory name to checkout right after the SCM URL. - * - * @parameter default-value="${project.artifactId}" - * @required */ + @Parameter( defaultValue = "${project.artifactId}", required = true ) private String checkoutDirectoryName; /** * The SCM anonymous connection url respecting the SCM URL Format. * - * @parameter default-value="${project.scm.connection}" - * @since 2.1 * @see <a href="http://maven.apache.org/scm/scm-url-format.html">SCM URL Format< /a> + * @since 2.1 */ + @Parameter( defaultValue = "${project.scm.connection}" ) private String anonymousConnection; /** * The SCM developer connection url respecting the SCM URL Format. * - * @parameter default-value="${project.scm.developerConnection}" - * @since 2.1 * @see <a href="http://maven.apache.org/scm/scm-url-format.html">SCM URL Format< /a> + * @since 2.1 */ + @Parameter( defaultValue = "${project.scm.developerConnection}" ) private String developerConnection; /** * The SCM web access url. * - * @parameter default-value="${project.scm.url}" * @since 2.1 */ + @Parameter( defaultValue = "${project.scm.url}" ) private String webAccessUrl; // ---------------------------------------------------------------------- Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=1359783&r1=1359782&r2=1359783&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Tue Jul 10 16:57:48 2012 @@ -25,6 +25,7 @@ import org.apache.maven.model.Contributo import org.apache.maven.model.Developer; import org.apache.maven.model.Model; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.plugins.annotations.Mojo; import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.StringUtils; import org.joda.time.DateTimeZone; @@ -43,8 +44,8 @@ import java.util.TimeZone; * @author <a href="mailto:vincent.sive...@gmail.com">Vincent Siveton </a> * @version $Id$ * @since 2.0 - * @goal project-team */ +@Mojo( name = "project-team" ) public class TeamListReport extends AbstractProjectInfoReport {