o Committing changes submitted by Trygve Laugst��l to accomodate the new form

of specifying a parent model to use which is of the form:

<parent>
  <groupId/>
    <artifactId/>
      <version/>
      </parent>

      This allows us to work consistently from the local repository or the
unified
source root where missing models are downloaded now that we have the required
information within the <parent/> element.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162657 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2004-04-12 14:41:05 +00:00
parent a771832d41
commit 8c9fabae82
2 changed files with 33 additions and 3 deletions

View File

@ -19,7 +19,7 @@
<model>
<id>maven</id>
<name>Maven</name>
<version>3.0.0</version>
<version>4.0.0</version>
<description>Maven's model for Java project.</description>
<packageName>org.apache.maven.model</packageName>
<root>Model</root>
@ -31,11 +31,17 @@
<name>extend</name>
<description>
The location of the parent project, if one exists. Values from the parent project will be
the default for this project if they are left unspecified.
the default for this project if they are left unspecified.
The path may be absolute, or relative to the current project.xml file.
</description>
<type>String</type>
</field>
<field>
<name>parent</name>
<description>Specified which project to extend.</description>
<type>Parent</type>
<comment></comment>
</field>
<field>
<name>modelVersion</name>
<description>The version of this model you are using.</description>
@ -654,6 +660,26 @@
</field>
</fields>
</class>
<class>
<name>Parent</name>
<fields>
<field>
<name>artifactId</name>
<description>The artifact id of the project to extend.</description>
<type>String</type>
</field>
<field>
<name>groupId</name>
<description>The group id of the project to extend.</description>
<type>String</type>
</field>
<field>
<name>version</name>
<description>The version of the project to extend.</description>
<type>String</type>
</field>
</fields>
</class>
<class>
<name>Repository</name>
<fields>

View File

@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<extend>../project.xml</extend>
<parent>
<groupId>maven</groupId>
<artifactId>maven-component</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<name>Maven Model</name>
<groupId>maven</groupId>
<id>maven-model</id>