You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/08 11:04:16 UTC
svn commit: r792075 - in /maven/components/branches/maven-2.2.x: ./
maven-model/src/main/mdo/maven.mdo
Author: bentmann
Date: Wed Jul 8 09:04:16 2009
New Revision: 792075
URL: http://svn.apache.org/viewvc?rev=792075&view=rev
Log:
o Clarified relevance of ids (merged from r792073)
Modified:
maven/components/branches/maven-2.2.x/ (props changed)
maven/components/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo
Propchange: maven/components/branches/maven-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 8 09:04:16 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
/maven/components/branches/maven-2.1.x:751686,767628,767631,768817,768995,769010-769011
-/maven/components/trunk:572229,720001,721902,726845,729292
+/maven/components/trunk:572229,720001,721902,726845,729292,792073
/maven/sandbox/branches/maven/MNG-3379:678167
Modified: maven/components/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo?rev=792075&r1=792074&r2=792075&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo Wed Jul 8 09:04:16 2009
@@ -2286,7 +2286,8 @@
<description>
<![CDATA[
A unique identifier for a repository. This is used to match the repository
- to configuration in the <code>settings.xml</code> file, for example.
+ to configuration in the <code>settings.xml</code> file, for example. Furthermore, the identifier is
+ used during POM inheritance and profile injection to detect repositories that should be merged.
]]>
</description>
<type>String</type>
@@ -2745,7 +2746,7 @@
<type>String</type>
<defaultValue>default</defaultValue>
<description>The identifier of this execution for labelling the goals during the build,
- and for matching executions to merge during inheritance.</description>
+ and for matching executions to merge during inheritance and profile injection.</description>
</field>
<field>
<name>phase</name>
@@ -2905,8 +2906,8 @@
<required>true</required>
<version>4.0.0</version>
<type>String</type>
- <description>The identifier of this build profile. This used both for command line
- activation, and identifies identical profiles to merge with during inheritance.
+ <description>The identifier of this build profile. This is used for command line
+ activation, and identifies profiles to be merged.
</description>
</field>
<field>
@@ -3272,7 +3273,9 @@
<name>id</name>
<type>String</type>
<required>true</required>
- <description>The unique id for this report set, to be used during POM inheritance.</description>
+ <description>The unique id for this report set, to be used during POM inheritance and profile injection
+ for merging of report sets.
+ </description>
<defaultValue>default</defaultValue>
</field>
<field>