diff --git a/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java b/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java index 1c4913f691..32a447278a 100644 --- a/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java +++ b/maven-plugins/maven-clover-plugin/src/main/java/org/apache/maven/plugin/clover/CloverReportMojo.java @@ -17,12 +17,12 @@ package org.apache.maven.plugin.clover; */ import com.cenqua.clover.reporters.html.HtmlReporter; +import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.MavenReportException; -import org.apache.maven.plugin.MojoExecutionException; -import org.codehaus.doxia.site.renderer.SiteRenderer; import org.codehaus.doxia.sink.Sink; +import org.codehaus.doxia.site.renderer.SiteRenderer; import java.util.Locale; import java.util.ResourceBundle; @@ -35,7 +35,8 @@ import java.util.ResourceBundle; * @goal clover * @execute phase="test" lifecycle="clover" */ -public class CloverReportMojo extends AbstractMavenReport +public class CloverReportMojo + extends AbstractMavenReport { /** * @parameter expression="${project.build.directory}/clover/clover.db" @@ -44,15 +45,13 @@ public class CloverReportMojo extends AbstractMavenReport private String cloverDatabase; /** - * @parameter expression="${project.build.directory}/site/clover" + * @parameter expression="${project.reporting.outputDirectory}/clover" * @required */ private String outputDirectory; /** - * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}" - * @required - * @readonly + * @component */ private SiteRenderer siteRenderer; @@ -157,8 +156,8 @@ public class CloverReportMojo extends AbstractMavenReport } catch ( Exception e ) { - throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH ) - + " report generation.", e ); + throw new MojoExecutionException( + "An error has occurred in " + getName( Locale.ENGLISH ) + " report generation.", e ); } } diff --git a/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java b/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java index c01b5c6025..e39611bc2a 100644 --- a/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java +++ b/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java @@ -60,9 +60,7 @@ public class PluginReport /** * Doxia Site Renderer. * - * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}" - * @required - * @readonly + * @component */ private SiteRenderer siteRenderer; @@ -78,8 +76,7 @@ public class PluginReport /** * Mojo scanner tools. * - * @parameter expression="${component.org.apache.maven.tools.plugin.scanner.MojoScanner}" - * @required + * @component */ protected MojoScanner mojoScanner; diff --git a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java index 6042d341e4..b56d5f5832 100644 --- a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java +++ b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java @@ -23,7 +23,6 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.reporting.AbstractMavenReport; import org.apache.maven.reporting.AbstractMavenReportRenderer; import org.apache.maven.reporting.MavenReportException; - import org.codehaus.doxia.sink.Sink; import org.codehaus.doxia.site.renderer.SiteRenderer; import org.codehaus.plexus.util.StringUtils; @@ -35,11 +34,10 @@ import java.util.ResourceBundle; /** * Generates the Project Continuous Integration System report. - * - * @goal cim - * + * * @author Vincent Siveton * @version $Id$ + * @goal cim */ public class CimReport extends AbstractMavenReport @@ -49,16 +47,16 @@ public class CimReport // ---------------------------------------------------------------------- /** - * Report output directory. - * - * @parameter expression="${project.build.directory}/site" + * Report output directory. + * + * @parameter expression="${project.reporting.outputDirectory}" * @required */ private String outputDirectory; /** * Doxia SiteRender. - * + * * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}" * @required * @readonly @@ -67,7 +65,7 @@ public class CimReport /** * The Maven Project. - * + * * @parameter expression="${project}" * @required * @readonly @@ -215,16 +213,15 @@ public class CimReport String address = getBundle( locale ).getString( "report.cim.notifiers.column.address" ); String configuration = getBundle( locale ).getString( "report.cim.notifiers.column.configuration" ); - tableHeader( new String[] { type, address, configuration } ); + tableHeader( new String[]{type, address, configuration} ); for ( Iterator i = notifiers.iterator(); i.hasNext(); ) { Notifier notifier = (Notifier) i.next(); - tableRow( new String[] { - notifier.getType(), + tableRow( new String[]{notifier.getType(), createLinkPatternedText( notifier.getAddress(), notifier.getAddress() ), - propertiesToString( notifier.getConfiguration() ) } ); + propertiesToString( notifier.getConfiguration() )} ); } endTable(); @@ -235,7 +232,7 @@ public class CimReport /** * Checks if a CIM system is bugzilla, continium... - * + * * @return true if the CIM system is bugzilla, continium..., false * otherwise. */ diff --git a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java index dabd6304a4..40e156a27b 100644 --- a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java +++ b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java @@ -48,15 +48,15 @@ public class DependenciesReport { /** * Report output directory. - * - * @parameter expression="${project.build.directory}/site" + * + * @parameter expression="${project.reporting.outputDirectory}" * @required */ private String outputDirectory; /** * Doxia Site Renderer. - * + * * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}" * @required * @readonly @@ -65,7 +65,7 @@ public class DependenciesReport /** * The Maven Project. - * + * * @parameter expression="${project}" * @required * @readonly @@ -74,7 +74,7 @@ public class DependenciesReport /** * Maven ArtifactFactory. - * + * * @parameter expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}" * @required * @readonly @@ -83,7 +83,7 @@ public class DependenciesReport /** * Maven Project Builder. - * + * * @parameter expression="${component.org.apache.maven.project.MavenProjectBuilder}" * @required * @readonly @@ -92,7 +92,7 @@ public class DependenciesReport /** * Local Repository. - * + * * @parameter expression="${localRepository}" * @required * @readonly @@ -245,9 +245,10 @@ public class DependenciesReport } catch ( ProjectBuildingException e ) { - throw new IllegalArgumentException( "Can't find a valid Maven project in the repository for the artifact [" - + artifact.getGroupId() + ":" + artifact.getArtifactId() - + ":" + artifact.getVersion() + "]." ); + throw new IllegalArgumentException( + "Can't find a valid Maven project in the repository for the artifact [" + + artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getVersion() + + "]." ); } tableRow( new String[]{artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), @@ -289,10 +290,10 @@ public class DependenciesReport catch ( ProjectBuildingException e ) { // TODO: better exception handling needed - log PBE - throw new IllegalArgumentException( "Can't find a valid Maven project in the repository for the artifact [" - + artifact.getGroupId() + ":" - + artifact.getArtifactId() + ":" - + artifact.getVersion() + "]." ); + throw new IllegalArgumentException( + "Can't find a valid Maven project in the repository for the artifact [" + + artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getVersion() + + "]." ); } tableRow( new String[]{artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifactProject.getDescription(), @@ -349,14 +350,17 @@ public class DependenciesReport throws ProjectBuildingException { Artifact projectArtifact = artifact; - + if ( !"pom".equals( artifact.getType() ) ) { - projectArtifact = artifactFactory.createProjectArtifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getScope() ); + projectArtifact = artifactFactory.createProjectArtifact( artifact.getGroupId(), + artifact.getArtifactId(), + artifact.getVersion(), artifact.getScope() ); } - + // TODO: we should use the MavenMetadataSource instead - return mavenProjectBuilder.buildFromRepository( projectArtifact, project.getRepositories(), localRepository ); + return mavenProjectBuilder.buildFromRepository( projectArtifact, project.getRepositories(), + localRepository ); } } diff --git a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java index 9e45d6eeaa..78467794b2 100644 --- a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java +++ b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java @@ -26,32 +26,30 @@ import org.codehaus.doxia.sink.Sink; import org.codehaus.doxia.site.renderer.SiteRenderer; import org.codehaus.plexus.util.StringUtils; -import java.io.IOException; import java.util.Locale; import java.util.ResourceBundle; /** * Generates the Project Issue Tracking report. - * - * @goal issue-tracking - * + * * @author Vincent Siveton * @version $Id$ + * @goal issue-tracking */ public class IssueTrackingReport extends AbstractMavenReport { /** * Report outpur directory. - * - * @parameter expression="${project.build.directory}/site" + * + * @parameter expression="${project.reporting.outputDirectory}" * @required */ private String outputDirectory; /** * Doxia Site Renderer. - * + * * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}" * @required * @readonly @@ -60,7 +58,7 @@ public class IssueTrackingReport /** * The Maven Project. - * + * * @parameter expression="${project}" * @required * @readonly @@ -212,7 +210,7 @@ public class IssueTrackingReport /** * Checks if a issue management system is Jira, bugzilla... - * + * * @return true if the issue management system is Jira, bugzilla, false * otherwise. */ diff --git a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java index b6805fac05..9f053e8190 100644 --- a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java +++ b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java @@ -53,7 +53,7 @@ public class LicenseReport /** * Report output directory. * - * @parameter expression="${project.build.directory}/site" + * @parameter expression="${project.reporting.outputDirectory}" * @required */ private String outputDirectory; diff --git a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java index 7989f6b764..e23500b9c5 100644 --- a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java +++ b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java @@ -44,7 +44,7 @@ public class MailingListsReport /** * Report output directory. * - * @parameter expression="${project.build.directory}/site" + * @parameter expression="${project.reporting.outputDirectory}" * @required */ private String outputDirectory; diff --git a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java index 1cc513b0ab..ee54e63448 100644 --- a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java +++ b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java @@ -40,26 +40,25 @@ import java.util.ResourceBundle; /** * Generates the Project Source Code Management report. - * - * @goal scm - * + * * @author Vincent Siveton * @version $Id$ + * @goal scm */ public class ScmReport extends AbstractMavenReport { /** * Report output directory. - * - * @parameter expression="${project.build.directory}/site" + * + * @parameter expression="${project.reporting.outputDirectory}" * @required */ private String outputDirectory; /** * Doxia Site Renderer. - * + * * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}" * @required * @readonly @@ -68,7 +67,7 @@ public class ScmReport /** * The Maven Project. - * + * * @parameter expression="${project}" * @required * @readonly @@ -77,7 +76,7 @@ public class ScmReport /** * Maven SCM Manager. - * + * * @parameter expression="${component.org.apache.maven.scm.manager.ScmManager}" * @required * @readonly @@ -160,7 +159,9 @@ public class ScmReport private ScmManager scmManager; - /** To support more SCM */ + /** + * To support more SCM + */ private String anonymousConnection; private String devConnection; @@ -204,8 +205,7 @@ public class ScmReport anonymousConnection = scm.getConnection(); devConnection = scm.getDeveloperConnection(); - if ( StringUtils.isEmpty( anonymousConnection ) && - StringUtils.isEmpty( devConnection ) && + if ( StringUtils.isEmpty( anonymousConnection ) && StringUtils.isEmpty( devConnection ) && StringUtils.isEmpty( scm.getUrl() ) ) { startSection( getTitle() ); @@ -216,7 +216,7 @@ public class ScmReport return; } - + ScmRepository anonymousRepository = getScmRepository( anonymousConnection ); ScmRepository devRepository = getScmRepository( devConnection ); @@ -241,7 +241,7 @@ public class ScmReport /** * Render the overview section - * + * * @param anonymousRepository the anonymous repository */ private void renderOverViewSection( ScmRepository anonymousRepository ) @@ -278,7 +278,7 @@ public class ScmReport /** * Render the web access section - * + * * @param scmUrl The URL to the project's browsable repository. */ private void renderWebAccesSection( String scmUrl ) @@ -302,15 +302,14 @@ public class ScmReport /** * Render the anonymous access section depending the repository. *

Note: ClearCase, Starteam et Perforce seems to have no anonymous access. - * + * * @param anonymousRepository the anonymous repository */ private void renderAnonymousAccessSection( ScmRepository anonymousRepository ) { - if ( ( isScmSystem( anonymousRepository, "clearcase" ) ) - || ( isScmSystem( anonymousRepository, "perforce" ) ) - || ( isScmSystem( anonymousRepository, "starteam" ) ) - || ( StringUtils.isEmpty( anonymousConnection ) ) ) + if ( ( isScmSystem( anonymousRepository, "clearcase" ) ) || + ( isScmSystem( anonymousRepository, "perforce" ) ) || + ( isScmSystem( anonymousRepository, "starteam" ) ) || ( StringUtils.isEmpty( anonymousConnection ) ) ) { return; } @@ -348,7 +347,7 @@ public class ScmReport /** * Render the developer access section - * + * * @param devRepository the dev repository */ private void renderDeveloperAccessSection( ScmRepository devRepository ) @@ -357,7 +356,7 @@ public class ScmReport { return; } - + startSection( getBundle( locale ).getString( "report.scm.devaccess.title" ) ); if ( ( devRepository != null ) && ( isScmSystem( devRepository, "clearcase" ) ) ) @@ -410,7 +409,7 @@ public class ScmReport /** * Render the access from behind a firewall section - * + * * @param devRepository the dev repository */ private void renderAccessBehindFirewallSection( ScmRepository devRepository ) @@ -441,7 +440,7 @@ public class ScmReport /** * Render the access from behind a firewall section - * + * * @param anonymousRepository the anonymous repository * @param devRepository the dev repository */ @@ -472,7 +471,7 @@ public class ScmReport * Create the documentation to provide an developer access with a Clearcase SCM. * For example, generate the following command line: *

cleartool checkout module

- * + * * @param clearCaseRepo */ private void developerAccessClearCase( ClearCaseScmProviderRepository clearCaseRepo ) @@ -492,10 +491,9 @@ public class ScmReport * For example, generate the following command line: *

cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login

*

cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co maven-plugins/dist

- * - * @see https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115 - * + * * @param cvsRepo + * @see https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115 */ private void anonymousAccessCVS( CvsScmProviderRepository cvsRepo ) { @@ -515,10 +513,9 @@ public class ScmReport * For example, generate the following command line: *

cvs -d :pserver:username@cvs.apache.org:/home/cvs login

*

cvs -z3 -d :ext:username@cvs.apache.org:/home/cvs co maven-plugins/dist

- * - * @see https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115 - * + * * @param cvsRepo + * @see https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115 */ private void developerAccessCVS( CvsScmProviderRepository cvsRepo ) { @@ -542,10 +539,9 @@ public class ScmReport * For example, generate the following command line: *

p4 -H hostname -p port -u username -P password path

*

p4 -H hostname -p port -u username -P password path submit -c changement

- * - * @see http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html - * + * * @param perforceRepo + * @see http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html */ private void developerAccessPerforce( PerforceScmProviderRepository perforceRepo ) { @@ -578,7 +574,7 @@ public class ScmReport * For example, generate the following command line: *

stcmd co -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -is

*

stcmd ci -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -f NCI -is

- * + * * @param starteamRepo */ private void developerAccessStarteam( StarteamScmProviderRepository starteamRepo ) @@ -608,10 +604,9 @@ public class ScmReport * Create the documentation to provide an anonymous access with a SVN SCM. * For example, generate the following command line: *

svn checkout http://svn.apache.org/repos/asf/maven/components/trunk maven

- * - * @see http://svnbook.red-bean.com/ - * + * * @param svnRepo + * @see http://svnbook.red-bean.com/ */ private void anonymousAccessSVN( SvnScmProviderRepository svnRepo ) { @@ -628,10 +623,9 @@ public class ScmReport * For example, generate the following command line: *

svn checkout https://svn.apache.org/repos/asf/maven/components/trunk maven

*

svn commit --username your-username -m "A message"

- * - * @see http://svnbook.red-bean.com/ - * + * * @param svnRepo + * @see http://svnbook.red-bean.com/ */ private void developerAccessSVN( SvnScmProviderRepository svnRepo ) { @@ -653,7 +647,7 @@ public class ScmReport /** * Return a SCM repository defined by a given url - * + * * @param scmUrl an SCM URL * @return a valid SCM repository or null */ @@ -681,12 +675,11 @@ public class ScmReport /** * Convenience method that return true is the defined SCM repository is a known provider. *

Actually, we fully support Clearcase, CVS, Perforce, Starteam, SVN by the maven-scm-providers component.

- * - * @see maven-scm-providers - * - * @param scmRepository a SCM repository - * @param scmProvider a SCM provider name + * + * @param scmRepository a SCM repository + * @param scmProvider a SCM provider name * @return true if the provider of the given SCM repository is equal to the given scm provider. + * @see maven-scm-providers */ private static boolean isScmSystem( ScmRepository scmRepository, String scmProvider ) { diff --git a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java index 8553304f37..85bb1888ef 100644 --- a/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java +++ b/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java @@ -35,26 +35,25 @@ import java.util.ResourceBundle; /** * Generates the Project Team report. - * - * @goal project-team - * + * * @author Vincent Siveton * @version $Id$ + * @goal project-team */ public class TeamListReport extends AbstractMavenReport { /** * Report output directory. - * - * @parameter expression="${project.build.directory}/site" + * + * @parameter expression="${project.reporting.outputDirectory}" * @required */ private String outputDirectory; /** * Doxia Site Renderer. - * + * * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}" * @required * @readonly @@ -63,7 +62,7 @@ public class TeamListReport /** * The Maven Project. - * + * * @parameter expression="${project}" * @required * @readonly @@ -173,7 +172,8 @@ public class TeamListReport .append( " var now = new Date();\n" ) .append( " var nowTime = now.getTime();\n" ) .append( " var localOffset = now.getTimezoneOffset();\n" ) - .append( " var developerTime = nowTime + ( offset * 60 * 60 * 1000 ) + ( localOffset * 60 * 1000 );\n" ) + .append( + " var developerTime = nowTime + ( offset * 60 * 60 * 1000 ) + ( localOffset * 60 * 1000 );\n" ) .append( " var developerDate = new Date(developerTime);\n" ).append( "\n" ) .append( " document.getElementById(id).innerHTML = developerDate;\n" ).append( "}\n" ) .append( "\n" ) @@ -209,17 +209,8 @@ public class TeamListReport String actualTime = getBundle( locale ).getString( "report.team-list.developers.actualtime" ); String properties = getBundle( locale ).getString( "report.team-list.developers.properties" ); - tableHeader( new String[] { - id, - name, - email, - url, - organization, - organizationUrl, - roles, - timeZone, - actualTime, - properties } ); + tableHeader( new String[]{id, name, email, url, organization, organizationUrl, roles, timeZone, + actualTime, properties} ); // To handle JS int developersRows = 0; @@ -240,7 +231,8 @@ public class TeamListReport tableCell( developer.getOrganization() ); - tableCell( createLinkPatternedText( developer.getOrganizationUrl(), developer.getOrganizationUrl() ) ); + tableCell( + createLinkPatternedText( developer.getOrganizationUrl(), developer.getOrganizationUrl() ) ); if ( developer.getRoles() != null ) { @@ -313,16 +305,8 @@ public class TeamListReport String actualTime = getBundle( locale ).getString( "report.team-list.contributors.actualtime" ); String properties = getBundle( locale ).getString( "report.team-list.contributors.properties" ); - tableHeader( new String[] { - name, - email, - url, - organization, - organizationUrl, - roles, - timeZone, - actualTime, - properties } ); + tableHeader( new String[]{name, email, url, organization, organizationUrl, roles, timeZone, actualTime, + properties} ); // To handle JS int contributorsRows = 0; diff --git a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java index a35a3e286f..f2438a7241 100644 --- a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java +++ b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java @@ -52,7 +52,7 @@ public class SiteDeployMojo extends AbstractMojo { /** - * @parameter alias="siteDirectory" expression="${project.build.directory}/site" + * @parameter alias="siteDirectory" expression="${project.reporting.outputDirectory}" * @required */ private File inputDirectory; diff --git a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java index 7a9fc677a9..0a36d3617f 100644 --- a/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java +++ b/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java @@ -113,7 +113,7 @@ public class SiteMojo /** * Directory containing the generated project sites and report distributions. * - * @parameter expression="${project.build.directory}/site" + * @parameter expression="${project.reporting.outputDirectory}" * @required */ private File outputDirectory;