PR: MPPOM-6

Fix schema for pom:validate, the id element is deprecated and replaced by groupId/artifactId.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@432394 13f79535-47bb-0310-9956-ffa450edef68

pom/src/plugin-resources/xsd/pom-strict-3.xsd

@@ -45,17 +45,6 @@
     </xs:annotation>
 
     <xs:all>
-      <xs:element minOccurs="0" name="extend" type="xs:string">
-        <xs:annotation>
-          <xs:documentation source="version">3.0.0</xs:documentation>
-
-          <xs:documentation source="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 path may
-          be absolute, or relative to the current project.xml file. &lt;div
-          class="source"&gt;&lt;pre&gt;&amp;lt;extend&amp;gt;${basedir}/../project.xml&amp;lt;/extend&amp;gt;&lt;/pre&gt;&lt;/div&gt;</xs:documentation>
-        </xs:annotation>
-      </xs:element>
 
       <xs:element name="pomVersion">
         <xs:annotation>
@@ -77,7 +66,7 @@
 
       </xs:element>
 
-      <xs:element name="id" type="xs:string">
+      <xs:element minOccurs="0" name="id" type="xs:string">
         <xs:annotation>
           <xs:documentation source="version">3.0.0</xs:documentation>
 
@@ -89,7 +78,7 @@
         </xs:annotation>
       </xs:element>
 
-      <xs:element minOccurs="1" name="groupId" type="xs:string">
+      <xs:element name="groupId" type="xs:string">
         <xs:annotation>
           <xs:documentation source="version">3.0.0+</xs:documentation>
 
@@ -101,7 +90,7 @@
         </xs:annotation>
       </xs:element>
 
-      <xs:element minOccurs="0" name="artifactId" type="xs:string">
+      <xs:element name="artifactId" type="xs:string">
         <xs:annotation>
           <xs:documentation source="version">3.0.0+</xs:documentation>
 

pom/xdocs/validation.xml

@@ -67,134 +67,135 @@
           <th>Element name</th>
           <th>Required in stand-alone pom?</th>
           <th>Required in child pom?</th>
+          <th>Remarks</th>
         </tr>
         <tr>
           <td><code>&lt;extend/&gt;</code></td>
-          <td>N/A</td><td>Yes</td>
+          <td>N/A</td><td>Yes</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;pomVersion/&gt;</code></td>
-          <td>Yes</td><td>Yes</td>
+          <td>Yes</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;id/&gt;</code></td>
-          <td>Yes</td><td>Yes</td>
+          <td>No</td><td>No</td><td>Deprecated, use <code>&lt;groupId/&gt;</code> and &lt;artifactId/&gt; instead.</td>
         </tr>
         <tr>
           <td><code>&lt;groupId/&gt;</code></td>
-          <td>Yes</td><td>No</td>
+          <td>Yes</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;artifactId/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>Yes</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;name/&gt;</code></td>
-          <td>Yes</td><td>Yes</td>
+          <td>Yes</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;currentVersion/&gt;</code></td>
-          <td>Yes</td><td>Yes</td>
+          <td>Yes</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;description/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;shortDescription/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;url/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;logo/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;issueTrackingUrl/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;inceptionYear/&gt;</code></td>
-          <td>Yes</td><td>No</td>
+          <td>Yes</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;gumpRepositoryId/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;siteAddress/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;siteDirectory/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;distributionSite/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;distributionDirectory/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;mailingLists&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;developers&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;contributors&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;licenses&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;versions&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;branches&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;packageGroups&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;reports&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;repository&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;organization&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;properties&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;package/&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;build&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
         <tr>
           <td><code>&lt;dependencies&gt;</code></td>
-          <td>No</td><td>No</td>
+          <td>No</td><td>No</td><td></td>
         </tr>
       </table>
     </subsection>