[MNG-4776] NPE during build from parent but not from child

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989222 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java

@@ -484,10 +484,8 @@ public class DefaultLifecycleExecutionPlanCalculator
         LifecyclePhaseNotFoundException, LifecycleNotFoundException, PluginVersionResolutionException
     {
         calculateForkedExecutions( mojoExecution, session, session.getCurrentProject(), new HashSet<MojoDescriptor>() );
-
     }
 
-
     private void calculateForkedExecutions( MojoExecution mojoExecution, MavenSession session, MavenProject project,
                                             Collection<MojoDescriptor> alreadyForkedExecutions )
         throws MojoNotFoundException, PluginNotFoundException, PluginResolutionException,
@@ -511,6 +509,11 @@ public class DefaultLifecycleExecutionPlanCalculator
 
         for ( MavenProject forkedProject : forkedProjects )
         {
+            if ( forkedProject != project )
+            {
+                lifecyclePluginResolver.resolveMissingPluginVersions( forkedProject, session );
+            }
+
             List<MojoExecution> forkedExecutions;
 
             if ( StringUtils.isNotEmpty( mojoDescriptor.getExecutePhase() ) )

maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecyclePluginResolver.java

@@ -60,7 +60,7 @@ public class LifecyclePluginResolver
     public void resolveMissingPluginVersions( MavenProject project, MavenSession session )
         throws PluginVersionResolutionException
     {
-        Map<String, String> versions = new HashMap<String, String>();
+        Map<String, String> versions = new HashMap<String, String>( 64 );
 
         for ( Plugin plugin : project.getBuildPlugins() )
         {

maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java

@@ -42,6 +42,7 @@ import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
+import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.util.ArrayList;
@@ -63,6 +64,10 @@ import java.util.StringTokenizer;
 @Component( role = MojoDescriptorCreator.class )
 public class MojoDescriptorCreator
 {
+
+    @Requirement
+    private Logger logger;
+
     @Requirement
     private PluginVersionResolver pluginVersionResolver;
 
@@ -72,17 +77,22 @@ public class MojoDescriptorCreator
     @Requirement
     private PluginPrefixResolver pluginPrefixResolver;
 
+    @Requirement
+    private LifecyclePluginResolver lifecyclePluginResolver;
+
     @SuppressWarnings( { "UnusedDeclaration" } )
     public MojoDescriptorCreator()
     {
     }
 
     public MojoDescriptorCreator( PluginVersionResolver pluginVersionResolver, BuildPluginManager pluginManager,
-                                  PluginPrefixResolver pluginPrefixResolver )
+                                  PluginPrefixResolver pluginPrefixResolver,
+                                  LifecyclePluginResolver lifecyclePluginResolver )
     {
         this.pluginVersionResolver = pluginVersionResolver;
         this.pluginManager = pluginManager;
         this.pluginPrefixResolver = pluginPrefixResolver;
+        this.lifecyclePluginResolver = lifecyclePluginResolver;
     }
 
     private Plugin findPlugin( String groupId, String artifactId, Collection<Plugin> plugins )
@@ -221,6 +231,19 @@ public class MojoDescriptorCreator
     {
         // [prefix]:[goal]
 
+        if ( session.getCurrentProject() != null )
+        {
+            try
+            {
+                lifecyclePluginResolver.resolveMissingPluginVersions( session.getCurrentProject(), session );
+            }
+            catch ( PluginVersionResolutionException e )
+            {
+                // not critical here
+                logger.debug( e.getMessage(), e );
+            }
+        }
+
         PluginPrefixRequest prefixRequest = new DefaultPluginPrefixRequest( prefix, session );
         PluginPrefixResult prefixResult = pluginPrefixResolver.resolve( prefixRequest );
 

maven-core/src/test/java/org/apache/maven/lifecycle/internal/LifecycleExecutionPlanCalculatorTest.java

@@ -73,6 +73,7 @@ public class LifecycleExecutionPlanCalculatorTest
     public static MojoDescriptorCreator createMojoDescriptorCreator()
     {
         return new MojoDescriptorCreator( new PluginVersionResolverStub(), new BuildPluginManagerStub(),
-                                          new PluginPrefixResolverStub() );
+                                          new PluginPrefixResolverStub(),
+                                          new LifecyclePluginResolver( new PluginVersionResolverStub() ) );
     }
 }