You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/12/01 11:39:58 UTC
[45/50] git commit: reordered maven.mdo fields to better match POM
Code Convention. Note: remaining issues cannot easily be fixed since Model
inherits from ModelBase,
then any field in ModelBase appears at the end of Model (after build and
profiles eleme
reordered maven.mdo fields to better match POM Code Convention.
Note: remaining issues cannot easily be fixed since Model inherits from ModelBase, then any field in ModelBase appears at the end of Model (after build and profiles elements)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x@894080 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/865d13f0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/865d13f0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/865d13f0
Branch: refs/heads/maven-2.2.x
Commit: 865d13f0a748bc45278c845186b06e7ee71b1a38
Parents: 8b82cc6
Author: Herve Boutemy <hb...@apache.org>
Authored: Sun Dec 27 17:08:02 2009 +0000
Committer: Herve Boutemy <hb...@apache.org>
Committed: Sun Dec 27 17:08:02 2009 +0000
----------------------------------------------------------------------
maven-model/src/main/mdo/maven.mdo | 165 ++++++++++++++++---------------
1 files changed, 83 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/865d13f0/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 57d86c4..3658a6a 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -316,15 +316,6 @@
</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>
@@ -343,22 +334,26 @@
</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>
+
<!-- ====================================================================== -->
- <!-- Issue Tracking -->
+ <!-- Build prerequisites -->
<!-- ====================================================================== -->
<field xdoc.separator="blank">
- <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>
+ <name>prerequisites</name>
<version>4.0.0</version>
- <description>The project's issue management system information.</description>
+ <description>Describes the prerequisites in the build environment for this project.</description>
<association>
- <type>IssueManagement</type>
+ <type>Prerequisites</type>
</association>
</field>
@@ -387,7 +382,7 @@
<type>Repository</type>
</association>
</field>
- <field>
+ <field xdoc.separator="blank">
<name>scm</name>
<version>4.0.0</version>
<description>Specification for the SCM used by the project, such as CVS, Subversion, etc.</description>
@@ -397,6 +392,25 @@
</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 -->
<!-- ====================================================================== -->
@@ -493,19 +507,6 @@
</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 -->
<!-- ====================================================================== -->
@@ -597,15 +598,6 @@
]]>
</description>
<fields>
- <field>
- <name>distributionManagement</name>
- <version>4.0.0</version>
- <description>Distribution information for a project that enables deployment of the site
- and artifacts to remote web servers and repositories respectively.</description>
- <association>
- <type>DistributionManagement</type>
- </association>
- </field>
<field xdoc.separator="blank">
<name>modules</name>
<version>4.0.0</version>
@@ -617,26 +609,44 @@
</association>
</field>
<field xdoc.separator="blank">
- <name>repositories</name>
+ <name>distributionManagement</name>
<version>4.0.0</version>
- <description>The lists of the remote repositories for discovering dependencies and
- extensions.</description>
+ <description>Distribution information for a project that enables deployment of the site
+ and artifacts to remote web servers and repositories respectively.</description>
<association>
- <type>Repository</type>
- <multiplicity>*</multiplicity>
+ <type>DistributionManagement</type>
</association>
</field>
- <field>
- <name>pluginRepositories</name>
+ <field xdoc.separator="blank">
+ <name>properties</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>
+ <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>
<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>
@@ -656,6 +666,26 @@
</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>
@@ -680,35 +710,6 @@
<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>