diff --git a/ant/project.xml b/ant/project.xml
index e54df2d1..64237204 100644
--- a/ant/project.xml
+++ b/ant/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ant-plugin</id>
   <name>Maven Ant Plug-in</name>
-  <currentVersion>1.4-SNAPSHOT</currentVersion>
+  <currentVersion>1.4</currentVersion>
   <description>Generates ant build files from a maven project, so that plain ant users can build your project</description>
   <shortDescription>Generate Ant build file</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ant/</url>
diff --git a/antlr/project.xml b/antlr/project.xml
index 590299aa..255ded31 100644
--- a/antlr/project.xml
+++ b/antlr/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-antlr-plugin</id>
   <name>Maven Antlr Plugin</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Process Antlr grammars</shortDescription>
   <url>http://maven.apache.org/reference/plugins/antlr/</url>
diff --git a/appserver/project.xml b/appserver/project.xml
index 19daf3dd..b207936f 100644
--- a/appserver/project.xml
+++ b/appserver/project.xml
@@ -54,7 +54,7 @@
     </developer>
   </developers>
   <dependencies>
-      <dependency>
+    <dependency>
       <id>ant</id>
       <version>1.5.3-1</version>
     </dependency>
diff --git a/artifact/project.xml b/artifact/project.xml
index d7a3c9e9..3bc127dc 100644
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -5,8 +5,8 @@
   <pomVersion>3</pomVersion>
   <id>maven-artifact-plugin</id>
   <name>Maven Artifact Plug-in</name>
-  <currentVersion>1.0-SNAPSHOT</currentVersion>
-  <description></description>
+  <currentVersion>1.0</currentVersion>
+  <description/>
   <shortDescription>Tools to manage artifacts and deployment</shortDescription>
   <url>http://maven.apache.org/reference/plugins/artifact/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/artifact/</siteDirectory>
@@ -15,77 +15,61 @@
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/artifact/</url>
   </repository>
   <developers/>
-  
   <dependencies>
-    
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven</artifactId>
       <version>1.0-beta-10</version>
       <type>jar</type>
     </dependency>
-    
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>20030203.000550</version>
       <type>jar</type>
     </dependency>
-    
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
       <version>1.0.0</version>
       <type>jar</type>
     </dependency>
-
-
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>2.0-beta1</version>
       <type>jar</type>
     </dependency>
-    
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <type>jar</type>
     </dependency>
-    
-
-
     <dependency>
       <groupId>jsch</groupId>
       <artifactId>jsch</artifactId>
       <version>0.1.5</version>
       <type>jar</type>
     </dependency>
-
-
-   
-   <dependency>
+    <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly</artifactId>
       <version>20030902.160215</version>
       <url>http://jakarta.apache.org/commons/jelly/</url>
       <type>jar</type>
     </dependency>
-    
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-velocity</artifactId>
       <version>20030303.205659</version>
       <type>jar</type>
     </dependency>
-    
     <dependency>
       <groupId>velocity</groupId>
-      <artifactId>velocity</artifactId>      
+      <artifactId>velocity</artifactId>
       <version>1.4-dev</version>
       <type>jar</type>
     </dependency>
-    
   </dependencies>
 </project>
diff --git a/ashkelon/project.xml b/ashkelon/project.xml
index f577c5e4..2cd57a0b 100644
--- a/ashkelon/project.xml
+++ b/ashkelon/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ashkelon-plugin</id>
   <name>Maven Ashkelon Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Publish javadoc to Ashkelon</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ashkelon/</url>
diff --git a/cactus/project.xml b/cactus/project.xml
index e1e38f7e..ca8b2421 100644
--- a/cactus/project.xml
+++ b/cactus/project.xml
@@ -70,7 +70,6 @@
   </developers>
   <contributors/>
   <dependencies>
-
     <dependency>
       <groupId>cactus</groupId>
       <artifactId>cactus</artifactId>
@@ -101,7 +100,6 @@
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
     </dependency>
-
     <!-- Note: Dependencies below are needed by HttpUnit. Xerces is also
     	 needed by the XML report used by the junitreport Ant task -->
 
@@ -130,9 +128,7 @@
       <artifactId>js</artifactId>
       <version>1.5R4-RC3</version>
     </dependency>
-
   </dependencies>
-
   <reports>
     <report>maven-changes-plugin</report>
     <report>maven-changelog-plugin</report>
@@ -142,5 +138,4 @@
     <report>maven-license-plugin</report>
     <report>maven-linkcheck-plugin</report>
   </reports>
-
 </project>
diff --git a/changelog/project.xml b/changelog/project.xml
index f2f34b8d..9148437f 100644
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-changelog-plugin</id>
   <name>Maven Changelog Plug-in</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description/>
   <shortDescription>Produce SCM changelog reports</shortDescription>
   <url>http://maven.apache.org/reference/plugins/changelog/</url>
diff --git a/changes/project.xml b/changes/project.xml
index 137852e4..a5ce5512 100644
--- a/changes/project.xml
+++ b/changes/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-changes-plugin</id>
   <name>Maven Changes Plug-in</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <shortDescription>Produce changes report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/changes/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/changes/</siteDirectory>
diff --git a/checkstyle/project.xml b/checkstyle/project.xml
index b52869eb..b4e6cf3e 100644
--- a/checkstyle/project.xml
+++ b/checkstyle/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-checkstyle-plugin</id>
   <name>Maven Checkstyle Plug-in</name>
-  <currentVersion>2.1-SNAPSHOT</currentVersion>
+  <currentVersion>2.1</currentVersion>
   <description/>
   <shortDescription>Produce Checkstyle report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/checkstyle/</url>
@@ -14,7 +14,6 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/checkstyle/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/checkstyle/</url>
   </repository>
-
   <versions>
     <version>
       <id>1.1</id>
@@ -27,7 +26,6 @@
       <tag>MAVEN_CHECKSTYLE_2_0</tag>
     </version>
   </versions>
-
   <developers>
     <developer>
       <name>dIon Gillard</name>
@@ -131,5 +129,4 @@
       </properties>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/clean/clean/project.xml b/clean/clean/project.xml
index e68da1d7..46376d24 100644
--- a/clean/clean/project.xml
+++ b/clean/clean/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-clean-plugin</id>
   <name>Maven Clean Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Clean plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/clean/</url>
diff --git a/clean/project.xml b/clean/project.xml
index e68da1d7..46376d24 100644
--- a/clean/project.xml
+++ b/clean/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-clean-plugin</id>
   <name>Maven Clean Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Clean plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/clean/</url>
diff --git a/clover/project.xml b/clover/project.xml
index 868ad6b5..102c295e 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <project>
   <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-clover-plugin</id>
   <name>Maven Clover Plug-in</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Produce Clover reports</shortDescription>
   <url>http://maven.apache.org/reference/plugins/clover/</url>
@@ -51,10 +51,10 @@
       </roles>
     </developer>
     <developer>
-      <name>Stéphane Mor</name>
+      <name>Stéphane Mor</name>
       <id>smor</id>
       <email>stephanemor@yahoo.fr</email>
-      <organization>Hasgard Systèmes et Réseaux</organization>
+      <organization>Hasgard Systèmes et Réseaux</organization>
       <roles>
         <role>Java Developer</role>
       </roles>
@@ -85,6 +85,6 @@
       <properties>
         <classloader>root</classloader>
       </properties>
-    </dependency>    
+    </dependency>
   </dependencies>
 </project>
diff --git a/codeswitcher/project.xml b/codeswitcher/project.xml
index c0f09330..039a371b 100644
--- a/codeswitcher/project.xml
+++ b/codeswitcher/project.xml
@@ -5,9 +5,9 @@
   <pomVersion>3</pomVersion>
   <id>maven-codeswitcher-plugin</id>
   <name>Maven CodeSwitcher Plugin</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
-  <shortDescription></shortDescription>
+  <shortDescription/>
   <url>http://maven.apache.org/reference/plugins/codeswitcher/</url>
   <issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10030</issueTrackingUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
diff --git a/cruisecontrol/project.xml b/cruisecontrol/project.xml
index c760b1f8..5fe8ea4b 100644
--- a/cruisecontrol/project.xml
+++ b/cruisecontrol/project.xml
@@ -4,7 +4,7 @@
   <extend>../project.xml</extend>
   <id>maven-cruisecontrol-plugin</id>
   <name>Maven Cruise Control Plug-in</name>
-  <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <currentVersion>1.0</currentVersion>
   <description>A plugin to handle the generating and maintaining of Cruise Control configuration</description>
   <shortDescription>Cruise Control Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/cruisecontrol/</url>
@@ -24,7 +24,6 @@
       </roles>
     </developer>
   </developers>
-  
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
@@ -39,9 +38,7 @@
       <url>http://jakarta.apache.org/commons/jelly/libs/jsl/</url>
     </dependency>
   </dependencies>
-
   <build>
     <nagEmailAddress>bporter@f2network.com.au</nagEmailAddress>
   </build>
 </project>
-
diff --git a/developer-activity/project.xml b/developer-activity/project.xml
index d24c12f9..1fd8dd0a 100644
--- a/developer-activity/project.xml
+++ b/developer-activity/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-developer-activity-plugin</id>
   <name>Maven Developer Activity Plug-in</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description>This document provides a report of activity in terms of CVS commits and breaks it out by developer.</description>
   <shortDescription>Developer Activity report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/developer-activity/</url>
diff --git a/dist/project.xml b/dist/project.xml
index b2ea45a7..fdf3cac1 100644
--- a/dist/project.xml
+++ b/dist/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-dist-plugin</id>
   <name>Maven Distribution Plug-in</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <shortDescription>Create source and binary distributions</shortDescription>
   <url>http://maven.apache.org/reference/plugins/dist/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/dist/</siteDirectory>
diff --git a/docbook/project.xml b/docbook/project.xml
index c090b8f6..7eb6098c 100644
--- a/docbook/project.xml
+++ b/docbook/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-docbook-plugin</id>
   <name>Maven DocBook Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <shortDescription>Convert docbook to xdoc</shortDescription>
   <url>http://maven.apache.org/reference/plugins/docbook/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/docbook/</siteDirectory>
diff --git a/ear/project.xml b/ear/project.xml
index 6f15ad84..46588b0a 100644
--- a/ear/project.xml
+++ b/ear/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ear-plugin</id>
   <name>Maven EAR Plugin</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <description>Ear Plugin for Maven</description>
   <shortDescription>Ear Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ear/</url>
@@ -62,7 +62,6 @@
       </roles>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
@@ -77,7 +76,6 @@
       <url>http://jakarta.apache.org/commons/jelly/tags/util/</url>
     </dependency>
   </dependencies>
-  
   <reports>
     <report>maven-changes-plugin</report>
     <report>maven-changelog-plugin</report>
@@ -87,5 +85,4 @@
     <report>maven-license-plugin</report>
     <report>maven-linkcheck-plugin</report>
   </reports>
-
 </project>
diff --git a/eclipse/project.xml b/eclipse/project.xml
index fc302178..e091a6ed 100644
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-eclipse-plugin</id>
   <name>Maven Eclipse Plug-in</name>
-  <currentVersion>1.4-SNAPSHOT</currentVersion>
+  <currentVersion>1.4</currentVersion>
   <description>A plugin to generate various files for the Eclipse IDE and ease the use of Maven within that environment</description>
   <shortDescription>Eclipse Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/eclipse/</url>
diff --git a/ejb/project.xml b/ejb/project.xml
index 62c04802..6199fc33 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-ejb-plugin</id>
   <name>Maven EJB Plugin</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description>EJB Plugin for Maven</description>
   <shortDescription>EJB Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/ejb/</url>
@@ -42,7 +42,6 @@
         <role>Java Developer</role>
       </roles>
     </developer>
-    
   </developers>
   <dependencies/>
 </project>
diff --git a/faq/project.xml b/faq/project.xml
index 338083a8..dab788ae 100644
--- a/faq/project.xml
+++ b/faq/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-faq-plugin</id>
   <name>Maven FAQ Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <!-- Gump integration -->
 
   <gumpRepositoryId>jakarta</gumpRepositoryId>
@@ -27,7 +27,6 @@
         <role>Java Developer</role>
       </roles>
     </developer>
-
     <developer>
       <name>dIon Gillard</name>
       <id>dion</id>
@@ -66,20 +65,22 @@
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
   </dependencies>
-  
   <reports>
     <report>maven-changelog-plugin</report>
     <report>maven-changes-plugin</report>
     <!--<report>maven-checkstyle-plugin</report>-->
+
     <report>maven-developer-activity-plugin</report>
     <report>maven-file-activity-plugin</report>
     <!--<report>maven-javadoc-plugin</report>-->
     <!--<report>maven-jdepend-plugin</report>-->
     <!--<report>maven-junit-report-plugin</report>-->
     <!--<report>maven-jxr-plugin</report>-->
+
     <report>maven-license-plugin</report>
     <report>maven-linkcheck-plugin</report>
     <!--<report>maven-pmd-plugin</report>-->
+
     <report>maven-tasklist-plugin</report>
     <report>maven-faq-plugin</report>
   </reports>
diff --git a/file-activity/project.xml b/file-activity/project.xml
index aceae3ac..bb0a57cf 100644
--- a/file-activity/project.xml
+++ b/file-activity/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-file-activity-plugin</id>
   <name>Maven File Activity Plug-in</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <!-- Gump integration -->
 
   <gumpRepositoryId>jakarta</gumpRepositoryId>
diff --git a/genapp/project.xml b/genapp/project.xml
index 2f8358ac..6e79bfad 100644
--- a/genapp/project.xml
+++ b/genapp/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-genapp-plugin</id>
   <name>Maven Genapp Plugin</name>
-  <currentVersion>2.0-SNAPSHOT</currentVersion>
+  <currentVersion>2.0</currentVersion>
   <shortDescription>A collection of example projects showing how to use maven in different situations</shortDescription>
   <url>http://maven.apache.org/reference/plugins/genapp/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/genapp/</siteDirectory>
@@ -13,7 +13,6 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/genapp/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/genapp/</url>
   </repository>
-
   <developers>
     <developer>
       <name>Jason van Zyl</name>
@@ -41,7 +40,6 @@
       <email>rhoegg@isisnetworks.net</email>
     </contributor>
   </contributors>
-
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
@@ -52,7 +50,6 @@
       </properties>
     </dependency>
   </dependencies>
-
   <reports>
     <report>maven-changes-plugin</report>
     <report>maven-changelog-plugin</report>
diff --git a/gump/project.xml b/gump/project.xml
index f65fd3f6..7533b982 100644
--- a/gump/project.xml
+++ b/gump/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-gump-plugin</id>
   <name>Maven Gump Plug-in</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>produce Gump descriptor</shortDescription>
   <url>http://maven.apache.org/reference/plugins/gump/</url>
diff --git a/hibernate/project.xml b/hibernate/project.xml
index 1e5f3598..76b66184 100644
--- a/hibernate/project.xml
+++ b/hibernate/project.xml
@@ -26,108 +26,91 @@
       <timezone>+1</timezone>
     </developer>
   </developers>
-  
-  <dependencies>    
-    
+  <dependencies>
     <dependency>
       <groupId>hibernate</groupId>
       <artifactId>hibernate</artifactId>
       <version>2.0-beta-6</version>
       <type>jar</type>
     </dependency>
-    
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.5.3-1</version>
       <type>jar</type>
     </dependency>
-    
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly</artifactId>
       <version>20030902.160215</version>
       <url>http://jakarta.apache.org/commons/jelly/</url>
     </dependency>
-    
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>1.0.1</version>
       <type>jar</type>
     </dependency>
-
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
       <version>1.6.1</version>
       <type>jar</type>
-    </dependency>        
-        
+    </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
       <version>1.0-dev</version>
       <type>jar</type>
     </dependency>
-
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
       <version>2.1</version>
       <type>jar</type>
     </dependency>
-          
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>
-      <type>jar</type>     
+      <type>jar</type>
     </dependency>
-     
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
       <version>1.0</version>
       <type>jar</type>
     </dependency>
-     
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.8</version>
-      <type>jar</type>      
+      <type>jar</type>
     </dependency>
-     
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
       <version>1.0.b2</version>
       <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
-    
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xerces</artifactId>
       <version>2.4.0</version>
-      <url>http://xml.apache.org/xerces2-j/</url>      
+      <url>http://xml.apache.org/xerces2-j/</url>
     </dependency>
-          
     <dependency>
       <groupId>odmg</groupId>
       <artifactId>odmg</artifactId>
       <version>3.0</version>
-      <type>jar</type>     
-    </dependency>     
-  
-
-    <dependency>
-       <groupId>dom4j</groupId>
-       <artifactId>dom4j</artifactId>
-       <version>1.4-dev-8</version>
-       <type>jar</type>       
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.4-dev-8</version>
+      <type>jar</type>
     </dependency>
-
     <!-- for the moment we don't need it
     <dependency>
        <groupId>cglib</groupId>
@@ -136,8 +119,6 @@
        <type>jar</type>       
     </dependency>             
     -->
-         
+
   </dependencies>
-    
-  
 </project>
diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml
index 5bff3cc5..d779b4df 100644
--- a/html2xdoc/project.xml
+++ b/html2xdoc/project.xml
@@ -5,9 +5,9 @@
   <pomVersion>3</pomVersion>
   <id>maven-html2xdoc-plugin</id>
   <name>Maven Html2XDoc Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
-
+  <currentVersion>1.1</currentVersion>
   <!-- Gump integration -->
+
   <gumpRepositoryId>jakarta</gumpRepositoryId>
   <description>Creates XDoc documentation from normal HTML documentation.</description>
   <shortDescription/>
diff --git a/idea/project.xml b/idea/project.xml
index 81a8aa49..b98ca27f 100644
--- a/idea/project.xml
+++ b/idea/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-idea-plugin</id>
   <name>Maven IDEA Plug-in</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <shortDescription>IDEA Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/idea/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/idea/</siteDirectory>
diff --git a/j2ee/project.xml b/j2ee/project.xml
index a44eb795..7a8166e7 100644
--- a/j2ee/project.xml
+++ b/j2ee/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-j2ee-plugin</id>
   <name>Maven J2EE Plugin</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description/>
   <shortDescription>J2EE tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/j2ee/</url>
diff --git a/jalopy/project.xml b/jalopy/project.xml
index dbc77872..877d7a5c 100644
--- a/jalopy/project.xml
+++ b/jalopy/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jalopy-plugin</id>
   <name>Maven Jalopy Plugin</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Reformat java source</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jalopy/</url>
@@ -28,7 +28,8 @@
       <name>Bob McWhirter</name>
       <id>werken</id>
       <email>bob@werken.com</email>
-      <organization>The Werken Company</organization>      <roles>
+      <organization>The Werken Company</organization>
+      <roles>
         <role>Java Developer</role>
       </roles>
     </developer>
diff --git a/jar/project.xml b/jar/project.xml
index 5cc70dca..9ba38f73 100644
--- a/jar/project.xml
+++ b/jar/project.xml
@@ -15,7 +15,6 @@
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jar/</url>
   </repository>
   <developers/>
-  
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
@@ -25,11 +24,9 @@
         <classloader>root.maven</classloader>
       </properties>
     </dependency>
-    
     <dependency>
       <id>velocity</id>
       <version>1.4-dev</version>
     </dependency>
-    
   </dependencies>
 </project>
diff --git a/javadoc/project.xml b/javadoc/project.xml
index 0d1cbf64..ab689f79 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-javadoc-plugin</id>
   <name>Maven Javadoc Plug-in</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description/>
   <shortDescription>Produce Javadocs and report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/javadoc/</url>
@@ -70,7 +70,7 @@
       <roles>
         <role>Java Developer</role>
       </roles>
-    </developer>  
+    </developer>
   </developers>
   <dependencies>
     <dependency>
diff --git a/jboss/project.xml b/jboss/project.xml
index 83524167..51eb3233 100644
--- a/jboss/project.xml
+++ b/jboss/project.xml
@@ -9,14 +9,11 @@
   <description>Plugin for JBoss.</description>
   <shortDescription>JBoss plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jboss/</url>
-
   <siteDirectory>/www/maven.apache.org/reference/plugins/jboss/</siteDirectory>
-
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jboss/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jboss/</url>
   </repository>
-
   <versions>
     <version>
       <id>1.0</id>
@@ -39,7 +36,6 @@
       <tag>MAVEN_JBOSS_1_3</tag>
     </version>
   </versions>
-
   <developers>
     <developer>
       <name>Vincent Massol</name>
@@ -63,9 +59,7 @@
       <email>willievu@yahoo.com</email>
     </contributor>
   </contributors>
-
   <dependencies/>
-
   <reports>
     <report>maven-changes-plugin</report>
     <report>maven-changelog-plugin</report>
@@ -75,5 +69,4 @@
     <report>maven-license-plugin</report>
     <report>maven-linkcheck-plugin</report>
   </reports>
-
 </project>
diff --git a/jbuilder/project.xml b/jbuilder/project.xml
index 0f7ab663..b0b3d06f 100644
--- a/jbuilder/project.xml
+++ b/jbuilder/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jbuilder-plugin</id>
   <name>Maven JBuilder Plug-in</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description/>
   <shortDescription>JBuilder Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jbuilder/</url>
diff --git a/jcoverage/project.xml b/jcoverage/project.xml
index 761c2f20..3796e11f 100644
--- a/jcoverage/project.xml
+++ b/jcoverage/project.xml
@@ -1,30 +1,20 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <project>
   <extend>../project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>maven-jcoverage-plugin</id>
   <name>Maven JCoverage plugin</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.0.1</currentVersion>
   <package>org.apache.maven.jcoveragereport</package>
-
-  <description>
-    This plugin provides coverage analysis of your source-code based on the open-source
-    jcoverage tool.
-  </description>
-  <shortDescription>
-    This plugin provides coverage analysis of your source-code based on the open-source
-    jcoverage tool.
-  </shortDescription>
-
+  <description>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</description>
+  <shortDescription>This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool.</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jcoverage/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jcoverage/</siteDirectory>
-
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/jcoverage/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/jcoverage/</url>
   </repository>
-
   <developers>
     <developer>
       <name>Dominik Dahlem</name>
@@ -46,7 +36,6 @@
       <timezone>+18</timezone>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
       <groupId>jcoverage</groupId>
@@ -103,7 +92,6 @@
       <url>http://www.extreme.indiana.edu/xgws/xsoap/xpp/</url>
     </dependency>
   </dependencies>
-
   <reports>
     <report>maven-changes-plugin</report>
     <report>maven-changelog-plugin</report>
@@ -111,5 +99,4 @@
     <report>maven-developer-activity-plugin</report>
     <report>maven-license-plugin</report>
   </reports>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/jdee/project.xml b/jdee/project.xml
index 68d7b807..dd51495f 100644
--- a/jdee/project.xml
+++ b/jdee/project.xml
@@ -7,10 +7,10 @@
   <name>Maven JDEE Plug-in</name>
   <currentVersion>1.0-beta-1</currentVersion>
   <description>A plugin to create a project file to be used within the
-    <!--
+  <!--
     <a href="http://jdee.sunsite.dk/">Java Developement Enviroment for Emacw</a>
     -->
-  </description>
+</description>
   <shortDescription>JDEE Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jdee/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jdee/</siteDirectory>
diff --git a/jdepend/project.xml b/jdepend/project.xml
index 2ca4c2b3..f69ace4f 100644
--- a/jdepend/project.xml
+++ b/jdepend/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jdepend-plugin</id>
   <name>Maven JDepend Plugin</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description/>
   <shortDescription>Produce metrics</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jdepend/</url>
diff --git a/jdeveloper/project.xml b/jdeveloper/project.xml
index 58cd0c9d..e3811988 100644
--- a/jdeveloper/project.xml
+++ b/jdeveloper/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jdeveloper-plugin</id>
   <name>Maven JDeveloper Plug-in</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <inceptionYear>2002</inceptionYear>
   <description>A plugin to generate various files for Oracle's JDeveloper IDE and ease the use of Maven within that environment</description>
   <shortDescription>JDeveloper Plugin for Maven</shortDescription>
@@ -36,9 +36,9 @@
     </developer>
   </developers>
   <dependencies>
-
     <!-- Required for JavaPackageTool -->
     <!-- Don't upgrade to 2.5! -->
+
     <dependency>
       <id>jdepend</id>
       <version>2.3</version>
diff --git a/jdiff/project.xml b/jdiff/project.xml
index 93b1e31e..64e4d44a 100644
--- a/jdiff/project.xml
+++ b/jdiff/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jdiff-plugin</id>
   <name>Maven JDiff Plugin</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Diff between CVS releases</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jdiff/</url>
diff --git a/jellydoc/project.xml b/jellydoc/project.xml
index 629f3285..c8903765 100644
--- a/jellydoc/project.xml
+++ b/jellydoc/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jellydoc-plugin</id>
   <name>Maven JellyDoc Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <!-- Gump integration -->
 
   <gumpRepositoryId>jakarta</gumpRepositoryId>
diff --git a/jnlp/project.xml b/jnlp/project.xml
index 9ffb91f3..bcbf9ef3 100644
--- a/jnlp/project.xml
+++ b/jnlp/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jnlp-plugin</id>
   <name>Maven JNLP Plug-in</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <shortDescription>JNLP Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jnlp/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/jnlp/</siteDirectory>
diff --git a/junit-report/project.xml b/junit-report/project.xml
index bee67df4..fa28dde1 100644
--- a/junit-report/project.xml
+++ b/junit-report/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-junit-report-plugin</id>
   <name>Maven JUnit Report Plug-in</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description/>
   <shortDescription>Reports from JUnit tests</shortDescription>
   <url>http://maven.apache.org/reference/plugins/junit-report/</url>
diff --git a/junitdoclet/project.xml b/junitdoclet/project.xml
index 4fb8fc2e..f78cd981 100644
--- a/junitdoclet/project.xml
+++ b/junitdoclet/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-junit-doclet-plugin</id>
   <name>Maven JUnitDoclet Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description>A plugin to generate test cases use JUnitDoclet</description>
   <shortDescription>JUnitDoclet test generator</shortDescription>
   <url>http://maven.apache.org/reference/plugins/junitdoclet/</url>
diff --git a/jxr/project.xml b/jxr/project.xml
index 8456f92a..5744ce4d 100644
--- a/jxr/project.xml
+++ b/jxr/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jxr-plugin</id>
   <name>Maven JXR Plug-in</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Create cross reference</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jxr/</url>
diff --git a/latex/project.xml b/latex/project.xml
index 9b4d3783..41e95bb6 100644
--- a/latex/project.xml
+++ b/latex/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-latex-plugin</id>
   <name>Maven Latex Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Produce HTML from latex</shortDescription>
   <url>http://maven.apache.org/reference/plugins/latex/</url>
diff --git a/latka/project.xml b/latka/project.xml
index 54e562f6..12783cb7 100644
--- a/latka/project.xml
+++ b/latka/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-latka-plugin</id>
   <name>Maven Latka Plug-in</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description/>
   <shortDescription>Run Latka scripts</shortDescription>
   <url>http://maven.apache.org/reference/plugins/latka/</url>
diff --git a/license/project.xml b/license/project.xml
index dc462c1e..2f8be532 100644
--- a/license/project.xml
+++ b/license/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-license-plugin</id>
   <name>Maven License Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Create xml version of license</shortDescription>
   <url>http://maven.apache.org/reference/plugins/license/</url>
diff --git a/linkcheck/project.xml b/linkcheck/project.xml
index 8e621325..1f387024 100644
--- a/linkcheck/project.xml
+++ b/linkcheck/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-linkcheck-plugin</id>
   <name>Maven LinkCheck Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Check xdoc links</shortDescription>
   <url>http://maven.apache.org/reference/plugins/linkcheck/</url>
diff --git a/multiproject/project.xml b/multiproject/project.xml
index 7be299be..9138a888 100644
--- a/multiproject/project.xml
+++ b/multiproject/project.xml
@@ -4,7 +4,7 @@
   <extend>../project.xml</extend>
   <id>maven-multiproject-plugin</id>
   <name>Maven Multi-Project Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description>A plugin to handle the building of multiple projects within maven</description>
   <shortDescription>Multi-Project Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/multiproject/</url>
@@ -13,21 +13,18 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/multiproject/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/multiproject/</url>
   </repository>
-
   <versions>
     <version>
       <id>1.0</id>
       <name>1.0</name>
       <tag>MAVEN_MULTIPROJECT_1_0</tag>
     </version>
-
     <version>
       <id>1.1</id>
       <name>1.1</name>
       <tag>HEAD</tag>
     </version>
   </versions>
-
   <developers>
     <developer>
       <name>dIon Gillard</name>
@@ -48,7 +45,6 @@
       </roles>
     </developer>
   </developers>
-  
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
@@ -56,23 +52,19 @@
       <type>jar</type>
       <version>20030303.205659</version>
     </dependency>
-
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
       <type>jar</type>
       <version>1.4-dev</version>
     </dependency>
-    
-   <dependency>
+    <dependency>
       <groupId>maven</groupId>
       <artifactId>maven</artifactId>
       <type>jar</type>
       <version>1.0-beta-10</version>
     </dependency>
-    
   </dependencies>
-  
   <reports>
     <report>maven-changelog-plugin</report>
     <report>maven-changes-plugin</report>
diff --git a/pdf/project.xml b/pdf/project.xml
index 7eb7f127..b9f95c98 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-pdf-plugin</id>
   <name>Maven PDF Plug-in</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Create PDF version of site docs</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pdf/</url>
diff --git a/plugin/project.xml b/plugin/project.xml
index bcc1ed6b..cecfcdc3 100644
--- a/plugin/project.xml
+++ b/plugin/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-plugin-plugin</id>
   <name>Maven Plugin Plugin</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Maven Plugin plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/plugin/</url>
@@ -28,7 +28,7 @@
       <name>Peter Lynch</name>
       <id>plynch</id>
       <email>plynch at apache dot org</email>
-      <organization></organization>
+      <organization/>
       <roles>
         <role>Developer</role>
       </roles>
diff --git a/pmd/project.xml b/pmd/project.xml
index 623b31c4..73bdcc4e 100644
--- a/pmd/project.xml
+++ b/pmd/project.xml
@@ -6,10 +6,7 @@
   <id>maven-pmd-plugin</id>
   <name>Maven PMD Plug-in</name>
   <currentVersion>1.2</currentVersion>
-  <description>
-    This plugin provides a more or less seamless integration with Maven and the
-    PMD static source code analyzer.
-  </description>
+  <description>This plugin provides a more or less seamless integration with Maven and the PMD static source code analyzer.</description>
   <shortDescription>Maven Plugin for PMD</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pmd/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/pmd/</siteDirectory>
diff --git a/pom/project.xml b/pom/project.xml
index cf45bcc8..75e6dec6 100644
--- a/pom/project.xml
+++ b/pom/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-pom-plugin</id>
   <name>Maven POM Plugin</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description/>
   <shortDescription>Check Project Object Model</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pom/</url>
@@ -45,23 +45,19 @@
     </developer>
   </developers>
   <dependencies>
-
     <dependency>
       <id>dom4j</id>
       <version>1.4-dev-8</version>
     </dependency>
-
     <dependency>
       <id>xml-apis</id>
       <version>1.0.b2</version>
     </dependency>
-    
     <dependency>
       <id>maven</id>
       <version>1.0-beta-10</version>
       <jar>maven.jar</jar>
     </dependency>
-
     <dependency>
       <id>isorelax</id>
       <version>20030108</version>
@@ -69,8 +65,8 @@
         <classloader>root</classloader>
       </properties>
     </dependency>
-
     <!-- validator being used -->
+
     <dependency>
       <groupId>thaiopensource</groupId>
       <artifactId>jing</artifactId>
@@ -79,7 +75,6 @@
         <classloader>root</classloader>
       </properties>
     </dependency>
-
     <dependency>
       <id>xerces</id>
       <version>2.4.0</version>
@@ -87,6 +82,5 @@
         <classloader>root</classloader>
       </properties>
     </dependency>
-
   </dependencies>
 </project>
diff --git a/release/project.xml b/release/project.xml
index 19664715..64c84950 100644
--- a/release/project.xml
+++ b/release/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-release-plugin</id>
   <name>Maven Release Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description/>
   <shortDescription>Produce project release</shortDescription>
   <url>http://maven.apache.org/reference/plugins/release/</url>
diff --git a/runner/project.xml b/runner/project.xml
index ee346f02..bd67defb 100644
--- a/runner/project.xml
+++ b/runner/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-runner-plugin</id>
   <name>Maven Plexus Plug-in</name>
-  <currentVersion>0.3-SNAPSHOT</currentVersion>
+  <currentVersion>0.3</currentVersion>
   <description>Various goals for making development with Plexus easy.</description>
   <shortDescription>Plexus Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/plexus/</url>
diff --git a/scm/project.xml b/scm/project.xml
index 2c41214f..c0dc6444 100644
--- a/scm/project.xml
+++ b/scm/project.xml
@@ -4,7 +4,7 @@
   <extend>../project.xml</extend>
   <id>maven-scm-plugin</id>
   <name>Maven Source Control Management Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description>A plugin for SCM tasks, currently CVS.</description>
   <shortDescription>SCM Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/scm/</url>
diff --git a/simian/project.xml b/simian/project.xml
index 1a74ab28..0bd901ba 100644
--- a/simian/project.xml
+++ b/simian/project.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <project>
   <extend>../project.xml</extend>
   <id>maven-simian-plugin</id>
   <name>Maven Simian Plugin</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <description>Simian Plugin for Maven</description>
   <shortDescription>Simian Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/simian/</url>
-  
   <siteDirectory>/www/maven.apache.org/reference/plugins/simian/</siteDirectory>
-  
   <package>org.apache.maven.simian</package>
-
   <repository>
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/simian/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/simian/</url>
   </repository>
-
   <dependencies>
     <dependency>
       <groupId>redhill</groupId>
@@ -24,47 +21,41 @@
       <version>1.9.1</version>
       <url>http://www.redhillconsulting.com.au/products/simian/</url>
     </dependency>
-
     <dependency>
       <id>ant</id>
       <version>1.5.3-1</version>
       <url>http://ant.apache.org/</url>
     </dependency>
-
     <dependency>
       <id>commons-jelly</id>
       <version>20030902.160215</version>
       <url>http://jakarta.apache.org/commons/jelly/</url>
     </dependency>
-
     <dependency>
       <id>commons-logging</id>
       <version>1.0.3</version>
       <url>http://jakarta.apache.org/commons/logging/</url>
     </dependency>
   </dependencies>
-
   <developers>
-    <developer> 
-      <name>Simon Harris</name> 
-      <id></id> 
-      <email>simon@redhillconsulting.com.au</email> 
-      <organization>RedHill Consulting</organization> 
-      <roles> 
-        <role>Simian Core</role> 
-      </roles> 
-    </developer> 
-
+    <developer>
+      <name>Simon Harris</name>
+      <id/>
+      <email>simon@redhillconsulting.com.au</email>
+      <organization>RedHill Consulting</organization>
+      <roles>
+        <role>Simian Core</role>
+      </roles>
+    </developer>
     <developer>
       <name>Aslak Hellesoy</name>
-      <id></id>
+      <id/>
       <email>aslak@thoughtworks.net</email>
       <organization>ThoughtWorks</organization>
       <roles>
         <role>Maven Plugin</role>
       </roles>
     </developer>
-
     <developer>
       <name>dIon gillard</name>
       <id>dIon</id>
@@ -74,13 +65,11 @@
         <role>Maven Plugin</role>
       </roles>
     </developer>
-
   </developers>
-
   <contributors>
     <contributor>
-      <name>Maurice Montgénie</name>
-      <id></id>
+      <name>Maurice Montgénie</name>
+      <id/>
       <email>maurice@maguyane.net</email>
       <organization>CGSS Guyane</organization>
       <roles>
@@ -88,15 +77,14 @@
       </roles>
     </contributor>
   </contributors>
-
-  <reports> 
+  <reports>
     <!-- Make sure to run plugin:install before site -->
-    <report>maven-simian-plugin</report> 
-    <report>maven-changes-plugin</report>
-    <report>maven-license-plugin</report> 
-    <report>maven-jxr-plugin</report> 
-    <report>maven-javadoc-plugin</report> 
-    <report>maven-clover-plugin</report> 
-  </reports> 
 
+    <report>maven-simian-plugin</report>
+    <report>maven-changes-plugin</report>
+    <report>maven-license-plugin</report>
+    <report>maven-jxr-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-clover-plugin</report>
+  </reports>
 </project>
diff --git a/site/project.xml b/site/project.xml
index 2278c8dc..cab34b4e 100644
--- a/site/project.xml
+++ b/site/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-site-plugin</id>
   <name>Maven Site Plugin</name>
-  <currentVersion>1.3-SNAPSHOT</currentVersion>
+  <currentVersion>1.3</currentVersion>
   <description/>
   <shortDescription>Generate web site</shortDescription>
   <url>http://maven.apache.org/reference/plugins/site/</url>
diff --git a/statcvs/project.xml b/statcvs/project.xml
index 08c04d27..35ec7839 100644
--- a/statcvs/project.xml
+++ b/statcvs/project.xml
@@ -6,9 +6,7 @@
   <id>maven-statcvs-plugin</id>
   <name>Maven StatCvs Plug-in</name>
   <currentVersion>2.0</currentVersion>
-  <description>
-    Generate CVS statistics reports using StatCvs-XML
-  </description>
+  <description>Generate CVS statistics reports using StatCvs-XML</description>
   <shortDescription>Provides CVS statistics</shortDescription>
   <logo>http://statcvs-xml.berlios.de/images/statcvslogo.png</logo>
   <url>http://maven.apache.org/reference/plugins/statcvs/</url>
@@ -63,11 +61,11 @@
   <contributors>
     <contributor>
       <name>Tammo van Lessen</name>
-      <email></email>
+      <email/>
     </contributor>
     <contributor>
       <name>Steffen Pingel</name>
-      <email></email>
+      <email/>
     </contributor>
   </contributors>
   <dependencies>
diff --git a/struts/project.xml b/struts/project.xml
index 69ee73aa..bd958e85 100644
--- a/struts/project.xml
+++ b/struts/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-struts-plugin</id>
   <name>Maven Struts Plugin</name>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.2</currentVersion>
   <description/>
   <shortDescription>Work with struts jars</shortDescription>
   <url>http://maven.apache.org/reference/plugins/struts/</url>
diff --git a/summit/project.xml b/summit/project.xml
index ff2da624..1a89398f 100644
--- a/summit/project.xml
+++ b/summit/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-summit-plugin</id>
   <name>Maven Summit Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description>Various goals for making development with Plexus easy.</description>
   <shortDescription>Plexus Tools</shortDescription>
   <url>http://maven.apache.org/reference/plugins/summit/</url>
diff --git a/tasklist/project.xml b/tasklist/project.xml
index f3aa4b10..3df5cf5d 100644
--- a/tasklist/project.xml
+++ b/tasklist/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-tasklist-plugin</id>
   <name>Maven Tasklist Plug-in</name>
-  <currentVersion>2.2-SNAPSHOT</currentVersion>
+  <currentVersion>2.2</currentVersion>
   <description/>
   <shortDescription>Create xdoc from @TODO tags</shortDescription>
   <url>http://maven.apache.org/reference/plugins/tasklist/</url>
diff --git a/test/project.xml b/test/project.xml
index 8412bd7a..0c499e16 100644
--- a/test/project.xml
+++ b/test/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-test-plugin</id>
   <name>Maven Test Plug-in</name>
-  <currentVersion>1.4-SNAPSHOT</currentVersion>
+  <currentVersion>1.4</currentVersion>
   <description/>
   <shortDescription>Run JUnit tests</shortDescription>
   <url>http://maven.apache.org/reference/plugins/test/</url>
@@ -23,7 +23,7 @@
       <roles>
         <role>Java Developer</role>
       </roles>
-    </developer>  
+    </developer>
   </developers>
   <dependencies>
     <dependency>
diff --git a/tjdo/project.xml b/tjdo/project.xml
index d8bdaeb4..467d7db0 100644
--- a/tjdo/project.xml
+++ b/tjdo/project.xml
@@ -15,7 +15,6 @@
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/tjdo/</url>
   </repository>
   <developers/>
-  
   <dependencies>
     <dependency>
       <groupId>tjdo</groupId>
@@ -23,5 +22,4 @@
       <version>2.0-beta3</version>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/torque/project.xml b/torque/project.xml
index 2fdb2171..2df7d1ec 100644
--- a/torque/project.xml
+++ b/torque/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-torque-plugin</id>
   <name>Maven Torque Plug-in</name>
-  <currentVersion>3.2-SNAPSHOT</currentVersion>
+  <currentVersion>3.2</currentVersion>
   <description>Maven Plugin for Torque</description>
   <shortDescription>Maven Plugin for Torque</shortDescription>
   <url>http://maven.apache.org/reference/plugins/torque/</url>
@@ -98,7 +98,7 @@
       <properties>
         <classloader>root</classloader>
       </properties>
-    </dependency>    
+    </dependency>
     <dependency>
       <id>log4j</id>
       <version>1.2.8</version>
diff --git a/uberjar/project.xml b/uberjar/project.xml
index 3978fc14..ab443da7 100644
--- a/uberjar/project.xml
+++ b/uberjar/project.xml
@@ -14,7 +14,7 @@
   <!-- The version of the project under development, e.g.
        1.1, 1.2, 2.0-dev -->
 
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <!-- a short description of what the project does -->
 
   <shortDescription>Uberjar packages your project as well as its dependencies into a single jar file. In addition, bootstrap code is added that enables a main class to be invoked by simply typing: java -jar your.jar</shortDescription>
diff --git a/vdoclet/project.xml b/vdoclet/project.xml
index bd2b12eb..7ce7e3cf 100644
--- a/vdoclet/project.xml
+++ b/vdoclet/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-vdoclet-plugin</id>
   <name>Maven VDoclet Plug-in</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <description>VDoclet plugin for Maven. Allows you to easily create information from source code using velocity driven templates</description>
   <shortDescription>VDoclet plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/vdoclet/</url>
diff --git a/war/project.xml b/war/project.xml
index 021715d8..33c463d1 100644
--- a/war/project.xml
+++ b/war/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-war-plugin</id>
   <name>Maven WAR Plugin</name>
-  <currentVersion>1.4-SNAPSHOT</currentVersion>
+  <currentVersion>1.4</currentVersion>
   <description>War Plugin for Maven</description>
   <shortDescription>War Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/war/</url>
@@ -44,7 +44,7 @@
       <roles>
         <role>Java Developer</role>
       </roles>
-    </developer>    
+    </developer>
   </developers>
   <dependencies/>
 </project>
diff --git a/was40/project.xml b/was40/project.xml
index 72513a45..5edc2353 100644
--- a/was40/project.xml
+++ b/was40/project.xml
@@ -33,7 +33,6 @@
       </roles>
     </developer>
   </developers>
-
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
diff --git a/word2html/project.xml b/word2html/project.xml
index b9ebf6af..09a4ca25 100644
--- a/word2html/project.xml
+++ b/word2html/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-word2html-plugin</id>
   <name>Maven Word to HTML Plug-in</name>
-  <currentVersion>1.4-SNAPSHOT</currentVersion>
+  <currentVersion>1.4</currentVersion>
   <description>A Maven plugin to convert word docs into html for project usage</description>
   <shortDescription>Convert Word docs to HTML</shortDescription>
   <url>http://maven.apache.org/reference/plugins/word2html/</url>
diff --git a/xdoc/project.xml b/xdoc/project.xml
index 8a6d841f..dc85fc24 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-xdoc-plugin</id>
   <name>Maven XDoc Plug-in</name>
-  <currentVersion>1.4-SNAPSHOT</currentVersion>
+  <currentVersion>1.4</currentVersion>
   <shortDescription>Convert xdocs into HTML</shortDescription>
   <url>http://maven.apache.org/reference/plugins/xdoc/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/xdoc/</siteDirectory>
@@ -110,7 +110,7 @@
       <groupId>maven</groupId>
       <artifactId>maven</artifactId>
       <version>1.0-beta-10</version>
-    </dependency>  
+    </dependency>
     <dependency>
       <id>velocity</id>
       <version>1.4-dev</version>