svn commit: r1793586 - in /maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal: Maven31DependencyGraphBuilder.java Maven3DependencyGraphBuilder.java

[michaelo]

Author: michaelo
Date: Tue May  2 20:32:02 2017
New Revision: 1793586

URL: http://svn.apache.org/viewvc?rev=1793586&view=rev
Log:
[MSHARED-437] maven-dependency-tree removes optional flag from managed 
dependencies

Pass down #isOptional() to dependency artifact.

Modified:
    
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
    
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java

Modified: 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java?rev=1793586&r1=1793585&r2=1793586&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
 (original)
+++ 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven31DependencyGraphBuilder.java
 Tue May  2 20:32:02 2017
@@ -92,7 +92,7 @@ public class Maven31DependencyGraphBuild
         throws DependencyGraphBuilderException
     {
         MavenProject project = buildingRequest.getProject();
-        
+
         RepositorySystemSession session =
             (RepositorySystemSession) Invoker.invoke( buildingRequest, 
"getRepositorySession" );
 
@@ -184,14 +184,15 @@ public class Maven31DependencyGraphBuild
     private Artifact getDependencyArtifact( Dependency dep )
     {
         org.eclipse.aether.artifact.Artifact artifact = dep.getArtifact();
-        
+
         try
         {
             Artifact mavenArtifact = (Artifact) Invoker.invoke( 
RepositoryUtils.class, "toArtifact",
                                               
org.eclipse.aether.artifact.Artifact.class, artifact );
-            
+
             mavenArtifact.setScope( dep.getScope() );
-            
+            mavenArtifact.setOptional( dep.isOptional() );
+
             return mavenArtifact;
         }
         catch ( DependencyGraphBuilderException e )

Modified: 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java?rev=1793586&r1=1793585&r2=1793586&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
 (original)
+++ 
maven/shared/trunk/maven-dependency-tree/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
 Tue May  2 20:32:02 2017
@@ -171,10 +171,11 @@ public class Maven3DependencyGraphBuilde
     private Artifact getDependencyArtifact( Dependency dep )
     {
         Artifact mavenArtifact = RepositoryUtils.toArtifact( dep.getArtifact() 
);
-        
+
         mavenArtifact.setScope( dep.getScope() );
-        
-        return mavenArtifact; 
+        mavenArtifact.setOptional( dep.isOptional() );
+
+        return mavenArtifact;
     }
 
     private DependencyNode buildDependencyNode( DependencyNode parent, 
org.sonatype.aether.graph.DependencyNode node,