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 2010/08/12 22:53:04 UTC
svn commit: r984965 - in /maven/plugins/branches/maven-site-plugin-3.x: ./
src/site/apt/examples/sitedescriptor.apt
Author: dennisl
Date: Thu Aug 12 20:53:04 2010
New Revision: 984965
URL: http://svn.apache.org/viewvc?rev=984965&view=rev
Log:
Merge r984960 from trunk with modifications.
o Clarify how site descriptor inheritance works.
Modified:
maven/plugins/branches/maven-site-plugin-3.x/ (props changed)
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt
Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 12 20:53:04 2010
@@ -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
+/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
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt?rev=984965&r1=984964&r2=984965&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/examples/sitedescriptor.apt Thu Aug 12 20:53:04 2010
@@ -6,7 +6,7 @@
Maria Odea Ching
Dennis Lundberg
------
- 2009-03-08
+ 2010-08-12
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -147,8 +147,14 @@ Configuring the Site Descriptor
* Inheritance
- Site descriptors are inherited along the same lines as project descriptors are. When you deploy a project, its site
- descriptor is also deployed so that it can be inherited.
+ Site descriptors are inherited along the same lines as project descriptors
+ are. If you want your project's site descriptor to be inherited, you need to
+ attach it to the project's main artifact. You use the
+ <<<site:attach-descriptor>>> goal to attach the site descriptor to your
+ project's main artifact.
+
+ In Maven 3 you must attach the site descriptor yourself, even for projects
+ with packaging set to "pom".
By default, only the basic settings are inherited. From the body, <<only>>
the links are inherited, and these accumulate to contain all the parents'