reverted r894080 as discussed in http://mail-archives.apache.org/mod_mbox/maven-dev/200912.mbox/%3C4B37E3BF.10306@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
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>
+ <!-- ====================================================================== -->
+ <!-- Issue Tracking -->
+ <!-- ====================================================================== -->
+
<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>
+ <name>issueTrackingUrl</name>
+ <version>3.0.0</version>
+ <description>The URL of the project's issue tracking system.</description>
+ <type>String</type>
</field>
-
- <!-- ====================================================================== -->
- <!-- Build prerequisites -->
- <!-- ====================================================================== -->
-
<field xdoc.separator="blank">
- <name>prerequisites</name>
+ <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,54 +607,16 @@
</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>
- <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>
- <name>dependencies</name>
- <version>3.0.0+</version>
- <description>
- <![CDATA[
- This element describes all of the dependencies associated with a
- project.
- These dependencies are used to construct a classpath for your
- project during the build process. They are automatically downloaded from the
- repositories defined in this project.
- See <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
- dependency mechanism</a> for more information.
- ]]>
- </description>
- <association>
- <type>Dependency</type>
- <multiplicity>*</multiplicity>
- </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
@@ -686,6 +637,25 @@
</association>
</field>
<field xdoc.separator="blank">
+ <name>dependencies</name>
+ <version>3.0.0+</version>
+ <description>
+ <![CDATA[
+ This element describes all of the dependencies associated with a
+ project.
+ These dependencies are used to construct a classpath for your
+ project during the build process. They are automatically downloaded from the
+ repositories defined in this project.
+ See <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
+ dependency mechanism</a> for more information.
+ ]]>
+ </description>
+ <association>
+ <type>Dependency</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>
