You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/04/20 18:42:30 UTC

[maven] 06/06: Support --also-make flag in combination with --resume-from.

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

rfscholte pushed a commit to branch MNG-6863
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 62d161c1345e59b68194a85eb95344938c2b05a4
Author: Martin Kanters <Ma...@infosupport.com>
AuthorDate: Wed Apr 15 16:37:23 2020 +0200

    Support --also-make flag in combination with --resume-from.
    
    Review point: Fix name of the method that resolves and includes also-make modules transitively.
---
 .../src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index 07a4cf0..99f0266 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -180,7 +180,7 @@ public class DefaultGraphBuilder
 
             result.addAll( selectedProjects );
 
-            result = includeAlsoMakeTransitives( result, request, graph );
+            result = includeAlsoMakeTransitively( result, request, graph );
         }
 
         return result;
@@ -225,7 +225,7 @@ public class DefaultGraphBuilder
                         + " vs " + formatProjects( projects ), request.getPom() );
             }
 
-            result = includeAlsoMakeTransitives( result, request, graph );
+            result = includeAlsoMakeTransitively( result, request, graph );
         }
 
         return result;
@@ -284,8 +284,8 @@ public class DefaultGraphBuilder
         return result;
     }
 
-    private List<MavenProject> includeAlsoMakeTransitives( List<MavenProject> projects, MavenExecutionRequest request,
-                                                           ProjectDependencyGraph graph )
+    private List<MavenProject> includeAlsoMakeTransitively( List<MavenProject> projects, MavenExecutionRequest request,
+                                                            ProjectDependencyGraph graph )
             throws MavenExecutionException
     {
         List<MavenProject> result;