[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6183 [deleted] da03d6b03
maven git commit: [MNG-6183] Dependency management debug message corrections.
Repository: maven
Updated Branches:
refs/heads/master 51cc76c32 -> da03d6b03
[MNG-6183] Dependency management debug message corrections.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/da03d6b0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da03d6b0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da03d6b0
Branch: refs/heads/master
Commit: da03d6b03192399237750c15f96fa021977dd83b
Parents: 51cc76c
Author: Christian Schulte
Authored: Tue Mar 14 19:20:47 2017 +0100
Committer: Christian Schulte
Committed: Tue Mar 14 19:20:47 2017 +0100
--
.../DefaultProjectDependenciesResolver.java | 83
1 file changed, 31 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/da03d6b0/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 21dfaa2..5a803af 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
@@ -29,8 +29,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.InputLocation;
-import org.apache.maven.model.InputSource;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
@@ -39,7 +37,6 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.artifact.ArtifactProperties;
import org.eclipse.aether.artifact.ArtifactType;
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
import org.eclipse.aether.collection.CollectRequest;
@@ -239,8 +236,6 @@ public class DefaultProjectDependenciesResolver
private String indent = "";
-private Map managed;
-
public GraphLogger( MavenProject project )
{
this.project = project;
@@ -258,29 +253,48 @@ public class DefaultProjectDependenciesResolver
buffer.append( art );
buffer.append( ':' ).append( dep.getScope() );
-String premanagedScope =
DependencyManagerUtils.getPremanagedScope( node );
-if ( premanagedScope != null && !premanagedScope.equals(
dep.getScope() ) )
+// TODO We currently cannot tell which
section contained the management
+// information. When resolver 1.1 provides this
information, these log messages should be updated
+// to contain it.
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_SCOPE )
== DependencyNode.MANAGED_SCOPE )
{
-buffer.append( " (scope managed from " ).append(
premanagedScope );
-appendManagementSource( buffer, art, "scope" );
+final String premanagedScope =
DependencyManagerUtils.getPremanagedScope( node );
+buffer.append( " (scope managed from " );
+buffer.append( StringUtils.defaultString( premanagedScope,
"default" ) );
buffer.append( ')' );
}
-String premanagedVersion =
DependencyManagerUtils.getPremanagedVersion( node );
-if ( premanagedVersion != null && !premanagedVersion.equals(
art.getVersion() ) )
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_VERSION
) == DependencyNode.MANAGED_VERSION )
{
-buffer.append( " (version managed from " ).append(
premanagedVersion );
-appendManagementSource( buffer, art, "version" );
+final String premanagedVersion =
DependencyManagerUtils.getPremanagedVersion( node );
+buffer.append( " (version managed from " );
+buffer.append( StringUtils.defaultString(
premanagedVersion, "default" ) );
buffer.append( ')' );
}
-Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
-if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+if ( ( node.getManagedBits() & D
maven git commit: [MNG-6183] Dependency management debug message corrections.
Repository: maven
Updated Branches:
refs/heads/MNG-6183 [created] da03d6b03
[MNG-6183] Dependency management debug message corrections.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/da03d6b0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da03d6b0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da03d6b0
Branch: refs/heads/MNG-6183
Commit: da03d6b03192399237750c15f96fa021977dd83b
Parents: 51cc76c
Author: Christian Schulte
Authored: Tue Mar 14 19:20:47 2017 +0100
Committer: Christian Schulte
Committed: Tue Mar 14 19:20:47 2017 +0100
--
.../DefaultProjectDependenciesResolver.java | 83
1 file changed, 31 insertions(+), 52 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/maven/blob/da03d6b0/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 21dfaa2..5a803af 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
@@ -29,8 +29,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
-import org.apache.maven.model.InputLocation;
-import org.apache.maven.model.InputSource;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
@@ -39,7 +37,6 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RequestTrace;
-import org.eclipse.aether.artifact.ArtifactProperties;
import org.eclipse.aether.artifact.ArtifactType;
import org.eclipse.aether.artifact.ArtifactTypeRegistry;
import org.eclipse.aether.collection.CollectRequest;
@@ -239,8 +236,6 @@ public class DefaultProjectDependenciesResolver
private String indent = "";
-private Map managed;
-
public GraphLogger( MavenProject project )
{
this.project = project;
@@ -258,29 +253,48 @@ public class DefaultProjectDependenciesResolver
buffer.append( art );
buffer.append( ':' ).append( dep.getScope() );
-String premanagedScope =
DependencyManagerUtils.getPremanagedScope( node );
-if ( premanagedScope != null && !premanagedScope.equals(
dep.getScope() ) )
+// TODO We currently cannot tell which
section contained the management
+// information. When resolver 1.1 provides this
information, these log messages should be updated
+// to contain it.
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_SCOPE )
== DependencyNode.MANAGED_SCOPE )
{
-buffer.append( " (scope managed from " ).append(
premanagedScope );
-appendManagementSource( buffer, art, "scope" );
+final String premanagedScope =
DependencyManagerUtils.getPremanagedScope( node );
+buffer.append( " (scope managed from " );
+buffer.append( StringUtils.defaultString( premanagedScope,
"default" ) );
buffer.append( ')' );
}
-String premanagedVersion =
DependencyManagerUtils.getPremanagedVersion( node );
-if ( premanagedVersion != null && !premanagedVersion.equals(
art.getVersion() ) )
+if ( ( node.getManagedBits() & DependencyNode.MANAGED_VERSION
) == DependencyNode.MANAGED_VERSION )
{
-buffer.append( " (version managed from " ).append(
premanagedVersion );
-appendManagementSource( buffer, art, "version" );
+final String premanagedVersion =
DependencyManagerUtils.getPremanagedVersion( node );
+buffer.append( " (version managed from " );
+buffer.append( StringUtils.defaultString(
premanagedVersion, "default" ) );
buffer.append( ')' );
}
-Boolean premanagedOptional =
DependencyManagerUtils.getPremanagedOptional( node );
-if ( premanagedOptional != null && !premanagedOptional.equals(
dep.getOptional() ) )
+if ( ( node.getManagedBits() &
