You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2013/03/18 22:47:27 UTC
[39/50] git commit: Followed change to DependencyNode.getPremanaged*()
Followed change to DependencyNode.getPremanaged*()
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4fdcdbd2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4fdcdbd2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4fdcdbd2
Branch: refs/heads/master
Commit: 4fdcdbd26244ff81e242054fd38cf415d92499be
Parents: b5e0532
Author: Benjamin Bentmann <be...@apache.org>
Authored: Sun Feb 10 19:11:11 2013 +0100
Committer: Benjamin Bentmann <be...@apache.org>
Committed: Sun Feb 10 19:11:11 2013 +0100
----------------------------------------------------------------------
.../DefaultPluginDependenciesResolver.java | 10 -------
.../DefaultProjectDependenciesResolver.java | 20 ++++++++++++---
2 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4fdcdbd2/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index c4b5fee..8153aed 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -228,16 +228,6 @@ public class DefaultPluginDependenciesResolver
buffer.append( art );
buffer.append( ':' ).append( dep.getScope() );
-
- if ( node.getPremanagedScope() != null && !node.getPremanagedScope().equals( dep.getScope() ) )
- {
- buffer.append( " (scope managed from " ).append( node.getPremanagedScope() ).append( ")" );
- }
-
- if ( node.getPremanagedVersion() != null && !node.getPremanagedVersion().equals( art.getVersion() ) )
- {
- buffer.append( " (version managed from " ).append( node.getPremanagedVersion() ).append( ")" );
- }
}
logger.debug( buffer.toString() );
http://git-wip-us.apache.org/repos/asf/maven/blob/4fdcdbd2/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index 47f510b..2a6be6d 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -34,6 +34,7 @@ import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RequestTrace;
@@ -49,6 +50,7 @@ import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.resolution.DependencyRequest;
import org.eclipse.aether.util.artifact.ArtifactIdUtils;
import org.eclipse.aether.util.artifact.JavaScopes;
+import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
/**
* @author Benjamin Bentmann
@@ -73,11 +75,19 @@ public class DefaultProjectDependenciesResolver
MavenProject project = request.getMavenProject();
RepositorySystemSession session = request.getRepositorySession();
+ if ( logger.isDebugEnabled()
+ && session.getConfigProperties().get( DependencyManagerUtils.CONFIG_PROP_VERBOSE ) == null )
+ {
+ DefaultRepositorySystemSession verbose = new DefaultRepositorySystemSession( session );
+ verbose.setConfigProperty( DependencyManagerUtils.CONFIG_PROP_VERBOSE, Boolean.TRUE );
+ session = verbose;
+ }
DependencyFilter filter = request.getResolutionFilter();
ArtifactTypeRegistry stereotypes = session.getArtifactTypeRegistry();
CollectRequest collect = new CollectRequest();
+ collect.setRootArtifact( RepositoryUtils.toArtifact( project.getArtifact() ) );
collect.setRequestContext( "project" );
collect.setRepositories( project.getRemoteProjectRepositories() );
@@ -235,16 +245,18 @@ public class DefaultProjectDependenciesResolver
buffer.append( art );
buffer.append( ':' ).append( dep.getScope() );
- if ( node.getPremanagedScope() != null && !node.getPremanagedScope().equals( dep.getScope() ) )
+ String premanagedScope = DependencyManagerUtils.getPremanagedScope( node );
+ if ( premanagedScope != null && !premanagedScope.equals( dep.getScope() ) )
{
- buffer.append( " (scope managed from " ).append( node.getPremanagedScope() );
+ buffer.append( " (scope managed from " ).append( premanagedScope );
appendManagementSource( buffer, art, "scope" );
buffer.append( ")" );
}
- if ( node.getPremanagedVersion() != null && !node.getPremanagedVersion().equals( art.getVersion() ) )
+ String premanagedVersion = DependencyManagerUtils.getPremanagedVersion( node );
+ if ( premanagedVersion != null && !premanagedVersion.equals( art.getVersion() ) )
{
- buffer.append( " (version managed from " ).append( node.getPremanagedVersion() );
+ buffer.append( " (version managed from " ).append( premanagedVersion );
appendManagementSource( buffer, art, "version" );
buffer.append( ")" );
}