Author: jdcasey
Date: Thu Aug 10 15:43:48 2006
New Revision: 430573
URL: http://svn.apache.org/viewvc?rev=430573&view=rev
Log:
Merging fix for loss of dependency ordering from branch.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=430573&r1=430572&r2=430573&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Thu Aug 10 15:43:48 2006
@@ -58,6 +58,7 @@
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.logging.AbstractLogger;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
@@ -141,14 +142,24 @@
request.setLocalRepository( mavenTools.createLocalRepository(
request.getLocalRepositoryPath() ) );
}
- Logger logger = loggerManager.getLoggerForComponent( Mojo.ROLE );
+ // FIXME: This will not touch the core maven logger, since it's
already been initialized for
+ // this component.
+ loggerManager.setThreshold( request.getLoggingLevel() );
+
+ Logger myLogger = getLogger();
+
+ // TODO: When the above problem is fixed, remove this.
+ if ( myLogger instanceof AbstractLogger )
+ {
+ ((AbstractLogger) myLogger).setThreshold(
request.getLoggingLevel() );
+ }
+
+ Logger mojoLogger = loggerManager.getLoggerForComponent( Mojo.ROLE );
if ( request.isDefaultEventMonitorActive() )
{
- request.addEventMonitor( new DefaultEventMonitor( logger ) );
+ request.addEventMonitor( new DefaultEventMonitor( mojoLogger ) );
}
-
- loggerManager.setThreshold( request.getLoggingLevel() );
request.setStartTime( new Date() );
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=430573&r1=430572&r2=430573&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Thu Aug 10 15:43:48 2006
@@ -566,6 +566,7 @@
}
embedder = new Embedder();
+
if ( logger != null )
{
embedder.setLoggerManager( new MavenEmbedderLoggerManager( new
PlexusLoggerAdapter( logger ) ) );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=430573&r1=430572&r2=430573&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Thu Aug 10 15:43:48 2006
@@ -50,6 +50,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -302,7 +303,7 @@
ArtifactFilter dependencyFilter,
MavenProject project )
throws InvalidDependencyVersionException
{
- Set projectArtifacts = new HashSet( dependencies.size() );
+ Set projectArtifacts = new LinkedHashSet( dependencies.size() );
for ( Iterator i = dependencies.iterator(); i.hasNext(); )
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=430573&r1=430572&r2=430573&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Thu Aug 10 15:43:48 2006
@@ -32,6 +32,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -243,7 +244,7 @@
private void assembleDependencyInheritance( Model child, Model parent )
{
- Map depsMap = new HashMap();
+ Map depsMap = new LinkedHashMap();
List deps = parent.getDependencies();
