diff --git a/announcement/project.xml b/announcement/project.xml
index bb2c4908..5625686b 100644
--- a/announcement/project.xml
+++ b/announcement/project.xml
@@ -107,7 +107,8 @@
       </properties>
     </dependency>
     <dependency>
-      <id>commons-lang</id>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
       <version>2.0</version>
       <url>http://jakarta.apache.org/commons/lang/</url>
       <properties>
@@ -115,7 +116,8 @@
       </properties>
     </dependency>
     <dependency>
-      <id>commons-net</id>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
       <version>1.4.0</version>
       <url>http://jakarta.apache.org/commons/net/</url>
     </dependency>
diff --git a/aspectj/project.xml b/aspectj/project.xml
index 9a91f9b8..98eddcbf 100644
--- a/aspectj/project.xml
+++ b/aspectj/project.xml
@@ -27,7 +27,6 @@
   <description/>
   <shortDescription>AspectJ Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/aspectj/</url>
-  <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10320</issueTrackingUrl>
   <issueTrackingUrl>http://jira.codehaus.org/browse/MPASPECTJ</issueTrackingUrl>
   <siteDirectory>/www/maven.apache.org/reference/plugins/aspectj/</siteDirectory>
   <repository>
diff --git a/cruisecontrol/project.xml b/cruisecontrol/project.xml
index 4f69b758..d4410113 100644
--- a/cruisecontrol/project.xml
+++ b/cruisecontrol/project.xml
@@ -20,6 +20,7 @@
 
 <project>
   <extend>../plugin-parent/project.xml</extend>
+  <pomVersion>3</pomVersion>
   <id>maven-cruisecontrol-plugin</id>
   <name>Maven Cruise Control Plugin</name>
   <currentVersion>1.8-SNAPSHOT</currentVersion>
diff --git a/ejb/project.xml b/ejb/project.xml
index 25d924a2..ee5fc870 100644
--- a/ejb/project.xml
+++ b/ejb/project.xml
@@ -65,7 +65,6 @@
       <tag>MAVEN_EJB_1_7_1</tag>
     </version>
   </versions>
-  <mailingLists/>
   <developers>
     <developer>
       <name>Nathan Coast</name>
diff --git a/javadoc/project.xml b/javadoc/project.xml
index 73b9c147..953cba4f 100644
--- a/javadoc/project.xml
+++ b/javadoc/project.xml
@@ -18,6 +18,7 @@
   -->
 <project>
   <extend>../plugin-parent/project.xml</extend>
+  <pomVersion>3</pomVersion>
   <artifactId>maven-javadoc-plugin</artifactId>
   <name>Maven Javadoc Plug-in</name>
   <currentVersion>1.8-SNAPSHOT</currentVersion>
diff --git a/jdiff/project.xml b/jdiff/project.xml
index d4623975..8bef9553 100644
--- a/jdiff/project.xml
+++ b/jdiff/project.xml
@@ -22,7 +22,6 @@
   <id>maven-jdiff-plugin</id>
   <name>Maven JDiff Plugin</name>
   <currentVersion>1.6-SNAPSHOT</currentVersion>
-  <shortDescription>JDiff reports on the differences in the public API of two releases.</shortDescription>
   <shortDescription>JDiff - Report the differences in the public API of two releases</shortDescription>
   <description>Plugin for JDiff - reports on the differences in the public API of two releases by comparing the sources of two SCM checkouts.</description>
   <url>http://maven.apache.org/reference/plugins/jdiff/</url>
diff --git a/multiproject/project.xml b/multiproject/project.xml
index 7650f90e..cc10663a 100644
--- a/multiproject/project.xml
+++ b/multiproject/project.xml
@@ -18,6 +18,7 @@
  -->
 <project>
   <extend>../plugin-parent/project.xml</extend>
+  <pomVersion>3</pomVersion>
   <id>maven-multiproject-plugin</id>
   <name>Maven Multi-Project Plug-in</name>
   <currentVersion>1.5-SNAPSHOT</currentVersion>
diff --git a/nsis/project.xml b/nsis/project.xml
index 39484d89..67ebbd5f 100644
--- a/nsis/project.xml
+++ b/nsis/project.xml
@@ -22,7 +22,6 @@
   <name>Maven NSIS Plug-in</name>
   <artifactId>maven-nsis-plugin</artifactId>
   <currentVersion>2.0-SNAPSHOT</currentVersion>
-  <organization/>
   <description>A plugin to generate Win32 installer programs using NSIS</description>
   <shortDescription>NSIS Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/nsis/</url>
@@ -46,7 +45,6 @@
     </version>
   </versions>
   <branches/>
-  <mailingLists/>
   <developers>
     <developer>
       <name>dIon Gillard</name>
diff --git a/pdf/project.xml b/pdf/project.xml
index d3955798..55b990cb 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -18,6 +18,7 @@
  -->
 <project>
   <extend>${basedir}/../plugin-parent/project.xml</extend>
+  <pomVersion>3</pomVersion>
   <artifactId>maven-pdf-plugin</artifactId>
   <name>Maven PDF Plug-in</name>
   <currentVersion>2.5-SNAPSHOT</currentVersion>
diff --git a/scm/project.xml b/scm/project.xml
index e1765d3d..cd47e5ae 100644
--- a/scm/project.xml
+++ b/scm/project.xml
@@ -18,6 +18,7 @@
  -->
 <project>
   <extend>../plugin-parent/project.xml</extend>
+  <pomVersion>3</pomVersion>
   <id>maven-scm-plugin</id>
   <name>Maven Source Control Management Plug-in</name>
   <currentVersion>1.5.1-SNAPSHOT</currentVersion>
diff --git a/simian/project.xml b/simian/project.xml
index da3d6edb..4f558951 100644
--- a/simian/project.xml
+++ b/simian/project.xml
@@ -20,6 +20,7 @@
 
 <project>
   <extend>../plugin-parent/project.xml</extend>
+  <pomVersion>3</pomVersion>
   <id>maven-simian-plugin</id>
   <name>Maven Simian Plugin</name>
   <currentVersion>1.6-SNAPSHOT</currentVersion>
diff --git a/uberjar/project.xml b/uberjar/project.xml
index c82e94e4..604b6916 100644
--- a/uberjar/project.xml
+++ b/uberjar/project.xml
@@ -60,7 +60,6 @@
       <tag>MAVEN_UBERJAR_1_2</tag>
     </version>
   </versions>
-  <mailingLists/>
   <!-- who the developers are for the project -->
 
   <developers>
diff --git a/war/project.xml b/war/project.xml
index fbe3d28a..ad4e9bdc 100644
--- a/war/project.xml
+++ b/war/project.xml
@@ -52,7 +52,6 @@
     </version>
   </versions>
   <branches/>
-  <mailingLists/>
   <developers>
     <developer>
       <name>Michal Maczka</name>
diff --git a/xdoc/project.xml b/xdoc/project.xml
index f1d2322c..a4c0119c 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -259,7 +259,8 @@
       <version>1.0</version>
     </dependency>
     <dependency>
-      <id>forehead</id>
+      <groupId>forehead</groupId>
+      <artifactId>forehead</artifactId>
       <version>1.0-beta-5</version>
       <properties>
         <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>