diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
index e0a71e3d51..8592f059d7 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
@@ -14,13 +14,12 @@
  */
 package org.apache.maven.lifecycle.internal;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
 import org.apache.maven.project.MavenProject;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -80,10 +79,17 @@ public class ConcurrentBuildLogger
     {
         StringBuilder result = new StringBuilder();
 
-        Multimap<MavenProject, BuildLogItem> multiMap = ArrayListMultimap.create();
+        Map<MavenProject, Collection<BuildLogItem>> multiMap = new HashMap<MavenProject, Collection<BuildLogItem>>();
         for ( BuildLogItem builtLogItem : items )
         {
-            multiMap.put( builtLogItem.getProject(), builtLogItem );
+            MavenProject project = builtLogItem.getProject();
+            Collection<BuildLogItem> bag = multiMap.get( project );
+            if ( bag == null )
+            {
+                bag = new ArrayList<BuildLogItem>();
+                multiMap.put( project, bag );
+            }
+            bag.add( builtLogItem );
         }
 
         result.append( "digraph build" );
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
index 659dcc769f..59611290c5 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
@@ -37,7 +37,7 @@ import java.util.Set;
  *         <p/>
  *         NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
  */
-@Component(role = LifecyclePluginAnalyzerImpl.class)
+@Component(role = LifeCyclePluginAnalyzer.class)
 public class LifecyclePluginAnalyzerImpl
     implements LifeCyclePluginAnalyzer
 {
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
index bbc14e4229..01ebeac08b 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
@@ -21,7 +21,6 @@ import org.apache.maven.exception.ExceptionHandler;
 import org.apache.maven.lifecycle.internal.LifecycleDependencyResolver;
 import org.apache.maven.lifecycle.internal.LifecycleExecutionPlanCalculator;
 import org.apache.maven.lifecycle.internal.LifecycleModuleBuilder;
-import org.apache.maven.lifecycle.internal.LifecyclePluginAnalyzerImpl;
 import org.apache.maven.lifecycle.internal.LifecycleTaskSegmentCalculator;
 import org.apache.maven.lifecycle.internal.MojoExecutor;
 import org.codehaus.plexus.component.annotations.Requirement;
@@ -66,7 +65,7 @@ public class LifecycleExecutorSubModulesTest
         lifeCycleBuilder = lookup( LifecycleModuleBuilder.class );
         lifeCycleDependencyResolver = lookup( LifecycleDependencyResolver.class );
         lifeCycleExecutionPlanCalculator = lookup( LifecycleExecutionPlanCalculator.class );
-        lifeCyclePluginAnalyzer = lookup( LifecyclePluginAnalyzerImpl.class );
+        lifeCyclePluginAnalyzer = lookup( LifeCyclePluginAnalyzer.class );
         lifeCycleTaskSegmentCalculator = lookup( LifecycleTaskSegmentCalculator.class );
         lookup( ExceptionHandler.class );
     }