jvanzyl 2004/04/12 07:41:05
Modified: maven-model maven.mdo project.xml
Log:
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.
Revision Changes Path
1.23 +28 -2 maven-components/maven-model/maven.mdo
Index: maven.mdo
===================================================================
RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maven.mdo 15 Mar 2004 19:05:39 -0000 1.22
+++ maven.mdo 12 Apr 2004 14:41:05 -0000 1.23
@@ -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,12 +31,18 @@
<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>
<type>String</type>
@@ -651,6 +657,26 @@
<description>the description</description>
<type>java.util.List</type>
<defaultValue>new ArrayList()</defaultValue>
+ </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>
1.6 +5 -1 maven-components/maven-model/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-model/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 8 Apr 2004 02:02:06 -0000 1.5
+++ project.xml 12 Apr 2004 14:41:05 -0000 1.6
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
