You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2011/03/16 20:51:55 UTC
svn commit: r1082280 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/it/MSITE-354/ src/it/MSITE-354/goals.txt src/it/MSITE-354/pom.xml
src/it/MSITE-354/verify.bsh
src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Author: dennisl
Date: Wed Mar 16 19:51:55 2011
New Revision: 1082280
URL: http://svn.apache.org/viewvc?rev=1082280&view=rev
Log:
[MSITE-354] Generation of project-info.html cannot be omitted
o Merge r1082274 from trunk.
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/
- copied from r1082274, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-354/
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/goals.txt
- copied unchanged from r1082274, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-354/goals.txt
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/pom.xml
- copied unchanged from r1082274, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-354/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh
- copied unchanged from r1082274, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-354/verify.bsh
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 16 19:51:55 2011
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079529,1079698,1081676,1081837,1081887,1082091,1082242
+/maven/plugins/trunk/maven-site-plugin:801155,801171,801470,806898-806906,807943-808180,809252,810298,884137,886844,886847,890094,890124,891014,891688,920027,920041,942622,943455,944145,950463,956681,984466,984960,984991,984996,1029307,1033379,1037476,1039137,1039143,1039748-1039749,1049020,1051139-1051449,1055019,1055033,1055047,1055089,1060289,1063639,1064626,1065576,1065582,1066038,1067103,1067120,1070079-1070080,1070100,1070104,1074118,1075018,1075782,1075810,1075995,1076167,1076195,1077911,1077924,1078235,1079529,1079698,1081676,1081837,1081887,1082091,1082242,1082274
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1082280&r1=1082279&r2=1082280&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java Wed Mar 16 19:51:55 2011
@@ -190,6 +190,15 @@ public abstract class AbstractSiteRender
*/
private boolean relativizeDecorationLinks;
+ /**
+ * Whether to generate the summary page for project reports: project-info.html.
+ *
+ * @parameter expression="${generateProjectInfo}" default-value="true"
+ *
+ * @since 2.3
+ */
+ private boolean generateProjectInfo;
+
protected List<MavenReportExecution> getReports()
throws MojoExecutionException
{
@@ -408,7 +417,7 @@ public abstract class AbstractSiteRender
siteTool.populateReportsMenu( context.getDecoration(), locale, categories );
populateReportItems( context.getDecoration(), locale, reportsByOutputName );
- if ( categories.containsKey( MavenReport.CATEGORY_PROJECT_INFORMATION ) )
+ if ( categories.containsKey( MavenReport.CATEGORY_PROJECT_INFORMATION ) && generateProjectInfo )
{
List<MavenReport> categoryReports = categories.get( MavenReport.CATEGORY_PROJECT_INFORMATION );