reverted r894080 as discussed in http://mail-archives.apache.org/mod_mbox/maven-dev/200912.mbox/%3c4b37e3bf.10...@apache.org%3E
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x@894144 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/40d8844d Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/40d8844d Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/40d8844d Branch: refs/heads/maven-2.2.x Commit: 40d8844dd5a46559afa433a7aa5ed1b2bcd9b0bc Parents: 865d13f Author: Herve Boutemy <hbout...@apache.org> Authored: Mon Dec 28 09:57:23 2009 +0000 Committer: Herve Boutemy <hbout...@apache.org> Committed: Mon Dec 28 09:57:23 2009 +0000 ---------------------------------------------------------------------- maven-model/src/main/mdo/maven.mdo | 165 +++++++++++++++---------------- 1 files changed, 82 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/40d8844d/maven-model/src/main/mdo/maven.mdo ---------------------------------------------------------------------- diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 3658a6a..57d86c4 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -316,6 +316,15 @@ </association> </field> <field xdoc.separator="blank"> + <name>mailingLists</name> + <version>3.0.0+</version> + <description>Contains information about a project's mailing lists.</description> + <association> + <type>MailingList</type> + <multiplicity>*</multiplicity> + </association> + </field> + <field xdoc.separator="blank"> <name>developers</name> <version>3.0.0+</version> <description>Describes the committers of a project.</description> @@ -334,26 +343,22 @@ </association> </field> - <field xdoc.separator="blank"> - <name>mailingLists</name> - <version>3.0.0+</version> - <description>Contains information about a project's mailing lists.</description> - <association> - <type>MailingList</type> - <multiplicity>*</multiplicity> - </association> - </field> - <!-- ====================================================================== --> - <!-- Build prerequisites --> + <!-- Issue Tracking --> <!-- ====================================================================== --> <field xdoc.separator="blank"> - <name>prerequisites</name> + <name>issueTrackingUrl</name> + <version>3.0.0</version> + <description>The URL of the project's issue tracking system.</description> + <type>String</type> + </field> + <field xdoc.separator="blank"> + <name>issueManagement</name> <version>4.0.0</version> - <description>Describes the prerequisites in the build environment for this project.</description> + <description>The project's issue management system information.</description> <association> - <type>Prerequisites</type> + <type>IssueManagement</type> </association> </field> @@ -382,7 +387,7 @@ <type>Repository</type> </association> </field> - <field xdoc.separator="blank"> + <field> <name>scm</name> <version>4.0.0</version> <description>Specification for the SCM used by the project, such as CVS, Subversion, etc.</description> @@ -392,25 +397,6 @@ </field> <!-- ====================================================================== --> - <!-- Issue Tracking --> - <!-- ====================================================================== --> - - <field> - <name>issueTrackingUrl</name> - <version>3.0.0</version> - <description>The URL of the project's issue tracking system.</description> - <type>String</type> - </field> - <field> - <name>issueManagement</name> - <version>4.0.0</version> - <description>The project's issue management system information.</description> - <association> - <type>IssueManagement</type> - </association> - </field> - - <!-- ====================================================================== --> <!-- CI Management --> <!-- ====================================================================== --> @@ -507,6 +493,19 @@ </field> <!-- ====================================================================== --> + <!-- Build prerequisites --> + <!-- ====================================================================== --> + + <field xdoc.separator="blank"> + <name>prerequisites</name> + <version>4.0.0</version> + <description>Describes the prerequisites in the build environment for this project.</description> + <association> + <type>Prerequisites</type> + </association> + </field> + + <!-- ====================================================================== --> <!-- Build --> <!-- ====================================================================== --> @@ -598,17 +597,7 @@ ]]> </description> <fields> - <field xdoc.separator="blank"> - <name>modules</name> - <version>4.0.0</version> - <description>The modules (sometimes called subprojects) to build as a part of this - project. Each module listed is a relative path to the directory containing the module.</description> - <association> - <type>String</type> - <multiplicity>*</multiplicity> - </association> - </field> - <field xdoc.separator="blank"> + <field> <name>distributionManagement</name> <version>4.0.0</version> <description>Distribution information for a project that enables deployment of the site @@ -618,35 +607,36 @@ </association> </field> <field xdoc.separator="blank"> - <name>properties</name> + <name>modules</name> <version>4.0.0</version> - <description> - <![CDATA[ - Properties that can be used throughout the POM as a substitution, and - are used as filters in resources if enabled. - The format is <code><name>value</name></code>. - ]]> - </description> - <type>Properties</type> - <association xml.mapStyle="inline"> + <description>The modules (sometimes called subprojects) to build as a part of this + project. Each module listed is a relative path to the directory containing the module.</description> + <association> <type>String</type> <multiplicity>*</multiplicity> </association> </field> <field xdoc.separator="blank"> - <name>dependencyManagement</name> + <name>repositories</name> <version>4.0.0</version> - <required>false</required> - <description>Default dependency information for projects that inherit from this one. The - dependencies in this section are not immediately resolved. Instead, when a POM derived - from this one declares a dependency described by a matching groupId and artifactId, the - version and other values from this section are used for that dependency if they were not - already specified.</description> + <description>The lists of the remote repositories for discovering dependencies and + extensions.</description> <association> - <type>DependencyManagement</type> + <type>Repository</type> + <multiplicity>*</multiplicity> </association> </field> <field> + <name>pluginRepositories</name> + <version>4.0.0</version> + <description>The lists of the remote repositories for discovering plugins for builds and + reports.</description> + <association> + <type>Repository</type> + <multiplicity>*</multiplicity> + </association> + </field> + <field xdoc.separator="blank"> <name>dependencies</name> <version>3.0.0+</version> <description> @@ -666,26 +656,6 @@ </association> </field> <field xdoc.separator="blank"> - <name>repositories</name> - <version>4.0.0</version> - <description>The lists of the remote repositories for discovering dependencies and - extensions.</description> - <association> - <type>Repository</type> - <multiplicity>*</multiplicity> - </association> - </field> - <field> - <name>pluginRepositories</name> - <version>4.0.0</version> - <description>The lists of the remote repositories for discovering plugins for builds and - reports.</description> - <association> - <type>Repository</type> - <multiplicity>*</multiplicity> - </association> - </field> - <field xdoc.separator="blank"> <name>reports</name> <version>4.0.0</version> <description> @@ -710,6 +680,35 @@ <type>Reporting</type> </association> </field> + <field xdoc.separator="blank"> + <name>dependencyManagement</name> + <version>4.0.0</version> + <required>false</required> + <description>Default dependency information for projects that inherit from this one. The + dependencies in this section are not immediately resolved. Instead, when a POM derived + from this one declares a dependency described by a matching groupId and artifactId, the + version and other values from this section are used for that dependency if they were not + already specified.</description> + <association> + <type>DependencyManagement</type> + </association> + </field> + <field xdoc.separator="blank"> + <name>properties</name> + <version>4.0.0</version> + <description> + <![CDATA[ + Properties that can be used throughout the POM as a substitution, and + are used as filters in resources if enabled. + The format is <code><name>value</name></code>. + ]]> + </description> + <type>Properties</type> + <association xml.mapStyle="inline"> + <type>String</type> + <multiplicity>*</multiplicity> + </association> + </field> </fields> </class> <class>
