diff --git a/announcement/project.xml b/announcement/project.xml
index 3cb4bbff..ec57a36f 100644
--- a/announcement/project.xml
+++ b/announcement/project.xml
@@ -9,6 +9,7 @@
   <shortDescription>Produce release announcement</shortDescription>
   <url>http://maven.apache.org/reference/plugins/announcement/</url>
   <!-- TODO: Create JIRA project and replace xxxx by JIRA project id -->
+
   <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=xxxx</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/announcement/</siteDirectory>
   <repository>
@@ -31,20 +32,22 @@
       <id>dion</id>
       <email>dion@apache.org</email>
       <organization>ASF</organization>
-      <roles><role>Java Developer</role></roles>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
       <version>20030211.142705</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
-      <properties><classloader>root.maven</classloader></properties>
+      <properties>
+        <classloader>root.maven</classloader>
+      </properties>
     </dependency>
   </dependencies>
-
   <reports>
     <report>maven-changes-plugin</report>
     <report>maven-changelog-plugin</report>
diff --git a/appserver/project.xml b/appserver/project.xml
index ff1d4979..d0a6a4ce 100644
--- a/appserver/project.xml
+++ b/appserver/project.xml
@@ -55,7 +55,8 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
     </dependency>
     <dependency>
diff --git a/ashkelon/project.xml b/ashkelon/project.xml
index c9dd82cc..8d53e7ed 100644
--- a/ashkelon/project.xml
+++ b/ashkelon/project.xml
@@ -18,47 +18,54 @@
   <developers/>
   <dependencies>
     <dependency>
-      <id>ashkelon</id>
+      <groupId>ashkelon</groupId>
+      <artifactId>ashkelon</artifactId>
       <version>20030312.120000</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>castor</id>
+      <groupId>castor</groupId>
+      <artifactId>castor</artifactId>
       <version>0.9.4.3</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-dbcp</id>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
       <version>1.0-dev</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>java2html</id>
       <jar>j2h-1.2.jar</jar>
+      <groupId>java2html</groupId>
+      <artifactId>java2html</artifactId>
       <version>1.2</version>
     </dependency>
     <dependency>
-      <id>mm.mysql</id>
+      <groupId>mm.mysql</groupId>
+      <artifactId>mm.mysql</artifactId>
       <version>2.0.13-bin</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>servletapi</id>
+      <groupId>servletapi</groupId>
+      <artifactId>servletapi</artifactId>
       <version>2.3</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>oro</id>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
       <version>2.0.7</version>
       <properties>
         <classloader>root.maven</classloader>
diff --git a/aspectj/project.xml b/aspectj/project.xml
index f7019137..44fb14d2 100644
--- a/aspectj/project.xml
+++ b/aspectj/project.xml
@@ -52,7 +52,7 @@
       <name>Pete Kazmier</name>
       <id>kaz</id>
       <email>pete-apache-dev@kazmier.com</email>
-      <organization></organization>
+      <organization/>
       <roles>
         <role>Java Developer</role>
         <role>Documentation</role>
diff --git a/aspectwerkz/project.xml b/aspectwerkz/project.xml
index a411a9d4..0c08d66d 100644
--- a/aspectwerkz/project.xml
+++ b/aspectwerkz/project.xml
@@ -36,7 +36,6 @@
     </developer>
   </developers>
   <dependencies>
-
     <dependency>
       <groupId>aspectwerkz</groupId>
       <artifactId>aspectwerkz-core</artifactId>
@@ -47,7 +46,6 @@
       <artifactId>aspectwerkz</artifactId>
       <version>0.9.RC1</version>
     </dependency>
-
     <!-- Required for Attribute compilation -->
 
     <dependency>
@@ -60,21 +58,20 @@
       <artifactId>jrexx</artifactId>
       <version>1.1.1</version>
     </dependency>
-
     <!-- Required for AspectWerkz offline compilation -->
-    
+
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.5.2</version>
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>bcel</groupId>
       <artifactId>bcel</artifactId>
       <version>5.1</version>
-    </dependency>   
-
+    </dependency>
     <!-- Required both for Attribute and AspectWerkz compilations -->
+
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
@@ -85,7 +82,6 @@
       <artifactId>trove</artifactId>
       <version>1.0.2</version>
     </dependency>
-
   </dependencies>
   <reports>
     <report>maven-changes-plugin</report>
diff --git a/castor/project.xml b/castor/project.xml
index 847bd7bc..18d51653 100644
--- a/castor/project.xml
+++ b/castor/project.xml
@@ -28,7 +28,8 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>castor</id>
+      <groupId>castor</groupId>
+      <artifactId>castor</artifactId>
       <version>0.9.4.3</version>
       <properties>
         <classloader>root</classloader>
diff --git a/changelog/project.xml b/changelog/project.xml
index 95c74734..967f296d 100644
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -36,7 +36,7 @@
         <role>Java Developer</role>
       </roles>
     </developer>
-	<developer>
+    <developer>
       <name>Eric Pugh</name>
       <id>epugh</id>
       <email>epugh@upstate.com</email>
@@ -44,7 +44,7 @@
       <roles>
         <role>Java Developer</role>
       </roles>
-    </developer>    
+    </developer>
     <developer>
       <name>Emmanuel Venisse</name>
       <id>evenisse</id>
@@ -75,9 +75,10 @@
       </roles>
     </developer>
   </developers>
-  <dependencies>  	
+  <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
     </dependency>
     <dependency>
@@ -92,11 +93,13 @@
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
     </dependency>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
     <dependency>
@@ -105,13 +108,15 @@
       <version>200310240100</version>
     </dependency>
     <dependency>
-      <id>regexp</id>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
       <version>1.2</version>
     </dependency>
     <!-- Required because of the Developer class -->
 
     <dependency>
-      <id>maven</id>
+      <groupId>maven</groupId>
+      <artifactId>maven</artifactId>
       <version>1.0-beta-10</version>
     </dependency>
   </dependencies>
diff --git a/clover/src/plugin-test/project.xml b/clover/src/plugin-test/project.xml
index 56ad7045..9775ebe8 100644
--- a/clover/src/plugin-test/project.xml
+++ b/clover/src/plugin-test/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <project>
   <pomVersion>3</pomVersion>
   <id>test-maven-clover-plugin</id>
@@ -32,4 +33,4 @@
   <reports>
     <report>maven-clover-plugin</report>
   </reports>
-</project>
\ No newline at end of file
+</project>
diff --git a/codeswitcher/project.xml b/codeswitcher/project.xml
index 2244fde2..4d7ed227 100644
--- a/codeswitcher/project.xml
+++ b/codeswitcher/project.xml
@@ -40,14 +40,16 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <properties>
         <classloader>root.maven</classloader>
diff --git a/cruisecontrol/project.xml b/cruisecontrol/project.xml
index a3766ca4..681283c3 100644
--- a/cruisecontrol/project.xml
+++ b/cruisecontrol/project.xml
@@ -29,25 +29,29 @@
       <id>dion</id>
       <email>dion@apache.org</email>
       <organization>ASF</organization>
-      <roles><role>Java Developer</role></roles>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-xml</artifactId>
       <version>20030211.142705</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
-      <properties><classloader>root.maven</classloader></properties>
+      <properties>
+        <classloader>root.maven</classloader>
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-jsl</artifactId>
       <version>20030211.143151</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/jsl/</url>
-      <properties><classloader>root.maven</classloader></properties>
+      <properties>
+        <classloader>root.maven</classloader>
+      </properties>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/dashboard/project.xml b/dashboard/project.xml
index 5be3a909..077b1496 100644
--- a/dashboard/project.xml
+++ b/dashboard/project.xml
@@ -55,7 +55,7 @@
     <contributor>
       <name>John D Taylor</name>
       <email>jdt@roe.ac.uk</email>
-    </contributor> 
+    </contributor>
   </contributors>
   <dependencies>
     <dependency>
diff --git a/dashboard/src/plugin-test/project.xml b/dashboard/src/plugin-test/project.xml
index 1c1a9d33..c32ff459 100644
--- a/dashboard/src/plugin-test/project.xml
+++ b/dashboard/src/plugin-test/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <project>
   <pomVersion>3</pomVersion>
   <id>test-maven-dashboard-plugin</id>
@@ -32,4 +33,4 @@
   <reports>
     <report>maven-dashboard-plugin</report>
   </reports>
-</project>
\ No newline at end of file
+</project>
diff --git a/deploy/src/plugin-test/project.xml b/deploy/src/plugin-test/project.xml
index d273eeca..22478bdf 100644
--- a/deploy/src/plugin-test/project.xml
+++ b/deploy/src/plugin-test/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <project>
   <pomVersion>3</pomVersion>
   <name>Test project for Maven Deploy Plugin</name>
@@ -10,35 +11,20 @@
   </organization>
   <inceptionYear>2002</inceptionYear>
   <package>net.nettec.marsh.begin</package>
-
   <shortDescription>Marsh Begin TTS Maven</shortDescription>
-
-  <description>
-    TTS Begin
-  </description>
-
+  <description>TTS Begin</description>
   <url/>
-  <issueTrackingUrl>
-    http://bugzilla
-  </issueTrackingUrl>
+  <issueTrackingUrl>http://bugzilla</issueTrackingUrl>
   <siteAddress>www.nettec.net</siteAddress>
   <siteDirectory/>
   <distributionDirectory/>
   <repository>
-    <connection>
-      scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven
-    </connection>
-    <url>
-      http://cvs.apache.org/viewcvs/maven/
-    </url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
+    <url>http://cvs.apache.org/viewcvs/maven/</url>
   </repository>
-
   <versions/>
-
   <mailingLists/>
-
   <developers>
-
     <developer>
       <name>Nathan Coast</name>
       <id>nathanc</id>
@@ -47,10 +33,10 @@
       <role>Java Developer</role>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
     </dependency>
@@ -61,10 +47,7 @@
       <url>http://jakarta.apache.org/commons/logging.html</url>
     </dependency>
   </dependencies>
-
   <build>
-
     <nagEmailAddress>nathan.coast@nettec.net</nagEmailAddress>
-              
   </build>
 </project>
diff --git a/dist/project.xml b/dist/project.xml
index 3f43e2f7..bda5e45b 100644
--- a/dist/project.xml
+++ b/dist/project.xml
@@ -45,14 +45,16 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <properties>
         <classloader>root.maven</classloader>
diff --git a/docbook/project.xml b/docbook/project.xml
index 6a8056fd..895478f8 100644
--- a/docbook/project.xml
+++ b/docbook/project.xml
@@ -36,21 +36,24 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>xalan</id>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
       <version>2.4.1</version>
       <url>http://xml.apache.org/xalan-j/</url>
       <properties>
diff --git a/ear/src/plugin-test/project.xml b/ear/src/plugin-test/project.xml
index 413ac5cc..1689e241 100644
--- a/ear/src/plugin-test/project.xml
+++ b/ear/src/plugin-test/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <project>
   <pomVersion>3</pomVersion>
   <name>Test project for Maven Ear Plugin</name>
@@ -10,35 +11,20 @@
   </organization>
   <inceptionYear>2002</inceptionYear>
   <package>net.nettec.marsh.begin</package>
-
   <shortDescription>Marsh Begin TTS Maven</shortDescription>
-
-  <description>
-    TTS Begin
-  </description>
-
+  <description>TTS Begin</description>
   <url/>
-  <issueTrackingUrl>
-    http://bugzilla
-  </issueTrackingUrl>
+  <issueTrackingUrl>http://bugzilla</issueTrackingUrl>
   <siteAddress>www.nettec.net</siteAddress>
   <siteDirectory/>
   <distributionDirectory/>
   <repository>
-    <connection>
-      scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven
-    </connection>
-    <url>
-      http://cvs.apache.org/viewcvs/maven/
-    </url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
+    <url>http://cvs.apache.org/viewcvs/maven/</url>
   </repository>
-
   <versions/>
-
   <mailingLists/>
-
   <developers>
-
     <developer>
       <name>Nathan Coast</name>
       <id>nathanc</id>
@@ -47,10 +33,10 @@
       <role>Java Developer</role>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
       <properties>
@@ -58,27 +44,21 @@
       </properties>
     </dependency>
   </dependencies>
-
   <build>
-
     <nagEmailAddress>nathan.coast@nettec.net</nagEmailAddress>
-
     <sourceDirectory>src</sourceDirectory>
-
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-              
     <!-- Resources that are packaged up inside the JAR file -->
+
     <resources>
-      <!--includes>
+    <!--includes>
         <include>*.xsd</include>
         <include>log4j.properties</include>
       </includes-->
-    </resources>
-
+</resources>
     <!-- Integration unit test cases -->
-    <integrationUnitTest/>
 
-    <jars>
-    </jars>
+    <integrationUnitTest/>
+    <jars></jars>
   </build>
 </project>
diff --git a/examples/exampleear-1.0/project.xml b/examples/exampleear-1.0/project.xml
index 126fe6d7..754ed923 100644
--- a/examples/exampleear-1.0/project.xml
+++ b/examples/exampleear-1.0/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <project>
   <pomVersion>3</pomVersion>
   <name>exampleear</name>
@@ -10,38 +11,23 @@
   </organization>
   <inceptionYear>2002</inceptionYear>
   <package>net.nettec.marsh.begin</package>
-
   <shortDescription>Marsh Begin TTS Maven</shortDescription>
-
   <!-- Gump integration -->
+
   <gumpRepositoryId/>
-
-  <description>
-    TTS Begin
-  </description>
-
+  <description>TTS Begin</description>
   <url/>
-  <issueTrackingUrl>
-    http://bugzilla
-  </issueTrackingUrl>
+  <issueTrackingUrl>http://bugzilla</issueTrackingUrl>
   <siteAddress>www.nettec.net</siteAddress>
   <siteDirectory/>
   <distributionDirectory/>
   <repository>
-    <connection>
-      scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven
-    </connection>
-    <url>
-      http://cvs.apache.org/viewcvs/maven/
-    </url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
+    <url>http://cvs.apache.org/viewcvs/maven/</url>
   </repository>
-
   <versions/>
-
   <mailingLists/>
-
   <developers>
-
     <developer>
       <name>Nathan Coast</name>
       <id>nathanc</id>
@@ -50,10 +36,10 @@
       <role>Java Developer</role>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.2</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
       <properties>
@@ -61,20 +47,12 @@
       </properties>
     </dependency>
   </dependencies>
-
   <build>
-
-    <nagEmailAddress>
-      nathan.coast@nettec.net
-    </nagEmailAddress>
-
+    <nagEmailAddress>nathan.coast@nettec.net</nagEmailAddress>
     <sourceDirectory>src</sourceDirectory>
-
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
     <integrationUnitTestSourceDirectory/>
-
     <aspectSourceDirectory/>
-
     <!-- Unit test cases -->
     <!--unitTest>
       <includes>
@@ -84,20 +62,18 @@
         <exclude>**/RepositoryTest.java</exclude>
       </excludes>
     </unitTest-->
-              
     <!-- J A R  R E S O U R C E S -->
     <!-- Resources that are packaged up inside the JAR file -->
+
     <resources>
-      <!--includes>
+    <!--includes>
         <include>*.xsd</include>
         <include>log4j.properties</include>
       </includes-->
-    </resources>
-
+</resources>
     <!-- Integration unit test cases -->
-    <integrationUnitTest/>
 
-    <jars>
-    </jars>
+    <integrationUnitTest/>
+    <jars></jars>
   </build>
 </project>
diff --git a/examples/plugin-script/project.xml b/examples/plugin-script/project.xml
index 4c4c486e..a9dfc430 100644
--- a/examples/plugin-script/project.xml
+++ b/examples/plugin-script/project.xml
@@ -1,70 +1,68 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<project>
   <!-- the version of maven's project object model -->
+
   <pomVersion>3</pomVersion>
-  
   <!-- a unique name for this project -->
+
   <id>maven-examples-plugin-script</id>
-  
   <!-- a short but descriptive name for the project -->
+
   <name>A plugin using the script tag</name>
-  
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->
+
   <currentVersion>1.0-SNAPSHOT</currentVersion>
-  
   <!-- details about the organization that 'owns' the project -->
+
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://jakarta.apache.org/</url>
   </organization>
-  
   <!-- the year the project started -->
+
   <inceptionYear>2002</inceptionYear>
-  
   <!-- the top level of java packages that this project defines
        e.g. if your project contains the packages
        com.mycompany.accounts.reports, com.mycompany.accounts.reports
        and com.mycompany.accounts.utils, the package would be
        'com.mycompany.accounts' -->
+
   <package>org.apache.maven.examples.pluginscript</package>
-  
   <!-- a short description of what the project does -->
-  <shortDescription>
-    A plugin that does it's processing in a script tag
-  </shortDescription>
 
+  <shortDescription>A plugin that does it's processing in a script tag</shortDescription>
   <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
 
+  <url>http://maven.apache.org/</url>
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
+
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples/plugin-script</connection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/plugin-script/</url>
   </repository>
-
   <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers />
 
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers/>
   <!-- jar files the project is dependent on -->
+
   <dependencies>
     <dependency>
-      <id>bsh</id>
+      <groupId>bsh</groupId>
+      <artifactId>bsh</artifactId>
       <version>1.2-b3</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
   </dependencies>
-  
   <!-- build information for the project -->
-  <build />
 
+  <build/>
 </project>
-
diff --git a/examples/simple-ear/project.xml b/examples/simple-ear/project.xml
index d7f2c09a..144156cb 100644
--- a/examples/simple-ear/project.xml
+++ b/examples/simple-ear/project.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<project>
   <!-- the version of maven's project object model -->
+
   <pomVersion>3</pomVersion>
-  
   <!-- a unique name for this project -->
+
   <id>maven-examples-simple-ear</id>
-  
   <!-- a short but descriptive name for the project -->
+
   <name>Simple Ear</name>
-  
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->
+
   <currentVersion>1.0-SNAPSHOT</currentVersion>
-  
   <!-- details about the organization that 'owns' the project -->
+
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://jakarta.apache.org/</url>
   </organization>
-  
   <!-- the year the project started -->
+
   <inceptionYear>2002</inceptionYear>
-  
   <!-- the top level of java packages that this project defines
        e.g. if your project contains the packages
        com.mycompany.accounts.reports, com.mycompany.accounts.reports
        and com.mycompany.accounts.utils, the package would be
        'com.mycompany.accounts' -->
+
   <package>org.apache.maven.examples.simpleear</package>
-  
   <!-- a short description of what the project does -->
+
   <shortDescription>A simple ear generating project</shortDescription>
-
   <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
 
+  <url>http://maven.apache.org/</url>
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
+
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
     <url>http://cvs.apache.org/viewcvs/maven/</url>
   </repository>
-
   <!-- any mailing lists for the project -->
+
   <mailingLists/>
-  
   <!-- who the developers are for the project -->
-  <developers />
 
+  <developers/>
   <!-- jar files the project is dependent on -->
+
   <dependencies>
-  	<dependency>
-  		<id>checkstyle</id>
-  		<version>2.4</version>
-  		<properties>
-  			<ear.bundle.jar>true</ear.bundle.jar>
-  		</properties>
-  	</dependency>
+    <dependency>
+      <groupId>checkstyle</groupId>
+      <artifactId>checkstyle</artifactId>
+      <version>2.4</version>
+      <properties>
+        <ear.bundle.jar>true</ear.bundle.jar>
+      </properties>
+    </dependency>
   </dependencies>
-  
   <!-- build information for the project -->
+
   <build/>
-
 </project>
-
diff --git a/examples/simple-filtering/project.xml b/examples/simple-filtering/project.xml
index cef2fa5b..10f790b5 100644
--- a/examples/simple-filtering/project.xml
+++ b/examples/simple-filtering/project.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<project>
   <!-- the version of maven's project object model -->
+
   <pomVersion>3</pomVersion>
-  
   <!-- a unique name for this project -->
+
   <id>maven-examples-simple-filtering</id>
-  
   <!-- a short but descriptive name for the project -->
+
   <name>Simple Filtering</name>
-  
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->
+
   <currentVersion>1.0-SNAPSHOT</currentVersion>
-  
   <!-- details about the organization that 'owns' the project -->
+
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://jakarta.apache.org/</url>
   </organization>
-  
   <!-- the year the project started -->
+
   <inceptionYear>2002</inceptionYear>
-  
   <!-- the top level of java packages that this project defines
        e.g. if your project contains the packages
        com.mycompany.accounts.reports, com.mycompany.accounts.reports
        and com.mycompany.accounts.utils, the package would be
        'com.mycompany.accounts' -->
+
   <package>org.apache.maven.examples.simplefiltering</package>
-  
   <!-- a short description of what the project does -->
+
   <shortDescription>A simple project showing filtering of resources</shortDescription>
-
   <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
 
+  <url>http://maven.apache.org/</url>
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
+
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
     <url>http://cvs.apache.org/viewcvs/maven/</url>
   </repository>
-
   <!-- any mailing lists for the project -->
+
   <mailingLists/>
-  
   <!-- who the developers are for the project -->
-  <developers />
 
+  <developers/>
   <!-- jar files the project is dependent on -->
-  <dependencies/>
-  
-  <!-- build information for the project -->
-  <build>
-  	<sourceDirectory>src/java</sourceDirectory>
 
+  <dependencies/>
+  <!-- build information for the project -->
+
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
     <resources>
       <resource>
         <filtering>true</filtering>
@@ -72,8 +72,5 @@
         </includes>
       </resource>
     </resources>
-
   </build>
-
 </project>
-
diff --git a/examples/simple-java/project.xml b/examples/simple-java/project.xml
index bfbb006a..f7fa6cdf 100644
--- a/examples/simple-java/project.xml
+++ b/examples/simple-java/project.xml
@@ -1,65 +1,63 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<project>
   <!-- the version of maven's project object model -->
+
   <pomVersion>3</pomVersion>
-  
   <!-- a unique name for this project -->
+
   <id>maven-examples-simple-java</id>
-  
   <!-- a short but descriptive name for the project -->
+
   <name>Simple Java</name>
-  
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->
+
   <currentVersion>1.0-SNAPSHOT</currentVersion>
-  
   <!-- details about the organization that 'owns' the project -->
+
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://jakarta.apache.org/</url>
   </organization>
-  
   <!-- the year the project started -->
+
   <inceptionYear>2002</inceptionYear>
-  
   <!-- the top level of java packages that this project defines
        e.g. if your project contains the packages
        com.mycompany.accounts.reports, com.mycompany.accounts.reports
        and com.mycompany.accounts.utils, the package would be
        'com.mycompany.accounts' -->
+
   <package>org.apache.maven.examples.simplejava</package>
-  
   <!-- a short description of what the project does -->
+
   <shortDescription>A simple java project</shortDescription>
-  
   <description>Hello World</description>
-
   <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
 
+  <url>http://maven.apache.org/</url>
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
+
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
     <url>http://cvs.apache.org/viewcvs/maven/</url>
   </repository>
-
   <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers />
 
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers/>
   <!-- jar files the project is dependent on -->
+
   <dependencies/>
-  
   <!-- build information for the project -->
+
   <build>
-  	<sourceDirectory>src/java</sourceDirectory>
+    <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
   </build>
-
 </project>
-
diff --git a/examples/simple-webapp/project.xml b/examples/simple-webapp/project.xml
index 58dd8fc7..3431f422 100644
--- a/examples/simple-webapp/project.xml
+++ b/examples/simple-webapp/project.xml
@@ -1,62 +1,61 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<project>
   <!-- the version of maven's project object model -->
+
   <pomVersion>3</pomVersion>
-  
   <!-- a unique name for this project -->
+
   <id>maven-examples-simple-webapp</id>
-  
   <!-- a short but descriptive name for the project -->
+
   <name>Simple Web App</name>
-  
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->
+
   <currentVersion>1.0-SNAPSHOT</currentVersion>
-  
   <!-- details about the organization that 'owns' the project -->
+
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://jakarta.apache.org/</url>
   </organization>
-  
   <!-- the year the project started -->
+
   <inceptionYear>2002</inceptionYear>
-  
   <!-- the top level of java packages that this project defines
        e.g. if your project contains the packages
        com.mycompany.accounts.reports, com.mycompany.accounts.reports
        and com.mycompany.accounts.utils, the package would be
        'com.mycompany.accounts' -->
+
   <package>org.apache.maven.examples.simplewebapp</package>
-  
   <!-- a short description of what the project does -->
+
   <shortDescription>A simple web app project</shortDescription>
-
   <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
 
+  <url>http://maven.apache.org/</url>
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
+
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples/simple-webapp</connection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/simple-webapp/</url>
   </repository>
-
   <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers />
 
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers/>
   <!-- jar files the project is dependent on -->
+
   <dependencies/>
-  
   <!-- build information for the project. We have no source, tests,
        resources etc
     -->
-  <build />
 
+  <build/>
 </project>
-
diff --git a/examples/simple-xdocs/project.xml b/examples/simple-xdocs/project.xml
index dd76c602..a3815108 100644
--- a/examples/simple-xdocs/project.xml
+++ b/examples/simple-xdocs/project.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <project>
   <pomVersion>1</pomVersion>
   <name>Maven example</name>
@@ -8,21 +9,17 @@
     <name>Apache</name>
     <url>http://jakarta.apache.org/</url>
     <!-- <logo>/images/jpmorgan.gif</logo> -->
+
   </organization>
   <inceptionYear>2002</inceptionYear>
-  <package></package>
-
+  <package/>
   <shortDescription>A Maven example</shortDescription>
-
   <!-- Gump integration -->
 
-  <description>
-    This is a quick example of what Maven can do.
-  </description>
-
-  <url></url>
+  <description>This is a quick example of what Maven can do.</description>
+  <url/>
   <logo>/images/maven.jpg</logo>
-<!--  <issueTrackingUrl>http://ksd-ln07.uk.jpmorgan.com/eragbat/jira/</issueTrackingUrl>
+  <!--  <issueTrackingUrl>http://ksd-ln07.uk.jpmorgan.com/eragbat/jira/</issueTrackingUrl>
 
   <siteAddress>ksd-ln07.uk.jpmorgan.com</siteAddress>
   <siteDirectory>/local/netscape/suitespot/docs/eragbat/pa/target/</siteDirectory>
@@ -45,60 +42,29 @@
   <mailingLists>
     <mailingList>
       <name>Maven User List</name>
-      <subscribe>
-        turbine-maven-user-subscribe@jakarta.apache.org
-      </subscribe>
-      <unsubscribe>
-        turbine-maven-user-unsubscribe@jakarta.apache.org
-      </unsubscribe>
-      <archive>
-        http://www.mail-archive.com/turbine-maven-user@jakarta.apache.org/
-      </archive>
+      <subscribe>turbine-maven-user-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>turbine-maven-user-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://www.mail-archive.com/turbine-maven-user@jakarta.apache.org/</archive>
     </mailingList>
     <mailingList>
       <name>Maven Developer List</name>
-      <subscribe>
-        turbine-maven-dev-subscribe@jakarta.apache.org
-      </subscribe>
-      <unsubscribe>
-        turbine-maven-dev-unsubscribe@jakarta.apache.org
-      </unsubscribe>
-      <archive>
-        http://www.mail-archive.com/turbine-maven-dev@jakarta.apache.org/
-      </archive>
+      <subscribe>turbine-maven-dev-subscribe@jakarta.apache.org</subscribe>
+      <unsubscribe>turbine-maven-dev-unsubscribe@jakarta.apache.org</unsubscribe>
+      <archive>http://www.mail-archive.com/turbine-maven-dev@jakarta.apache.org/</archive>
     </mailingList>
   </mailingLists>
-
-  <developers>
-  </developers>
-
-  <contributors>
-  </contributors>
-
-  <dependencies>
-  </dependencies>
-
-	<build>
-	    <nagEmailAddress></nagEmailAddress>
-	    <sourceDirectory>src/java</sourceDirectory>
-	    <unitTestSourceDirectory></unitTestSourceDirectory>
-
-	    <integrationUnitTestSourceDirectory>
-	    </integrationUnitTestSourceDirectory>
-
-	    <aspectSourceDirectories>
-	    </aspectSourceDirectories>
-
-	    <unitTest>
-	    </unitTest>
-
-	    <integrationUnitTestPatterns>
-	    </integrationUnitTestPatterns>
-
-	    <jarResources>
-	    </jarResources>
-
-	    <jars>
-	    </jars>
-	  </build>
-</project>
\ No newline at end of file
+  <developers></developers>
+  <contributors></contributors>
+  <dependencies></dependencies>
+  <build>
+    <nagEmailAddress/>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory/>
+    <integrationUnitTestSourceDirectory></integrationUnitTestSourceDirectory>
+    <aspectSourceDirectories></aspectSourceDirectories>
+    <unitTest></unitTest>
+    <integrationUnitTestPatterns></integrationUnitTestPatterns>
+    <jarResources></jarResources>
+    <jars></jars>
+  </build>
+</project>
diff --git a/faq/project.xml b/faq/project.xml
index 1e78076b..0a6d89b5 100644
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -44,7 +44,7 @@
       <roles>
         <role>Java Developer</role>
       </roles>
-    </developer>    
+    </developer>
   </developers>
   <dependencies>
     <dependency>
@@ -59,17 +59,20 @@
     <!-- core dependencies which i'd have thought Maven introduced -->
 
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
       <url>http://www.dom4j.org/</url>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
diff --git a/genapp/project.xml b/genapp/project.xml
index ffd0b259..4233fbfc 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <project>
   <extend>../project.xml</extend>
@@ -40,7 +40,7 @@
       <email>rhoegg@isisnetworks.net</email>
     </contributor>
     <contributor>
-      <name>Jörg Schaible</name>
+      <name>J�rg Schaible</name>
       <id>joehni</id>
       <email>joerg.schaible@elsag-solutions.com</email>
       <organization>Elsag-Solutions AG</organization>
diff --git a/genapp/src/plugin-resources/default/template-resources/project.xml b/genapp/src/plugin-resources/default/template-resources/project.xml
index 7a8e784c..6edeef98 100644
--- a/genapp/src/plugin-resources/default/template-resources/project.xml
+++ b/genapp/src/plugin-resources/default/template-resources/project.xml
@@ -1,69 +1,65 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<project>
   <!-- the version of maven's project object model -->
+
   <pomVersion>3</pomVersion>
-  
   <!-- a unique name for this project -->
+
   <id>@ID@</id>
-  
   <!-- a short but descriptive name for the project -->
+
   <name>@NAME@</name>
-  
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-SNAPSHOT -->
+
   <currentVersion>1.0</currentVersion>
-  
   <!-- details about the organization that 'owns' the project -->
+
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
     <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
   </organization>
-  
   <!-- the year the project started -->
+
   <inceptionYear>2002</inceptionYear>
   <package>@PACKAGE@</package>
   <logo>http://maven.apache.org/images/maven.jpg</logo>
-  <description>
-    A collection of example projects showing how to use maven in different
-    situations   
-  </description>
+  <description>A collection of example projects showing how to use maven in different situations</description>
   <!-- a short description of what the project does -->
-  <shortDescription>
-    How to use maven in different situations
-  </shortDescription>
 
+  <shortDescription>How to use maven in different situations</shortDescription>
   <!-- the project home page -->
+
   <url>http://maven.apache.org/reference/plugins/examples/</url>
   <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/maven.apache.org/reference/plugins/examples/</siteDirectory>
   <distributionDirectory>/www/maven.apache.org/builds/</distributionDirectory>
-
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
+
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/examples</connection>
     <url>http://cvs.apache.org/viewcvs/maven-plugins/examples/</url>
   </repository>
-
   <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers/>
 
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers/>
   <!-- jar files the project is dependent on -->
+
   <dependencies/>
-  
   <!-- build information for the project -->
+
   <build>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
     <sourceDirectory>src/java</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
     <unitTest>
       <includes>
         <include>**/*Test.java</include>
@@ -72,7 +68,6 @@
         <exclude>**/NaughtyTest.java</exclude>
       </excludes>
     </unitTest>
-
     <resources>
       <resource>
         <directory>src/conf</directory>
@@ -82,7 +77,4 @@
       </resource>
     </resources>
   </build>
-
-
 </project>
-
diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml
index 38b5004c..1c27f794 100644
--- a/html2xdoc/project.xml
+++ b/html2xdoc/project.xml
@@ -48,7 +48,8 @@
       </properties>
     </dependency>
     <dependency>
-      <id>nekohtml</id>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
       <version>0.7.7</version>
       <properties>
         <classloader>root.maven</classloader>
@@ -57,24 +58,28 @@
     <!-- core dependencies which i'd have thought Maven introduced -->
 
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
       <url>http://www.dom4j.org/</url>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
@@ -82,13 +87,11 @@
   <build>
     <sourceDirectory>src/main</sourceDirectory>
     <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
-
     <unitTest>
       <includes>
         <include>**/*Test.java</include>
       </includes>
     </unitTest>
-
     <resources>
       <resource>
         <directory>src/plugin-resources</directory>
diff --git a/j2ee/project.xml b/j2ee/project.xml
index 771d0c5f..85613f07 100644
--- a/j2ee/project.xml
+++ b/j2ee/project.xml
@@ -65,7 +65,8 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
@@ -80,25 +81,29 @@
       </properties>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
     </dependency>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
   </dependencies>
diff --git a/jalopy/project.xml b/jalopy/project.xml
index 8b769640..a547252a 100644
--- a/jalopy/project.xml
+++ b/jalopy/project.xml
@@ -55,14 +55,16 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>jalopy</id>
+      <groupId>jalopy</groupId>
+      <artifactId>jalopy</artifactId>
       <version>1.0b10</version>
       <properties>
         <classloader>root</classloader>
@@ -77,42 +79,48 @@
       </properties>
     </dependency>
     <dependency>
-      <id>aelfred</id>
+      <groupId>aelfred</groupId>
+      <artifactId>aelfred</artifactId>
       <version>1.2</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>jdom</id>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
       <version>1.0b8</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>log4j</id>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
       <version>1.2.8</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>oro</id>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
       <version>2.0.7</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>textarea</id>
+      <groupId>textarea</groupId>
+      <artifactId>textarea</artifactId>
       <version>2.2.3</version>
       <properties>
         <classloader>root</classloader>
diff --git a/javadoc/project.xml b/javadoc/project.xml
index df81c1cf..b2c88939 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -74,14 +74,16 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <properties>
         <classloader>root.maven</classloader>
diff --git a/jboss/sample/project.xml b/jboss/sample/project.xml
index 97c63c03..a2bdb727 100644
--- a/jboss/sample/project.xml
+++ b/jboss/sample/project.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<project>
   <!-- the version of maven's project object model -->
+
   <pomVersion>3</pomVersion>
-  
   <!-- a unique name for this project -->
+
   <id>maven-jboss-sample</id>
-  
   <!-- a short but descriptive name for the project -->
+
   <name>JBoss plugin Sample</name>
-  
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->
+
   <currentVersion>1.0</currentVersion>
-  
   <!-- details about the organization that 'owns' the project -->
+
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://jakarta.apache.org/</url>
   </organization>
-  
   <!-- the year the project started -->
+
   <inceptionYear>2002</inceptionYear>
-  
   <!-- the top level of java packages that this project defines
        e.g. if your project contains the packages
        com.mycompany.accounts.reports, com.mycompany.accounts.reports
        and com.mycompany.accounts.utils, the package would be
        'com.mycompany.accounts' -->
+
   <package>org.apache.maven.jboss.sample</package>
-  
   <!-- a short description of what the project does -->
+
   <shortDescription>A sample project using the Jboss plugin for Maven</shortDescription>
-
   <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
 
+  <url>http://maven.apache.org/</url>
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
+
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven</connection>
     <url>http://cvs.apache.org/viewcvs/maven/</url>
   </repository>
-
   <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers/>
 
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers/>
   <!-- jar files the project is dependent on -->
+
   <dependencies/>
-  
   <!-- build information for the project -->
+
   <build>
     <sourceDirectory>src/java</sourceDirectory>
   </build>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/jcoverage/project.xml b/jcoverage/project.xml
index 5352353a..b1ba77e9 100644
--- a/jcoverage/project.xml
+++ b/jcoverage/project.xml
@@ -117,4 +117,4 @@
     <report>maven-developer-activity-plugin</report>
     <report>maven-license-plugin</report>
   </reports>
-</project>
\ No newline at end of file
+</project>
diff --git a/jdepend/project.xml b/jdepend/project.xml
index f69ace4f..9d3242aa 100644
--- a/jdepend/project.xml
+++ b/jdepend/project.xml
@@ -81,21 +81,24 @@
       </properties>
     </dependency>
     <dependency>
-      <id>jdepend</id>
+      <groupId>jdepend</groupId>
+      <artifactId>jdepend</artifactId>
       <version>2.5</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <properties>
         <classloader>root</classloader>
diff --git a/jdeveloper/project.xml b/jdeveloper/project.xml
index be233a65..0703e221 100644
--- a/jdeveloper/project.xml
+++ b/jdeveloper/project.xml
@@ -40,7 +40,8 @@
     <!-- Don't upgrade to 2.5! -->
 
     <dependency>
-      <id>jdepend</id>
+      <groupId>jdepend</groupId>
+      <artifactId>jdepend</artifactId>
       <version>2.3</version>
       <properties>
         <classloader>root</classloader>
diff --git a/jellydoc/project.xml b/jellydoc/project.xml
index 0c7c8d3b..575d85e0 100644
--- a/jellydoc/project.xml
+++ b/jellydoc/project.xml
@@ -67,14 +67,16 @@
       </properties>
     </dependency>
     <dependency>
-      <id>javadoc</id>
+      <groupId>javadoc</groupId>
+      <artifactId>javadoc</artifactId>
       <version>1.3</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>nekohtml</id>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
       <version>0.7.7</version>
       <properties>
         <classloader>root.maven</classloader>
@@ -83,17 +85,20 @@
     <!-- core dependencies which i'd have thought Maven introduced -->
 
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
       <url>http://www.dom4j.org/</url>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
diff --git a/junitdoclet/project.xml b/junitdoclet/project.xml
index c1415f4b..1710b0fd 100644
--- a/junitdoclet/project.xml
+++ b/junitdoclet/project.xml
@@ -28,7 +28,8 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>junit-doclet</id>
+      <groupId>junit-doclet</groupId>
+      <artifactId>junit-doclet</artifactId>
       <version>1.0.1</version>
     </dependency>
   </dependencies>
diff --git a/jxr/project.xml b/jxr/project.xml
index cd0663e5..9c961dc6 100644
--- a/jxr/project.xml
+++ b/jxr/project.xml
@@ -46,14 +46,16 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-jelly</id>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly</artifactId>
       <version>20030902.160215</version>
       <properties>
         <classloader>root.maven</classloader>
@@ -77,39 +79,45 @@
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>oro</id>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
       <version>2.0.7</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <properties>
         <classloader>root</classloader>
diff --git a/latex/project.xml b/latex/project.xml
index b49e65ce..538af15c 100644
--- a/latex/project.xml
+++ b/latex/project.xml
@@ -46,21 +46,24 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>anttex</id>
+      <groupId>anttex</groupId>
+      <artifactId>anttex</artifactId>
       <version>1.0</version>
       <properties>
         <classloader>root</classloader>
diff --git a/latka/project.xml b/latka/project.xml
index 2d2e56c8..658239fa 100644
--- a/latka/project.xml
+++ b/latka/project.xml
@@ -36,42 +36,48 @@
       </properties>
     </dependency>
     <dependency>
-      <id>commons-latka</id>
+      <groupId>commons-latka</groupId>
+      <artifactId>commons-latka</artifactId>
       <version>1.0-dev.20030107.163533</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-httpclient</id>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
       <version>2.0alpha1-20020829</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>jaxen</id>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
       <version>1.0-FCS-full</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>jdom</id>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
       <version>1.0b8</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>junit</id>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>regexp</id>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
       <version>1.2</version>
       <url>http://jakarta.apache.org/regexp/</url>
       <properties>
@@ -79,7 +85,8 @@
       </properties>
     </dependency>
     <dependency>
-      <id>xalan</id>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
       <version>2.4.1</version>
       <url>http://xml.apache.org/xalan-j/</url>
       <properties>
@@ -99,7 +106,8 @@
       </properties>
     </dependency>
     <dependency>
-      <id>nekohtml</id>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
       <version>0.7.7</version>
       <properties>
         <classloader>root.maven</classloader>
diff --git a/linkcheck/project.xml b/linkcheck/project.xml
index 1f387024..8b183bab 100644
--- a/linkcheck/project.xml
+++ b/linkcheck/project.xml
@@ -17,46 +17,53 @@
   <developers/>
   <dependencies>
     <dependency>
-      <id>commons-beanutils</id>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
       <version>1.6.1</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-collections</id>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
       <version>2.1</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-grant</id>
+      <groupId>commons-grant</groupId>
+      <artifactId>commons-grant</artifactId>
       <version>1.0-beta-4</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-httpclient</id>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
       <version>2.0-rc1</version>
     </dependency>
     <dependency>
-      <id>commons-jelly</id>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly</artifactId>
       <version>20030902.160215</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-util</id>
+      <groupId>commons-util</groupId>
+      <artifactId>commons-util</artifactId>
       <version>final</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <properties>
         <classloader>root.maven</classloader>
@@ -89,7 +96,8 @@
       </properties>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
       <properties>
         <classloader>root.maven</classloader>
@@ -98,40 +106,46 @@
     <dependency>
       <!-- Required for commons-httpclient -->
 
-      <id>log4j</id>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
       <version>1.2.8</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>jtidy</id>
+      <groupId>jtidy</groupId>
+      <artifactId>jtidy</artifactId>
       <version>4aug2000r7-dev</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>maven</id>
+      <groupId>maven</groupId>
+      <artifactId>maven</artifactId>
       <version>1.0-beta-10</version>
     </dependency>
     <dependency>
-      <id>rhino</id>
-      <version>1.5R4-RC3</version>
       <jar>js-1.5R4-RC3.jar</jar>
+      <groupId>rhino</groupId>
+      <artifactId>rhino</artifactId>
+      <version>1.5R4-RC3</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>werkz</id>
+      <groupId>werkz</groupId>
+      <artifactId>werkz</artifactId>
       <version>1.0-beta-10</version>
       <url>http://werkz.sourceforge.net/</url>
       <properties>
diff --git a/native/project.xml b/native/project.xml
index 27a2038d..f9439762 100644
--- a/native/project.xml
+++ b/native/project.xml
@@ -36,7 +36,8 @@
       </properties>
     </dependency>
     <dependency>
-      <id>bcel</id>
+      <groupId>bcel</groupId>
+      <artifactId>bcel</artifactId>
       <version>5.0</version>
       <properties>
         <classloader>root</classloader>
diff --git a/pdf/project.xml b/pdf/project.xml
index 4de1fdf3..4b511b84 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -37,37 +37,44 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>fop</id>
+      <groupId>fop</groupId>
+      <artifactId>fop</artifactId>
       <version>0.20.5rc2</version>
     </dependency>
     <dependency>
-      <id>batik</id>
+      <groupId>batik</groupId>
+      <artifactId>batik</artifactId>
       <version>1.1.1</version>
     </dependency>
     <dependency>
-      <id>logkit</id>
+      <groupId>logkit</groupId>
+      <artifactId>logkit</artifactId>
       <version>1.0.1</version>
     </dependency>
     <dependency>
-      <id>avalon-framework</id>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework</artifactId>
       <version>4.0</version>
     </dependency>
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>xalan</id>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
       <version>2.4.1</version>
     </dependency>
   </dependencies>
diff --git a/perforce/project.xml b/perforce/project.xml
index df6f27bb..42d56937 100644
--- a/perforce/project.xml
+++ b/perforce/project.xml
@@ -41,14 +41,16 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>oro</id>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
       <version>2.0.7</version>
       <properties>
         <classloader>root</classloader>
diff --git a/plugin/project.xml b/plugin/project.xml
index 2203c6ac..c2d4531b 100644
--- a/plugin/project.xml
+++ b/plugin/project.xml
@@ -41,7 +41,7 @@
       <roles>
         <role>Developer</role>
       </roles>
-    </developer>    
+    </developer>
   </developers>
   <dependencies>
     <dependency>
diff --git a/plugin/src/plugin-test/project.xml b/plugin/src/plugin-test/project.xml
index 65b45aa4..98a2c6ae 100644
--- a/plugin/src/plugin-test/project.xml
+++ b/plugin/src/plugin-test/project.xml
@@ -62,10 +62,8 @@
       </properties>
     </dependency>
   </dependencies>
-
   <build>
     <sourceDirectory>src/main</sourceDirectory>
-
     <resources>
       <resource>
         <directory>src/plugin-resources</directory>
@@ -81,7 +79,5 @@
         </includes>
       </resource>
     </resources>
-
-
   </build>
 </project>
diff --git a/pom/project.xml b/pom/project.xml
index 8cfebca1..55e89fd6 100644
--- a/pom/project.xml
+++ b/pom/project.xml
@@ -55,20 +55,24 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
     </dependency>
     <dependency>
-      <id>maven</id>
-      <version>1.0-beta-10</version>
       <jar>maven.jar</jar>
+      <groupId>maven</groupId>
+      <artifactId>maven</artifactId>
+      <version>1.0-beta-10</version>
     </dependency>
     <dependency>
-      <id>isorelax</id>
+      <groupId>isorelax</groupId>
+      <artifactId>isorelax</artifactId>
       <version>20030108</version>
       <properties>
         <classloader>root</classloader>
@@ -85,7 +89,8 @@
       </properties>
     </dependency>
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
       <properties>
         <classloader>root</classloader>
diff --git a/release/project.xml b/release/project.xml
index b74fa8b2..bcf441b1 100644
--- a/release/project.xml
+++ b/release/project.xml
@@ -28,33 +28,40 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>maven</id>
-      <version>1.0-beta-10</version>
       <jar>maven.jar</jar>
+      <groupId>maven</groupId>
+      <artifactId>maven</artifactId>
+      <version>1.0-beta-10</version>
     </dependency>
     <dependency>
-      <id>commons-io</id>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
       <version>20030203.000550</version>
     </dependency>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
       <url>http://www.dom4j.org/</url>
     </dependency>
     <dependency>
-      <id>jaxen</id>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
       <version>1.0-FCS-full</version>
     </dependency>
     <dependency>
-      <id>commons-jelly</id>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly</artifactId>
       <version>20030902.160215</version>
     </dependency>
     <dependency>
-      <id>saxpath</id>
+      <groupId>saxpath</groupId>
+      <artifactId>saxpath</artifactId>
       <version>1.0-FCS</version>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
diff --git a/runner/project.xml b/runner/project.xml
index a9973b50..a60adccc 100644
--- a/runner/project.xml
+++ b/runner/project.xml
@@ -25,62 +25,75 @@
       </properties>
     </dependency>
     <dependency>
-      <id>velocity</id>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
       <version>1.4-dev</version>
     </dependency>
     <!-- Betwixt requirements -->
 
     <dependency>
-      <id>commons-collections</id>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
       <version>2.1</version>
     </dependency>
     <dependency>
-      <id>commons-digester</id>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
       <version>1.4.1</version>
     </dependency>
     <dependency>
-      <id>commons-beanutils</id>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
       <version>1.6.1</version>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
     </dependency>
     <dependency>
-      <id>commons-betwixt</id>
+      <groupId>commons-betwixt</groupId>
+      <artifactId>commons-betwixt</artifactId>
       <version>20030211.133854</version>
     </dependency>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
       <url>http://www.dom4j.org/</url>
     </dependency>
     <dependency>
-      <id>commons-jelly</id>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly</artifactId>
       <version>20030902.160215</version>
       <url>http://jakarta.apache.org/commons/jelly/</url>
     </dependency>
     <dependency>
-      <id>commons-jexl</id>
+      <groupId>commons-jexl</groupId>
+      <artifactId>commons-jexl</artifactId>
       <version>1.0-beta-1</version>
       <url>http://jakarta.apache.org/commons/jexl/</url>
     </dependency>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
     </dependency>
     <!-- Betwixt requirements -->
 
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
     </dependency>
     <!--
@@ -90,12 +103,14 @@
      -->
 
     <dependency>
-      <id>plexus</id>
-      <version>0.2</version>
       <type>pom</type>
+      <groupId>plexus</groupId>
+      <artifactId>plexus</artifactId>
+      <version>0.2</version>
     </dependency>
     <dependency>
-      <id>plexus</id>
+      <groupId>plexus</groupId>
+      <artifactId>plexus</artifactId>
       <version>0.2</version>
     </dependency>
   </dependencies>
diff --git a/simian/project.xml b/simian/project.xml
index d1a1737f..c28a63db 100644
--- a/simian/project.xml
+++ b/simian/project.xml
@@ -22,17 +22,20 @@
       <url>http://www.redhillconsulting.com.au/products/simian/</url>
     </dependency>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <url>http://ant.apache.org/</url>
     </dependency>
     <dependency>
-      <id>commons-jelly</id>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly</artifactId>
       <version>20030902.160215</version>
       <url>http://jakarta.apache.org/commons/jelly/</url>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
       <url>http://jakarta.apache.org/commons/logging/</url>
     </dependency>
diff --git a/site/project.xml b/site/project.xml
index a822b558..1f58ebf8 100644
--- a/site/project.xml
+++ b/site/project.xml
@@ -56,14 +56,16 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <properties>
         <classloader>root.maven</classloader>
diff --git a/statcvs/project.xml b/statcvs/project.xml
index 6b53fba3..c3b8571e 100644
--- a/statcvs/project.xml
+++ b/statcvs/project.xml
@@ -78,7 +78,8 @@
     <dependency>
       <groupId>jfreechart</groupId>
       <artifactId>jfreechart</artifactId>
-      <id>jfreechart</id>
+      <groupId>jfreechart</groupId>
+      <artifactId>jfreechart</artifactId>
       <version>0.9.8</version>
     </dependency>
     <dependency>
diff --git a/struts/project.xml b/struts/project.xml
index fc1df034..5b13dd3a 100644
--- a/struts/project.xml
+++ b/struts/project.xml
@@ -32,7 +32,8 @@
       <version>1.1</version>
     </dependency>
     <dependency>
-      <id>commons-collections</id>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
       <version>2.1</version>
     </dependency>
     <dependency>
@@ -44,37 +45,44 @@
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
     </dependency>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
     </dependency>
     <dependency>
-      <id>regexp</id>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
       <version>1.2</version>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
diff --git a/summit/project.xml b/summit/project.xml
index 76ecc4cd..f3906272 100644
--- a/summit/project.xml
+++ b/summit/project.xml
@@ -22,62 +22,75 @@
       <version>20030303.205659</version>
     </dependency>
     <dependency>
-      <id>velocity</id>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
       <version>1.4-dev</version>
     </dependency>
     <dependency>
-      <id>commons-beanutils</id>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
       <version>1.6.1</version>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
     </dependency>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
       <url>http://www.dom4j.org/</url>
     </dependency>
     <dependency>
-      <id>commons-jelly</id>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly</artifactId>
       <version>20030902.160215</version>
       <url>http://jakarta.apache.org/commons/jelly/</url>
     </dependency>
     <dependency>
-      <id>commons-jexl</id>
+      <groupId>commons-jexl</groupId>
+      <artifactId>commons-jexl</artifactId>
       <version>1.0-beta-1</version>
       <url>http://jakarta.apache.org/commons/jexl/</url>
     </dependency>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
     </dependency>
     <!-- Betwixt requirements -->
 
     <dependency>
-      <id>commons-collections</id>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
       <version>2.1</version>
     </dependency>
     <dependency>
-      <id>commons-digester</id>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
       <version>1.4.1</version>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
     </dependency>
     <dependency>
-      <id>commons-betwixt</id>
+      <groupId>commons-betwixt</groupId>
+      <artifactId>commons-betwixt</artifactId>
       <version>20030211.133854</version>
     </dependency>
     <!-- Betwixt requirements -->
 
     <dependency>
-      <id>xerces</id>
+      <groupId>xerces</groupId>
+      <artifactId>xerces</artifactId>
       <version>2.4.0</version>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
     </dependency>
   </dependencies>
diff --git a/uberjar/project.xml b/uberjar/project.xml
index a4ef0ea6..18ae6e9d 100644
--- a/uberjar/project.xml
+++ b/uberjar/project.xml
@@ -66,7 +66,8 @@
 
   <dependencies>
     <dependency>
-      <id>velocity</id>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
       <version>1.4-dev</version>
       <url>http://jakarta.apache.org/velocity/</url>
     </dependency>
@@ -79,7 +80,8 @@
       </properties>
     </dependency>
     <dependency>
-      <id>classworlds</id>
+      <groupId>classworlds</groupId>
+      <artifactId>classworlds</artifactId>
       <version>1.0-rc1</version>
       <url>http://classworlds.werken.com</url>
     </dependency>
diff --git a/vdoclet/project.xml b/vdoclet/project.xml
index 7ce7e3cf..6927e71c 100644
--- a/vdoclet/project.xml
+++ b/vdoclet/project.xml
@@ -37,23 +37,28 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>vdoclet</id>
+      <groupId>vdoclet</groupId>
+      <artifactId>vdoclet</artifactId>
       <version>20020711</version>
     </dependency>
     <dependency>
-      <id>velocity</id>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
       <version>1.4-dev</version>
     </dependency>
     <dependency>
-      <id>vdoclet:qdox</id>
+      <groupId>vdoclet:qdox</groupId>
+      <artifactId>vdoclet:qdox</artifactId>
       <version>current</version>
     </dependency>
     <dependency>
-      <id>commons-collections</id>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
       <version>2.1</version>
     </dependency>
     <dependency>
-      <id>oro</id>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
       <version>2.0.7</version>
     </dependency>
     <dependency>
@@ -69,7 +74,8 @@
       <url>http://jakarta.apache.org/commons/jelly/</url>
     </dependency>
     <dependency>
-      <id>logkit</id>
+      <groupId>logkit</groupId>
+      <artifactId>logkit</artifactId>
       <version>1.0.1</version>
     </dependency>
   </dependencies>
diff --git a/war/project.xml b/war/project.xml
index 8d84d35b..b6d3e2af 100644
--- a/war/project.xml
+++ b/war/project.xml
@@ -19,7 +19,7 @@
       <id>1.5</id>
       <name>1.5</name>
       <tag>HEAD</tag>
-    </version>  
+    </version>
   </versions>
   <branches/>
   <mailingLists/>
diff --git a/war/src/plugin-test/project.xml b/war/src/plugin-test/project.xml
index 8be1f844..d805fbf7 100644
--- a/war/src/plugin-test/project.xml
+++ b/war/src/plugin-test/project.xml
@@ -1,59 +1,61 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<project>
   <!-- the version of maven's project object model -->
+
   <pomVersion>3</pomVersion>
-  
   <!-- a unique name for this project -->
+
   <id>test-maven-war-plugin</id>
-  
   <!-- a short but descriptive name for the project -->
+
   <name>Test project for Maven War Plugin</name>
-  
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->
+
   <currentVersion>1.0-SNAPSHOT</currentVersion>
-  
   <!-- details about the organization that 'owns' the project -->
+
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://jakarta.apache.org/</url>
   </organization>
-  
   <!-- the year the project started -->
+
   <inceptionYear>2002</inceptionYear>
-  
   <!-- the top level of java packages that this project defines
        e.g. if your project contains the packages
        com.mycompany.accounts.reports, com.mycompany.accounts.reports
        and com.mycompany.accounts.utils, the package would be
        'com.mycompany.accounts' -->
+
   <package>org.apache.maven.examples.simplewebapp</package>
-  
   <!-- a short description of what the project does -->
+
   <shortDescription>A simple web app project</shortDescription>
-
   <!-- the project home page -->
-  <url>http://maven.apache.org/</url>
 
+  <url>http://maven.apache.org/</url>
   <!-- the version control repository and http url for online access
        the connection element has the form:
        scm:<system>:<system specific connection string> -->
+
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/examples/simple-webapp</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/examples/simple-webapp/</url>
   </repository>
-
   <!-- any mailing lists for the project -->
-  <mailingLists/>
-  
-  <!-- who the developers are for the project -->
-  <developers />
 
+  <mailingLists/>
+  <!-- who the developers are for the project -->
+
+  <developers/>
   <!-- jar files the project is dependent on -->
+
   <dependencies>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
       <url>http://jakarta.apache.org/commons/logging.html</url>
       <properties>
@@ -61,11 +63,9 @@
       </properties>
     </dependency>
   </dependencies>
-  
   <!-- build information for the project. We have no source, tests,
        resources etc
     -->
-  <build />
 
+  <build/>
 </project>
-
diff --git a/webserver/project.xml b/webserver/project.xml
index 9a0294b9..4904a1c7 100644
--- a/webserver/project.xml
+++ b/webserver/project.xml
@@ -56,7 +56,8 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
     </dependency>
     <dependency>
diff --git a/xdoc/project.xml b/xdoc/project.xml
index 4b04a91d..191f352e 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -63,22 +63,26 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>ant</id>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <properties>
         <classloader>root</classloader>
       </properties>
     </dependency>
     <dependency>
-      <id>dom4j</id>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
       <version>1.4-dev-8</version>
     </dependency>
     <dependency>
-      <id>commons-grant</id>
+      <groupId>commons-grant</groupId>
+      <artifactId>commons-grant</artifactId>
       <version>1.0-beta-4</version>
     </dependency>
     <dependency>
-      <id>commons-jelly</id>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly</artifactId>
       <version>20030902.160215</version>
     </dependency>
     <dependency>
@@ -103,7 +107,8 @@
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
     <dependency>
-      <id>commons-logging</id>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
     </dependency>
     <dependency>
@@ -112,15 +117,18 @@
       <version>1.0-beta-10</version>
     </dependency>
     <dependency>
-      <id>velocity</id>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
       <version>1.4-dev</version>
     </dependency>
     <dependency>
-      <id>velocity-dvsl</id>
+      <groupId>velocity-dvsl</groupId>
+      <artifactId>velocity-dvsl</artifactId>
       <version>0.45</version>
     </dependency>
     <dependency>
-      <id>xml-apis</id>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
     </dependency>
   </dependencies>