diff --git a/maven-plugins/maven-assembly-plugin/pom.xml b/maven-plugins/maven-assembly-plugin/pom.xml
index b6a0610fce..a7e48687fc 100755
--- a/maven-plugins/maven-assembly-plugin/pom.xml
+++ b/maven-plugins/maven-assembly-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-assembly-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Assembly Plugin</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0-alpha-1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-plugins/maven-clean-plugin/pom.xml b/maven-plugins/maven-clean-plugin/pom.xml
index 2c4b652e80..3641c989d1 100644
--- a/maven-plugins/maven-clean-plugin/pom.xml
+++ b/maven-plugins/maven-clean-plugin/pom.xml
@@ -8,6 +8,6 @@
   <artifactId>maven-clean-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Clean Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
 </project>
diff --git a/maven-plugins/maven-compiler-plugin/pom.xml b/maven-plugins/maven-compiler-plugin/pom.xml
index 5407ca6a7b..77bb7b6f94 100644
--- a/maven-plugins/maven-compiler-plugin/pom.xml
+++ b/maven-plugins/maven-compiler-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-compiler-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Compiler Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
   <dependencies>
     <dependency>
diff --git a/maven-plugins/maven-deploy-plugin/pom.xml b/maven-plugins/maven-deploy-plugin/pom.xml
index 2645a4b6b6..cac77e374b 100644
--- a/maven-plugins/maven-deploy-plugin/pom.xml
+++ b/maven-plugins/maven-deploy-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-deploy-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Deploy Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <inceptionYear>2004</inceptionYear>
   <dependencies>
     <dependency>
diff --git a/maven-plugins/maven-ejb-plugin/pom.xml b/maven-plugins/maven-ejb-plugin/pom.xml
index b29e1b8b58..ce6e14bf0b 100644
--- a/maven-plugins/maven-ejb-plugin/pom.xml
+++ b/maven-plugins/maven-ejb-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-ejb-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven EJB Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-plugins/maven-idea-plugin/pom.xml b/maven-plugins/maven-idea-plugin/pom.xml
index e0d86bd529..d3190f10e7 100755
--- a/maven-plugins/maven-idea-plugin/pom.xml
+++ b/maven-plugins/maven-idea-plugin/pom.xml
@@ -6,7 +6,7 @@
     <version>2.0-SNAPSHOT</version>
   </parent>
   <artifactId>maven-idea-plugin</artifactId>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>Maven IDEA Plugin</name>
   <dependencies>
diff --git a/maven-plugins/maven-install-plugin/pom.xml b/maven-plugins/maven-install-plugin/pom.xml
index dd7886236c..0a7f3a8ded 100644
--- a/maven-plugins/maven-install-plugin/pom.xml
+++ b/maven-plugins/maven-install-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-install-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Install Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <inceptionYear>2004</inceptionYear>
   <dependencies>
     <dependency>
diff --git a/maven-plugins/maven-jar-plugin/pom.xml b/maven-plugins/maven-jar-plugin/pom.xml
index a8245a46c3..72cb017021 100644
--- a/maven-plugins/maven-jar-plugin/pom.xml
+++ b/maven-plugins/maven-jar-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-jar-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Jar Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-plugins/maven-plugin-plugin/pom.xml b/maven-plugins/maven-plugin-plugin/pom.xml
index 33c84f07a6..3d8fdc6779 100644
--- a/maven-plugins/maven-plugin-plugin/pom.xml
+++ b/maven-plugins/maven-plugin-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-plugin-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven PLUGIN Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
   <dependencies>
     <dependency>
diff --git a/maven-plugins/maven-resources-plugin/pom.xml b/maven-plugins/maven-resources-plugin/pom.xml
index a8a09832b1..5490b7d876 100644
--- a/maven-plugins/maven-resources-plugin/pom.xml
+++ b/maven-plugins/maven-resources-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-resources-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Resources Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-plugins/maven-site-plugin/pom.xml b/maven-plugins/maven-site-plugin/pom.xml
index 29c71feade..0b6934c820 100644
--- a/maven-plugins/maven-site-plugin/pom.xml
+++ b/maven-plugins/maven-site-plugin/pom.xml
@@ -6,7 +6,7 @@
     <version>2.0-SNAPSHOT</version>
   </parent>
   <artifactId>maven-site-plugin</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0-alpha-1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>Maven Site plugin</name>
   <dependencies>
diff --git a/maven-plugins/maven-surefire-plugin/pom.xml b/maven-plugins/maven-surefire-plugin/pom.xml
index 0e8bcce088..5771abf92b 100644
--- a/maven-plugins/maven-surefire-plugin/pom.xml
+++ b/maven-plugins/maven-surefire-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-surefire-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Surefire Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>surefire</groupId>
diff --git a/maven-plugins/maven-verifier-plugin/pom.xml b/maven-plugins/maven-verifier-plugin/pom.xml
index 1e294ebaca..b173da33d2 100644
--- a/maven-plugins/maven-verifier-plugin/pom.xml
+++ b/maven-plugins/maven-verifier-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-verifier-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Verifier Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>1.0-alpha-1-SNAPSHOT</version>
   <developers>
     <developer>
       <id>vmassol</id>
diff --git a/maven-plugins/maven-war-plugin/pom.xml b/maven-plugins/maven-war-plugin/pom.xml
index b18d5f64da..a66c442dda 100644
--- a/maven-plugins/maven-war-plugin/pom.xml
+++ b/maven-plugins/maven-war-plugin/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>maven-war-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven War Plugin</name>
-  <version>1.0-alpha-2-SNAPSHOT</version>
+  <version>2.0-alpha-2-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 840452e4a6..0a81e79990 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -70,10 +70,13 @@
     </site>
   </distributionManagement>
   <modules>
+    <!-- Due to CL bug, assembly must be first -->
     <module>maven-assembly-plugin</module>
+    <module>maven-ant-plugin</module>
     <module>maven-clean-plugin</module>
     <module>maven-compiler-plugin</module>
     <module>maven-deploy-plugin</module>
+    <module>maven-eclipse-plugin</module>
     <module>maven-ejb-plugin</module>
     <module>maven-idea-plugin</module>
     <module>maven-install-plugin</module>
@@ -81,6 +84,7 @@
     <module>maven-plugin-plugin</module>
     <module>maven-resources-plugin</module>
     <module>maven-site-plugin</module>
+    <module>maven-source-plugin</module>
     <module>maven-surefire-plugin</module>
     <module>maven-war-plugin</module>
     <module>maven-verifier-plugin</module>