PR: MPGENAPP-27

Generated poms contain deprecated id elements.

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

genapp/src/plugin-resources/complex/template-resources/project.xml

@@ -24,13 +24,13 @@
   <!-- the version of maven's project object model -->
   <pomVersion>3</pomVersion>
 
-  <!-- a unique name for this project -->
-  <id>@ID@</id>
-
   <!--  The short name of the project group.
         This value is used to group all jars for a project in one directory. -->
   <groupId>@ID@</groupId>
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 

genapp/src/plugin-resources/default/template-resources/project.xml

@@ -24,13 +24,13 @@
   <!-- the version of maven's project object model -->
   <pomVersion>3</pomVersion>
 
-  <!-- a unique name for this project -->
-  <id>@ID@</id>
-
   <!--  The short name of the project group.
         This value is used to group all jars for a project in one directory. -->
   <groupId>@ID@</groupId>
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 

genapp/src/plugin-resources/ejb/template-resources/project.xml

@@ -24,13 +24,13 @@
   <!-- the version of maven's project object model -->
   <pomVersion>3</pomVersion>
 
-  <!-- a unique name for this project -->
-  <id>@ID@</id>
-
   <!--  The short name of the project group.
         This value is used to group all jars for a project in one directory. -->
   <groupId>@ID@</groupId>
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 
@@ -86,7 +86,8 @@
     <!-- NOT AVAILABLE IN BIBLIO REPOSITORY -->
     <!--
     <dependency>
-      <id>ejb</id>
+      <groupId>ejb</groupId>
+      <artifactId>ejb</artifactId>
       <version>2.1</version>
     </dependency>
     -->

genapp/src/plugin-resources/struts-jstl/template-resources/project.xml

@@ -24,13 +24,13 @@
   <!-- the version of maven's project object model -->
   <pomVersion>3</pomVersion>
 
-  <!-- a unique name for this project -->
-  <id>@ID@</id>
-
   <!--  The short name of the project group.
         This value is used to group all jars for a project in one directory. -->
   <groupId>@ID@</groupId>
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 

genapp/src/plugin-resources/struts-validation/template-resources/project.xml

@@ -22,12 +22,13 @@
   <!-- the version of maven's project object model -->
 
   <pomVersion>3</pomVersion>
-  <!-- a unique name for this project -->
 
-  <id>@ID@</id>
   <groupId>@ID@</groupId>
   <!-- a short but descriptive name for the project -->
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <name>@NAME@</name>
 
   <!-- The version of the project under development, e.g.
@@ -75,17 +76,20 @@
 
   <dependencies>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
     
     <dependency>
-      <id>servletapi</id>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
       <version>2.3</version>
     </dependency>
 
     <dependency>
-      <id>jstl</id>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
       <version>1.0.2</version>
       <properties>
         <war.bundle>true</war.bundle>
@@ -203,7 +207,8 @@
 
     <!-- XDoclet dependencies -->
     <dependency>
-      <id>xdoclet</id>
+      <groupId>xdoclet</groupId>
+      <artifactId>xdoclet</artifactId>
       <version>1.2</version>
     </dependency>
 

genapp/src/plugin-resources/struts/template-resources/project.xml

@@ -24,13 +24,13 @@
   <!-- the version of maven's project object model -->
   <pomVersion>3</pomVersion>
 
-  <!-- a unique name for this project -->
-  <id>@ID@</id>
-
   <!--  The short name of the project group.
         This value is used to group all jars for a project in one directory. -->
   <groupId>@ID@</groupId>
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 

genapp/src/plugin-resources/tapestry/template-resources/project.xml

@@ -24,13 +24,13 @@
   <!-- the version of maven's project object model -->
   <pomVersion>3</pomVersion>
 
-  <!-- a unique name for this project -->
-  <id>@ID@</id>
-
   <!--  The short name of the project group.
         This value is used to group all jars for a project in one directory. -->
   <groupId>@ID@</groupId>
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 

genapp/src/plugin-resources/web-jstl/template-resources/project.xml

@@ -25,13 +25,13 @@
 
   <pomVersion>3</pomVersion>
 
-  <!-- a unique name for this project -->
-  <id>@ID@</id>
-
   <!--  The short name of the project group.
         This value is used to group all jars for a project in one directory. -->
   <groupId>@ID@</groupId>
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 

genapp/src/plugin-resources/web-velocity/template-resources/project.xml

@@ -24,13 +24,13 @@
   <!-- the version of maven's project object model -->
   <pomVersion>3</pomVersion>
 
-  <!-- a unique name for this project -->
-  <id>@ID@</id>
-
   <!--  The short name of the project group.
         This value is used to group all jars for a project in one directory. -->
   <groupId>@ID@</groupId>
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 

genapp/src/plugin-resources/web/template-resources/project.xml

@@ -24,13 +24,13 @@
   <!-- the version of maven's project object model -->
   <pomVersion>3</pomVersion>
 
-  <!-- a unique name for this project -->
-  <id>@ID@</id>
-
   <!--  The short name of the project group.
         This value is used to group all jars for a project in one directory. -->
   <groupId>@ID@</groupId>
 
+  <!-- a unique name for this project -->
+  <artifactId>@ID@</artifactId>
+
   <!-- a short but descriptive name for the project -->
   <name>@NAME@</name>
 

genapp/xdocs/changes.xml

@@ -23,6 +23,7 @@
   </properties>
   <body>
     <release version="2.3.1-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="fix" issue="MPGENAPP-27">Generated poms contain deprecated id elements.</action>
       <action dev="aheritier" type="update">Update dependencies to unify them between plugins. The following dependencies are updated : commons-jelly-tags-interaction v1.0 to v1.1</action>
     </release>
     <release version="2.3" date="2006-01-07">