[maven-dependency-tree] 02/02: [MSHARED-816] Annotate DependencyNodes with dependency management metadata

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MSHARED-816
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git

commit ae03c028c1ca7857e0992db0825922406af4bec7
Author: Richard Atkins <richatk...@atlassian.com>
AuthorDate: Sat May 22 16:53:53 2021 +0200

    [MSHARED-816] Annotate DependencyNodes with dependency management metadata
    
    Signed-off-by: rfscholte <rfscho...@apache.org>
---
 .../internal/Maven31DependencyGraphBuilder.java     | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
 
b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
index c1f9ab4..532a507 100644
--- 
a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
+++ 
b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
@@ -19,6 +19,8 @@ package org.apache.maven.shared.dependency.graph.internal;
  * under the License.
  */
 
+import static 
org.eclipse.aether.util.graph.manager.DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -42,9 +44,11 @@ import 
org.apache.maven.shared.dependency.graph.DependencyNode;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.graph.Dependency;
 import org.eclipse.aether.graph.Exclusion;
+import org.eclipse.aether.util.graph.manager.DependencyManagerUtils;
 import org.eclipse.aether.version.VersionConstraint;
 
 /**
@@ -111,12 +115,13 @@ public class Maven31DependencyGraphBuilder
         RepositorySystemSession session =
             (RepositorySystemSession) Invoker.invoke( buildingRequest, 
"getRepositorySession", exceptionHandler );
 
-        /*
-         * if ( Boolean.TRUE != ( (Boolean) session.getConfigProperties().get(
-         * DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION ) ) ) { 
DefaultRepositorySystemSession newSession = new
-         * DefaultRepositorySystemSession( session ); 
newSession.setConfigProperty(
-         * DependencyManagerUtils.NODE_DATA_PREMANAGED_VERSION, true ); 
session = newSession; }
-         */
+        
+        if ( Boolean.TRUE != ( (Boolean) session.getConfigProperties().get( 
NODE_DATA_PREMANAGED_VERSION ) ) )
+        {
+            DefaultRepositorySystemSession newSession = new 
DefaultRepositorySystemSession( session );
+            newSession.setConfigProperty( NODE_DATA_PREMANAGED_VERSION, true );
+            session = newSession;
+        }         
 
         final DependencyResolutionRequest request = new 
DefaultDependencyResolutionRequest();
         request.setMavenProject( project );
@@ -220,8 +225,8 @@ public class Maven31DependencyGraphBuilder
     private DependencyNode buildDependencyNode( DependencyNode parent, 
org.eclipse.aether.graph.DependencyNode node,
                                                 Artifact artifact, 
ArtifactFilter filter )
     {
-        String premanagedVersion = null; // 
DependencyManagerUtils.getPremanagedVersion( node );
-        String premanagedScope = null; // 
DependencyManagerUtils.getPremanagedScope( node );
+        String premanagedVersion = 
DependencyManagerUtils.getPremanagedVersion( node );
+        String premanagedScope = DependencyManagerUtils.getPremanagedScope( 
node );
 
         List<org.apache.maven.model.Exclusion> exclusions = null;
         Boolean optional = null;