diff --git a/build.properties b/build.properties
index 4fd5b30782..660cf3cc48 100644
--- a/build.properties
+++ b/build.properties
@@ -16,7 +16,7 @@
 # under the License.
 
 classworlds.version=1.2-alpha-10
-plexus.version=1.0-alpha-34-SNAPSHOT
+plexus.version=1.0-alpha-34
 plexus-utils.version=1.4.5
 maven-artifact.version=3.0-SNAPSHOT
 commons-cli.version=1.0
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 ea8f68ba16..5a708932e1 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
@@ -82,7 +82,6 @@ public class DefaultExtensionManager
     extends AbstractLogEnabled
     implements ExtensionManager, Contextualizable
 {
-
     private ArtifactFactory artifactFactory;
 
     private ArtifactResolver artifactResolver;
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
index 7248903d61..55f6c79ad0 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
@@ -1255,25 +1255,19 @@ public class DefaultPluginManager
             // so that this meethod could entirely be handled by a plexus lookup?
             if ( StringUtils.isNotEmpty( configuratorId ) )
             {
-                configurator = (ComponentConfigurator) pluginContainer.lookup(
-                                                                               ComponentConfigurator.ROLE,
-                                                                               configuratorId,
-                                                                               pluginRealm );
+                configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE, configuratorId, pluginRealm );
             }
             else
             {
-                configurator = (ComponentConfigurator) pluginContainer.lookup(
-                                                                               ComponentConfigurator.ROLE,
-                                                                               "basic", pluginRealm );
+                configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE, "basic", pluginRealm );
             }
 
             ConfigurationListener listener = new DebugConfigurationListener( getLogger() );
 
-            getLogger().debug( "Configuring mojo '" + mojoDescriptor.getId() + "' -->" );
+            getLogger().debug( "Configuring mojo '" + mojoDescriptor.getId() + "' with " + configuratorId + " configurator -->" );
 
             // This needs to be able to use methods
-            configurator.configureComponent( plugin, configuration, expressionEvaluator,
-                                             pluginRealm, listener );
+            configurator.configureComponent( plugin, configuration, expressionEvaluator, pluginRealm, listener );
 
             getLogger().debug( "-- end configuration --" );
         }
diff --git a/pom.xml b/pom.xml
index 9580d21492..b5bb6d5bfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,9 @@ under the License.
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.3</version>
+		<configuration>
+          <forkMode>never</forkMode>
+		</configuration>
       </plugin>
     </plugins>
   </build>
@@ -131,7 +134,7 @@ under the License.
     <module>maven-embedder</module>
   </modules>
   <properties>
-    <plexusVersion>1.0-alpha-34-SNAPSHOT</plexusVersion>
+    <plexusVersion>1.0-alpha-34</plexusVersion>
     <wagonVersion>1.0-beta-2</wagonVersion>
   </properties>
   <dependencies>