diff --git a/maven-archiver/pom.xml b/maven-archiver/pom.xml
index d70cde1eb4..27288f5e0f 100644
--- a/maven-archiver/pom.xml
+++ b/maven-archiver/pom.xml
@@ -12,7 +12,7 @@
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
+      <version>1.0-alpha-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -24,20 +24,5 @@
       <artifactId>maven-core</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 95d9240775..5dc7533a3f 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -1,4 +1,4 @@
-<model>
+<project>
   <parent>
     <artifactId>maven-component</artifactId>
     <groupId>org.apache.maven</groupId>
@@ -6,31 +6,25 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-artifact</artifactId>
-  <packaging>jar</packaging>
   <name>Maven</name>
   <version>2.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
   <dependencies>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+      <version>1.0-alpha-2</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
       <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
       <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
+      <scope>test</scope>
     </dependency>
   </dependencies>
-</model>
+</project>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index b55a4dd850..f99f892393 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -1,4 +1,4 @@
-<model>
+<project>
   <parent>
     <artifactId>maven-component</artifactId>
     <groupId>org.apache.maven</groupId>
@@ -6,7 +6,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-core</artifactId>
-  <packaging>jar</packaging>
   <name>Maven</name>
   <version>2.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
@@ -15,99 +14,53 @@
       <groupId>plexus</groupId>
       <artifactId>plexus-container-artifact</artifactId>
       <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
       <version>1.0-beta-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-i18n</artifactId>
       <version>1.0-beta-3</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-marmalade-factory</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-script-marmalade</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>marmalade</groupId>
-      <artifactId>marmalade-core</artifactId>
-      <version>1.0-alpha2</version>
-      <type>jar</type>
-      <scope>compile</scope>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+      <version>1.0-alpha-2</version>
     </dependency>
     <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
-      <version>1.1.3.3</version>
-      <type>jar</type>
-      <scope>compile</scope>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-http-lightweight</artifactId>
+      <version>1.0-alpha-2</version>
+      <scope>runtime</scope>
     </dependency>
   </dependencies>
   <reports>
@@ -128,4 +81,4 @@
       <url>scp://www.apache.org//www/maven.apache.org/m2</url>
     </site>
   </distributionManagement>
-</model>
+</project>
diff --git a/maven-mboot2/src/main/java/MBoot.java b/maven-mboot2/src/main/java/MBoot.java
index 004d368221..92a51ed3cd 100644
--- a/maven-mboot2/src/main/java/MBoot.java
+++ b/maven-mboot2/src/main/java/MBoot.java
@@ -589,7 +589,7 @@ public class MBoot
 
         System.out.println( "Compiling test sources ..." );
 
-        Collection testDependencies = reader.getDependencies();
+        Collection testDependencies = new ArrayList( reader.getDependencies() );
 
         compile( testDependencies, testSources, testClasses, classes, null, SCOPE_TEST, localRepository );
 
@@ -800,6 +800,7 @@ public class MBoot
         List classpath = classpath( depList, null, SCOPE_TEST, localRepository );
         classpath.add( classes );
         classpath.add( testClasses );
+
         boolean success = testRunner.execute( basedir, includes, excludes, classpath, reportsDir );
 
         if ( !success )
@@ -842,7 +843,10 @@ public class MBoot
             }
         }
 
-        classpath.add( extraClasspath );
+        if ( extraClasspath != null )
+        {
+            classpath.add( extraClasspath );
+        }
 
         return classpath;
     }
@@ -880,8 +884,8 @@ public class MBoot
         {
             CompilerConfiguration compilerConfiguration = new CompilerConfiguration();
             compilerConfiguration.setOutputLocation( outputDirectory );
-            compilerConfiguration.setClasspathEntries(
-                classpath( dependencies, extraClasspath, scope, localRepository ) );
+            List classpathEntries = classpath( dependencies, extraClasspath, scope, localRepository );
+            compilerConfiguration.setClasspathEntries( classpathEntries );
             compilerConfiguration.setSourceLocations( Arrays.asList( sourceDirectories ) );
 
             /* Compile with debugging info */
diff --git a/maven-mboot2/src/main/java/download/ArtifactDownloader.java b/maven-mboot2/src/main/java/download/ArtifactDownloader.java
index 2c74ad9330..34da71ceb8 100644
--- a/maven-mboot2/src/main/java/download/ArtifactDownloader.java
+++ b/maven-mboot2/src/main/java/download/ArtifactDownloader.java
@@ -80,13 +80,15 @@ public class ArtifactDownloader
                     directory.mkdirs();
                 }
 
-                if ( dep.getGroupId().equals( "org.apache.maven" ) )
+                boolean snapshot = dep.getVersion().indexOf( SNAPSHOT_SIGNATURE ) >= 0;
+
+                if ( dep.getGroupId().equals( "org.apache.maven" ) && snapshot )
                 {
                     //skip our own
                     continue;
                 }
 
-                if ( destinationFile.exists() && dep.getVersion().indexOf( SNAPSHOT_SIGNATURE ) < 0 )
+                if ( destinationFile.exists() && !snapshot )
                 {
                     continue;
                 }
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index f80c0f89fe..16472bbd6c 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -1,4 +1,4 @@
-<model>
+<project>
   <parent>
     <artifactId>maven-component</artifactId>
     <groupId>org.apache.maven</groupId>
@@ -7,16 +7,22 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-model</artifactId>
-  <packaging>jar</packaging>
   <name>Maven Model</name>
   <version>2.0-SNAPSHOT</version>
   <description>Maven Model</description>
+  <dependencies>
+    <dependency>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.0-alpha-2</version>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-modello-plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-alpha-1</version>
         <configuration>
           <version>4.0.0</version>
           <model>maven.mdo</model>
@@ -35,4 +41,4 @@
       </plugin>
     </plugins>
   </build>
-</model>
+</project>
diff --git a/maven-plugin-tools/maven-plugin-tools-api/pom.xml b/maven-plugin-tools/maven-plugin-tools-api/pom.xml
index 2e722e9d9b..5be8e154e3 100644
--- a/maven-plugin-tools/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-api/pom.xml
@@ -11,53 +11,19 @@
   <version>2.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>modello</groupId>
+      <groupId>org.codehaus.modello</groupId>
       <artifactId>modello-core</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
+      <version>1.0-alpha-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
+      <groupId>plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
       <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugin-tools/maven-plugin-tools-java/pom.xml b/maven-plugin-tools/maven-plugin-tools-java/pom.xml
index 8bae52fa88..cc9f144740 100644
--- a/maven-plugin-tools/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-java/pom.xml
@@ -14,57 +14,16 @@
       <groupId>qdox</groupId>
       <artifactId>qdox</artifactId>
       <version>1.2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>modello</groupId>
-      <artifactId>modello</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-      </testResource>
-    </testResources>
-  </build>
 </model>
diff --git a/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml b/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
index 2c244c4701..4e513b27b5 100644
--- a/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-marmalade/pom.xml
@@ -10,103 +10,25 @@
   <name>Maven Plugin Tools for Marmalade</name>
   <version>2.0-SNAPSHOT</version>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>marmalade</groupId>
       <artifactId>marmalade-core</artifactId>
       <version>1.0-alpha2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-script-marmalade</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-marmalade-factory</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
-      <version>1.1.3.3</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml b/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
index e94fd25faa..243cd641b9 100644
--- a/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
+++ b/maven-plugin-tools/maven-plugin-tools-pluggy/pom.xml
@@ -10,61 +10,25 @@
   <name>Maven Pluggy Simplistic Plugin Generator</name>
   <version>2.0-SNAPSHOT</version>
   <dependencies>
-    <dependency>
-      <groupId>qdox</groupId>
-      <artifactId>qdox</artifactId>
-      <version>1.2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>modello</groupId>
-      <artifactId>modello</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-java</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugin-tools/pom.xml b/maven-plugin-tools/pom.xml
index e4d1336d60..543880f7a4 100644
--- a/maven-plugin-tools/pom.xml
+++ b/maven-plugin-tools/pom.xml
@@ -9,36 +9,6 @@
   <version>2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Maven Plugin Tools Base POM</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-tools-api</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>qdox</groupId>
-      <artifactId>qdox</artifactId>
-      <version>1.2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>modello</groupId>
-      <artifactId>modello</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
   <modules>
     <module>maven-plugin-tools-api</module>
     <module>maven-plugin-tools-java</module>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 589857a292..7bae566856 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -1,4 +1,4 @@
-<model>
+<project>
   <parent>
     <artifactId>maven-component</artifactId>
     <groupId>org.apache.maven</groupId>
@@ -6,10 +6,11 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>maven-plugin</artifactId>
-  <packaging>jar</packaging>
   <name>Maven Plugin</name>
   <version>2.0-SNAPSHOT</version>
   <dependencies>
+    <!-- TODO: can we avoid this dependency so that it is not propogated to Mojo implementors?
+         Maybe split plugin-api from the descriptor builder? -->
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
@@ -19,32 +20,13 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-monitor</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>qdox</groupId>
-      <artifactId>qdox</artifactId>
-      <version>1.2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>modello</groupId>
-      <artifactId>modello</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
+
+    <!-- TODO: shouldn't be needed - separate plugin test case -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <type>jar</type>
-      <!-- Should be changed to test scope, but that requires moving the 
-        | plugin test case out to another artifact or something.
-        | -->
-      <scope>compile</scope>
     </dependency>
   </dependencies>
-</model>
+</project>
diff --git a/maven-plugins/maven-assemble-plugin/pom.xml b/maven-plugins/maven-assemble-plugin/pom.xml
index 7441a1a53c..02ed75c327 100644
--- a/maven-plugins/maven-assemble-plugin/pom.xml
+++ b/maven-plugins/maven-assemble-plugin/pom.xml
@@ -10,24 +10,9 @@
   <name>Maven Assemble Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
       <version>1.0-alpha-1</version>
     </dependency>
   </dependencies>
diff --git a/maven-plugins/maven-clean-plugin/pom.xml b/maven-plugins/maven-clean-plugin/pom.xml
index f51035539d..55b7ac5a24 100644
--- a/maven-plugins/maven-clean-plugin/pom.xml
+++ b/maven-plugins/maven-clean-plugin/pom.xml
@@ -1,4 +1,4 @@
-<model>
+<project>
   <parent>
     <artifactId>maven-plugin-parent</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
@@ -10,13 +10,4 @@
   <name>Maven Clean Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</model>
+</project>
diff --git a/maven-plugins/maven-compiler-plugin/pom.xml b/maven-plugins/maven-compiler-plugin/pom.xml
index 1e3505a6ab..3b5ed9416f 100644
--- a/maven-plugins/maven-compiler-plugin/pom.xml
+++ b/maven-plugins/maven-compiler-plugin/pom.xml
@@ -11,11 +11,6 @@
   <version>1.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-compiler-api</artifactId>
@@ -26,10 +21,5 @@
       <artifactId>plexus-compiler-javac</artifactId>
       <version>1.2</version>
     </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-2</version>
-    </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugins/maven-deploy-plugin/pom.xml b/maven-plugins/maven-deploy-plugin/pom.xml
index ba97558049..3d092eaae3 100644
--- a/maven-plugins/maven-deploy-plugin/pom.xml
+++ b/maven-plugins/maven-deploy-plugin/pom.xml
@@ -15,49 +15,22 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
       <version>1.0-alpha-2</version>
-      <type>jar</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-ssh</artifactId>
       <version>1.0-alpha-2</version>
-      <type>jar</type>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/maven-plugins/maven-ejb-plugin/pom.xml b/maven-plugins/maven-ejb-plugin/pom.xml
index 56f3bd1e8c..71189225e6 100644
--- a/maven-plugins/maven-ejb-plugin/pom.xml
+++ b/maven-plugins/maven-ejb-plugin/pom.xml
@@ -10,47 +10,10 @@
   <name>Maven EJB Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-archiver</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
       <version>1.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugins/maven-idea-plugin/pom.xml b/maven-plugins/maven-idea-plugin/pom.xml
index 3a60ea69e7..c6e8167b6c 100755
--- a/maven-plugins/maven-idea-plugin/pom.xml
+++ b/maven-plugins/maven-idea-plugin/pom.xml
@@ -15,15 +15,5 @@
       <artifactId>maven-core</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
-    </dependency>
   </dependencies>
 </project>
diff --git a/maven-plugins/maven-install-plugin/pom.xml b/maven-plugins/maven-install-plugin/pom.xml
index 65e1861cb6..bc996bd6f6 100644
--- a/maven-plugins/maven-install-plugin/pom.xml
+++ b/maven-plugins/maven-install-plugin/pom.xml
@@ -15,29 +15,11 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugins/maven-jar-plugin/pom.xml b/maven-plugins/maven-jar-plugin/pom.xml
index 3827f0fcc9..63bd85dd7b 100644
--- a/maven-plugins/maven-jar-plugin/pom.xml
+++ b/maven-plugins/maven-jar-plugin/pom.xml
@@ -10,54 +10,15 @@
   <name>Maven Jar Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-archiver</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
       <version>1.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugins/maven-plugin-plugin/pom.xml b/maven-plugins/maven-plugin-plugin/pom.xml
index 9d818d7a08..262c2765ee 100644
--- a/maven-plugins/maven-plugin-plugin/pom.xml
+++ b/maven-plugins/maven-plugin-plugin/pom.xml
@@ -11,54 +11,22 @@
   <version>1.0-SNAPSHOT</version>
   <inceptionYear>2001</inceptionYear>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-java</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-tools-marmalade</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
+      <scope>runtime</scope>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugins/maven-resources-plugin/pom.xml b/maven-plugins/maven-resources-plugin/pom.xml
index 7bb34deb63..8895fa3629 100644
--- a/maven-plugins/maven-resources-plugin/pom.xml
+++ b/maven-plugins/maven-resources-plugin/pom.xml
@@ -10,19 +10,10 @@
   <name>Maven Resources Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugins/maven-surefire-plugin/pom.xml b/maven-plugins/maven-surefire-plugin/pom.xml
index ee1659d78e..eaeb516f20 100644
--- a/maven-plugins/maven-surefire-plugin/pom.xml
+++ b/maven-plugins/maven-surefire-plugin/pom.xml
@@ -10,16 +10,18 @@
   <name>Maven Surefire Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
-    <dependency>
-      <groupId>surefire</groupId>
-      <artifactId>surefire</artifactId>
-      <version>1.2</version>
-    </dependency>
     <dependency>
       <groupId>surefire</groupId>
       <artifactId>surefire-booter</artifactId>
       <version>1.2</version>
     </dependency>
+    <!-- Specified for mboot -->
+    <dependency>
+      <groupId>surefire</groupId>
+      <artifactId>surefire</artifactId>
+      <version>1.2</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -27,16 +29,11 @@
       <scope>runtime</scope>
     </dependency>
 
-    <!-- TODO: should be able to remove -->
+    <!-- TODO: would like to remove -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>2.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
-    </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugins/maven-war-plugin/pom.xml b/maven-plugins/maven-war-plugin/pom.xml
index 4acfaf6368..fe540ca28b 100644
--- a/maven-plugins/maven-war-plugin/pom.xml
+++ b/maven-plugins/maven-war-plugin/pom.xml
@@ -10,61 +10,10 @@
   <name>Maven War Plugin</name>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-archiver</artifactId>
-      <version>1.0-alpha-1-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-archiver</artifactId>
       <version>1.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
index 3d8ea44e74..2179944ba2 100644
--- a/maven-plugins/pom.xml
+++ b/maven-plugins/pom.xml
@@ -37,22 +37,11 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-monitor</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
   <organization>
diff --git a/maven-script/maven-script-marmalade/pom.xml b/maven-script/maven-script-marmalade/pom.xml
index 9e98a295a8..c7b2f4e1da 100644
--- a/maven-script/maven-script-marmalade/pom.xml
+++ b/maven-script/maven-script-marmalade/pom.xml
@@ -11,40 +11,20 @@
   <name>Maven Marmalade Mojo Support</name>
   <version>2.0-SNAPSHOT</version>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin</artifactId>
       <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>marmalade</groupId>
       <artifactId>marmalade-core</artifactId>
       <version>1.0-alpha2</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-marmalade-factory</artifactId>
       <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
-      <version>1.1.3.3</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 </model>
diff --git a/maven-script/pom.xml b/maven-script/pom.xml
index dc299703e7..5434730c42 100644
--- a/maven-script/pom.xml
+++ b/maven-script/pom.xml
@@ -9,22 +9,6 @@
   <version>2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Maven Script Support Root</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
   <modules>
     <module>maven-script-marmalade</module>
   </modules>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 0884a6e7d4..cba667ab24 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -1,4 +1,4 @@
-<model>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>maven-component</artifactId>
@@ -19,7 +19,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-modello-plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-alpha-1</version>
         <goals>
           <goal>
             <id>xpp3-writer</id>
@@ -38,4 +38,4 @@
       </plugin>
     </plugins>
   </build>
-</model>
+</project>
diff --git a/pom.xml b/pom.xml
index 5c6810c24c..26db294f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,27 +58,6 @@
     </developer>
   </developers>
   <dependencies>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-container-artifact</artifactId>
-      <version>1.0-alpha-2</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>classworlds</groupId>
-      <artifactId>classworlds</artifactId>
-      <version>1.1-alpha-1</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>