diff --git a/build.properties b/build.properties
index 7f78e92bad..defe62eb22 100644
--- a/build.properties
+++ b/build.properties
@@ -18,7 +18,7 @@
 classworlds.version=1.2-alpha-7
 plexus.version=1.0-alpha-19
 plexus-archiver.version=1.0-alpha-8
-plexus-utils.version=1.4
+plexus-utils.version=1.4.1
 plexus-interactivity-api.version=1.0-alpha-6-SNAPSHOT
 commons-cli.version=1.0
 commons-lang.version=2.1
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
index 65b2197035..248ba3226e 100644
--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
@@ -328,6 +328,7 @@ else if ( repository.isBlacklisted() )
         else
         {
             getLogger().debug( "Trying repository " + repository.getId() );
+
             getRemoteFile( repository, artifact.getFile(), remotePath, downloadMonitor, policy.getChecksumPolicy(),
                            false );
             getLogger().debug( "  Artifact resolved" );
@@ -787,6 +788,20 @@ public void setInteractive( boolean interactive )
         this.interactive = interactive;
     }
 
+    public void findAndRegisterWagons( PlexusContainer container )
+    {
+        try
+        {
+            Map wagons = container.lookupMap( Wagon.ROLE );
+
+            registerWagons( wagons.keySet(), container );
+        }
+        catch ( ComponentLookupException e )
+        {
+            // no wagons found in the extension
+        }
+    }
+
     public void registerWagons( Collection wagons, PlexusContainer extensionContainer )
     {
         for ( Iterator i = wagons.iterator(); i.hasNext(); )
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
index dcaf644004..4b54ab4a06 100644
--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
+++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
@@ -117,4 +117,6 @@ void addAuthenticationInfo( String repositoryId, String username, String passwor
     void setInteractive( boolean interactive );
 
     void registerWagons( Collection wagons, PlexusContainer extensionContainer );
+
+    void findAndRegisterWagons( PlexusContainer container );    
 }
\ No newline at end of file
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 49bc0d61ca..3a7ee231f9 100644
--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -295,7 +295,8 @@ public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact ori
             }
             catch ( ArtifactNotFoundException anfe )
             {
-                getLogger().debug( anfe.getMessage() );
+                getLogger().debug( anfe.getMessage(), anfe );
+
                 missingArtifacts.add( node.getArtifact() );
             }
         }
@@ -303,14 +304,6 @@ public ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact ori
         if ( missingArtifacts.size() > 0 )
         {
             throw new MultipleArtifactsNotFoundException( originatingArtifact, missingArtifacts, remoteRepositories );
-//            String message = "required artifacts missing:\n";
-//            for ( Iterator i = missingArtifacts.iterator(); i.hasNext(); )
-//            {
-//                Artifact missingArtifact = (Artifact) i.next();
-//                message += "  " + missingArtifact.getId() + "\n";
-//            }
-//            message += "\nfor the artifact:";
-//            throw new ArtifactResolutionException( message, originatingArtifact, remoteRepositories );
         }
 
         return artifactResolutionResult;
diff --git a/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java b/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
index 81cbef71b6..0d0ecd0d3c 100644
--- a/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
+++ b/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
@@ -158,16 +158,7 @@ private void addExtension( Artifact extensionArtifact,
 
     public void registerWagons()
     {
-        try
-        {
-            Map wagons = container.lookupMap( Wagon.ROLE );
-
-            wagonManager.registerWagons( wagons.keySet(), container );
-        }
-        catch ( ComponentLookupException e )
-        {
-            // no wagons found in the extension
-        }
+        wagonManager.findAndRegisterWagons( container );
     }
 
     public void contextualize( Context context )
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
index 5adfa2cc8b..556ee31a3d 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
@@ -35,12 +35,9 @@
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
 import org.apache.maven.plugin.InvalidPluginException;
-import org.apache.maven.plugin.registry.MavenPluginRegistryBuilder;
-import org.apache.maven.plugin.registry.PluginRegistry;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
-import org.codehaus.plexus.components.interactivity.InputHandler;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -53,17 +50,10 @@ public class DefaultPluginVersionManager
     extends AbstractLogEnabled
     implements PluginVersionManager
 {
-    private MavenPluginRegistryBuilder mavenPluginRegistryBuilder;
-
     private ArtifactFactory artifactFactory;
 
-    private InputHandler inputHandler;
-
     private ArtifactMetadataSource artifactMetadataSource;
 
-    // TODO: [jc] Revisit to remove this piece of state. PLUGIN REGISTRY MAY BE UPDATED ON DISK OUT-OF-PROCESS!
-    private PluginRegistry pluginRegistry;
-
     private MavenProjectBuilder mavenProjectBuilder;
 
     private RuntimeInformation runtimeInformation;
@@ -118,21 +108,12 @@ private String resolvePluginVersion( String groupId,
             }
         }
 
-        // we're NEVER going to persist POM-derived plugin versions.
-        String updatedVersion = null;
-
         // third pass...we're always checking for latest install/deploy, so retrieve the version for LATEST metadata and
         // also set that resolved version as the <useVersion/> in settings.xml.
         if ( StringUtils.isEmpty( version ) )
         {
             // 1. resolve the version to be used
             version = resolveMetaVersion( groupId, artifactId, project, localRepository, Artifact.LATEST_VERSION );
-
-            if ( version != null )
-            {
-                // 2. Set the updatedVersion so the user will be prompted whether to make this version permanent.
-                updatedVersion = version;
-            }
         }
 
         // final pass...retrieve the version for RELEASE and also set that resolved version as the <useVersion/>
@@ -141,12 +122,6 @@ private String resolvePluginVersion( String groupId,
         {
             // 1. resolve the version to be used
             version = resolveMetaVersion( groupId, artifactId, project, localRepository, Artifact.RELEASE_VERSION );
-
-            if ( version != null )
-            {
-                // 2. Set the updatedVersion so the user will be prompted whether to make this version permanent.
-                updatedVersion = version;
-            }
         }
 
         // if we're still empty here, and the current project matches the plugin in question, use the current project's
diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml
index ec2910a3fb..5e69612549 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -610,16 +610,9 @@ under the License.
           <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
           <role-hint>default</role-hint>
         </requirement>
-        <requirement>
-          <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
-        </requirement>
         <requirement>
           <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
         </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.components.interactivity.InputHandler</role>
-          <role-hint>default</role-hint>
-        </requirement>
         <requirement>
           <role>org.apache.maven.project.MavenProjectBuilder</role>
         </requirement>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index a71ed1f04d..cdfece52f9 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -86,6 +86,7 @@ under the License.
                 <exclude>classworlds:classworlds</exclude>
                 <exclude>junit:junit</exclude>
                 <exclude>jmock:jmock</exclude>
+                <exclude>xml-apis:xml-apis</exclude>
               </excludes>
               <!--
               <dependenciesToHide>
@@ -129,6 +130,18 @@ under the License.
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-http-lightweight</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-ssh</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-ssh-external</artifactId>
+    </dependency>
   </dependencies>
   <distributionManagement>
     <site>
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
index 17881b9bb5..39e823726e 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
@@ -427,10 +427,14 @@ public MavenExecutionResult readProjectWithDependencies( MavenExecutionRequest r
         {
             request = defaultsPopulator.populateDefaults( request, this );
             //mkleint: copied from DefaultLifecycleExecutor
+
             project = readProject( new File( request.getPomFile() ) );
+
             Map handlers = findArtifactTypeHandlers( project );
+
             //is this necessary in this context, I doubt it..mkleint
             artifactHandlerManager.addHandlers( handlers );
+
             project = mavenProjectBuilder.buildWithDependencies( new File( request.getPomFile() ),
                                                                  request.getLocalRepository(), profileManager,
                                                                  request.getTransferListener() );
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
index c0890ec92b..808b7b817b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
@@ -113,6 +113,8 @@ else if ( request.isNoSnapshotUpdates() )
         }
         else
         {
+            wagonManager.findAndRegisterWagons( container );
+
             wagonManager.setInteractive( request.isInteractiveMode() );
 
             wagonManager.setDownloadMonitor( request.getTransferListener() );
diff --git a/maven-embedder/src/test/embedder-test-project/pom.xml b/maven-embedder/src/test/embedder-test-project/pom.xml
index c40f0622df..899e4fa850 100644
--- a/maven-embedder/src/test/embedder-test-project/pom.xml
+++ b/maven-embedder/src/test/embedder-test-project/pom.xml
@@ -17,25 +17,6 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
index 10639b3b6a..573d34f265 100644
--- a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
@@ -247,10 +247,22 @@ public void testProjectReading()
         throws Exception
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest().setShowErrors( true )
-            .setPomFile( getPomFile().getAbsolutePath() );
+            .setPomFile( getPomFile().getAbsolutePath() ).setShowErrors( true );
 
         MavenExecutionResult result = maven.readProjectWithDependencies( request );
 
+        if ( result.hasExceptions() )
+        {
+            for ( Iterator i = result.getExceptions().iterator(); i.hasNext(); )
+            {
+                Exception e = (Exception) i.next();
+
+                e.printStackTrace();
+            }
+
+            fail( "Exception is readProjectWithDependencies() test." );
+        }
+
         assertNoExceptions( result );
 
         assertEquals( "org.apache.maven", result.getMavenProject().getGroupId() );
diff --git a/maven-embedder/src/test/resources/pom.xml b/maven-embedder/src/test/resources/pom.xml
index eb1ced5149..c226875a3b 100644
--- a/maven-embedder/src/test/resources/pom.xml
+++ b/maven-embedder/src/test/resources/pom.xml
@@ -21,31 +21,9 @@ under the License.
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven</groupId>
   <artifactId>maven-model</artifactId>
-  <name>Maven Model</name>
-  <version>2.0-beta-2-SNAPSHOT</version>
-  <description>Maven Model</description>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>xpp3-writer</goal>
-              <goal>java</goal>
-              <goal>xpp3-reader</goal>
-              <goal>xsd</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <version>4.0.0</version>
-          <model>maven.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <name>Maven Embedder Test Project</name>
+  <version>1.0</version>
+  <description>Maven Embedder Test Project</description>
   <dependencies>
     <dependency>
       <groupId>plexus</groupId>
diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index 870c9a781d..76d1da2bea 100644
--- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -1,24 +1,5 @@
 package org.apache.maven.project;
 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index 93a2f324fb..6fc999dc89 100644
--- a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -59,7 +59,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author Jason van Zyl
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  */
diff --git a/pom.xml b/pom.xml
index 87ac1a806c..3f11a4bc18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>5</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
   <artifactId>maven</artifactId>
@@ -179,6 +179,21 @@ under the License.
         <artifactId>wagon-file</artifactId>
         <version>${wagonVersion}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-http-lightweight</artifactId>
+        <version>${wagonVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh</artifactId>
+        <version>${wagonVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh-external</artifactId>
+        <version>${wagonVersion}</version>
+      </dependency>
       <dependency>
         <groupId>easymock</groupId>
         <artifactId>easymock</artifactId>