You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/05/05 11:49:08 UTC
svn commit: r941224 - in /maven/maven-3/trunk/maven-core/src:
main/java/org/apache/maven/lifecycle/internal/
test/java/org/apache/maven/lifecycle/
Author: bentmann
Date: Wed May 5 09:49:08 2010
New Revision: 941224
URL: http://svn.apache.org/viewvc?rev=941224&view=rev
Log:
[MNG-4664] Minor patches needed to run Maven3 with the replacement Guice-Plexus container
Submitted by: Stuart McCulloch
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java?rev=941224&r1=941223&r2=941224&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLogger.java Wed May 5 09:49:08 2010
@@ -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" );
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java?rev=941224&r1=941223&r2=941224&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginAnalyzerImpl.java Wed May 5 09:49:08 2010
@@ -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
{
Modified: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java?rev=941224&r1=941223&r2=941224&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java (original)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java Wed May 5 09:49:08 2010
@@ -21,7 +21,6 @@ import org.apache.maven.exception.Except
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 LifecycleExecutorSubModules
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 );
}