Author: buildbot
Date: Thu Oct 31 23:50:09 2013
New Revision: 885014
Log:
Staging update by buildbot for maven
Modified:
websites/staging/maven/trunk/content/ (props changed)
websites/staging/maven/trunk/content/developers/mojo-api-specification.html
websites/staging/maven/trunk/content/maven-site-1.0-site.jar
Propchange: websites/staging/maven/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Oct 31 23:50:09 2013
@@ -1 +1 @@
-1537609
+1537769
Modified:
websites/staging/maven/trunk/content/developers/mojo-api-specification.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/mojo-api-specification.html
(original)
+++ websites/staging/maven/trunk/content/developers/mojo-api-specification.html
Thu Oct 31 23:50:09 2013
@@ -631,7 +631,7 @@ under the License. -->
requirements for the overall plugin descriptor itself.</p>
<p>NOTE: In the following discussion, bolded items are the descriptor's
- element name along with a Javadoc annotation (if applicable) supporting
+ element name along with a Mojo Javadoc tag (if applicable) supporting
that piece of the plugin descriptor. A couple of examples are:
<b>someElement
(@annotation parameterName="parameterValue")</b>
@@ -640,9 +640,11 @@ under the License. -->
.
</p>
-<p><b>NOTE:</b> since maven-plugin-plugin 3.0, it is now possible to use
java1.5 annotations.
- See <a
href="/plugin-tools/maven-plugin-tools-annotations/index.html">supported
annotations</a> and
- <a
href="/plugin-tools/maven-plugin-plugin/examples/using-annotations.html">Using
annotations</a>.
+<p><b>NOTE:</b> since maven-plugin-plugin 3.0, it is now possible to use
+ <a
href="/plugin-tools/maven-plugin-tools-annotations/index.html">Maven Plugin
Tools Java 5 Annotations</a> equivalent
+ to <a href="/plugin-tools/maven-plugin-tools-java/index.html">Mojo
Javadoc tags</a>.
+ See
+ <a
href="/plugin-tools/maven-plugin-plugin/examples/using-annotations.html">Using
annotations documentation</a>.
</p>
<p>The plugin descriptor must be provided in a jar resource with the
@@ -710,7 +712,7 @@ under the License. -->
<th>Descriptor Element</th>
-<th>Annotation</th>
+<th>Mojo Javadoc tag</th>
<th>Required?</th>
@@ -757,7 +759,6 @@ under the License. -->
lifecycle="<lifecycleId>"</li>
<li>@execute phase="<phaseName>"</li>
-
<li>@execute goal="<goalName>"</li>
</ul>
@@ -1107,7 +1108,7 @@ under the License. -->
<th>Descriptor Element</th>
-<th>Annotation</th>
+<th>Mojo Javadoc tag</th>
<th>Required?</th>
@@ -1150,22 +1151,31 @@ under the License. -->
<td>configuration</td>
-<td>@parameter expression="${aSystemProperty}"
- default-value="${anExpression}"</td>
+<td>maven-plugin-plugin 2.x: <tt>@parameter
expression="${aSystemProperty}"
+ default-value="${anExpression}"</tt><br /><br />
+ maven-plugin-plugin 3.x: <tt>@parameter
property="aSystemProperty"
+ default-value="${anExpression}"</tt></td>
<td>No</td>
-<td>Specifies the expressions used to calculate the value to be injected into
this parameter of
- the Mojo at buildtime. The expression given by
<tt>default-value</tt> is commonly used to refer to
+<td>
+<p>Specifies the expressions used to calculate the value to be injected into
this parameter of
+ the Mojo at buildtime.</p>
+
+<p>The expression given by <tt>default-value</tt> is commonly used to refer to
specific elements in the POM, such as
<tt>${project.resources}</tt>, which refers to the list of
resources meant to accompany the classes in the resulting JAR
file. Of course, the default value need not
be an expression but can also be a simple constant like
<tt>true</tt> or <tt>1.5</tt>. And for
parameters of type <tt>String</tt> one can mix expressions with
literal values, e.g.
- <tt>${project.artifactId}-${project.version}-special</tt>. The
system property given by <tt>expression</tt>
- enables users to override the default value from the command line
via <tt>-DaSystemProperty=value</tt>.
- <i>NOTE: If neither <tt>default-value</tt> nor <tt>expression</tt>
are specified, the parameter can
- only be configured from the POM. The use of '${' and '}' is
required to delimit actual expressions
- which may be evaluated.</i>
+ <tt>${project.artifactId}-${project.version}-special</tt>.</p>
+
+<p>The system property given by <tt>property</tt> in maven-plugin-plugin 3.x
or <tt>expression</tt>
+ in maven-plugin-plugin 2.x
+ enables users to override the default value from the command line
via <tt>-DaSystemProperty=value</tt>.</p>
+
+<p><i>NOTE: If neither <tt>default-value</tt> nor <tt>property</tt> or
<tt>expression</tt> are specified,
+ the parameter can only be configured from the POM. The use of '${'
and '}' in default value is required to delimit actual expressions
+ which may be evaluated.</i></p>
</td>
</tr>
Modified: websites/staging/maven/trunk/content/maven-site-1.0-site.jar
==============================================================================
Binary files - no diff available.
