Make sure external profiles are applied to the superPom before it's used as a basis for inheritance in the project builder. Also, adding some debug statements to the lineage-building process.

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

maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java

@@ -92,6 +92,11 @@ public class DefaultProfileAdvisor
                                                 ProfileManager externalProfileManager )
         throws ProjectBuildingException
     {
+        if ( externalProfileManager == null )
+        {
+            return Collections.EMPTY_LIST;
+        }
+
         logger.debug( "Building profile manager for model: " + model.getId()
                       + " with external profile manager including profiles: "
                       + externalProfileManager.getProfilesById() );

maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

@@ -603,7 +603,20 @@ public class DefaultMavenProjectBuilder
             profileActivationContext = new DefaultProfileActivationContext( System.getProperties(), false );
         }
 
-        superProject.setActiveProfiles( profileAdvisor.applyActivatedProfiles( superModel, projectDescriptor, explicitlyActive, explicitlyInactive, validProfilesXmlLocation, profileActivationContext ) );
+        LinkedHashSet activeInSuperPom = new LinkedHashSet();
+        List activated = profileAdvisor.applyActivatedExternalProfiles( superModel, projectDescriptor, externalProfileManager );
+        if ( !activated.isEmpty() )
+        {
+            activeInSuperPom.addAll( activated );
+        }
+
+        activated = profileAdvisor.applyActivatedProfiles( superModel, projectDescriptor, explicitlyActive, explicitlyInactive, validProfilesXmlLocation, profileActivationContext );
+        if ( !activated.isEmpty() )
+        {
+            activeInSuperPom.addAll( activated );
+        }
+
+        superProject.setActiveProfiles( activated );
 
         //noinspection CollectionDeclaredAsConcreteClass
         LinkedList lineage = new LinkedList();

maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java

@@ -278,6 +278,8 @@ public class DefaultModelLineageBuilder
                                                 boolean useProfilesXml )
         throws ProjectBuildingException
     {
+        getLogger().debug( "Grabbing profile-injected repositories for: " + model.getId() );
+
         List explicitlyActive;
         List explicitlyInactive;
 
@@ -301,12 +303,18 @@ public class DefaultModelLineageBuilder
                                                                                                pomFile,
                                                                                                model.getId() );
 
-        profileRepos.addAll( profileAdvisor.getArtifactRepositoriesFromActiveProfiles( model,
+        getLogger().debug( "Got external-profile repositories: " + profileRepos );
+
+        LinkedHashSet pomProfileRepos = profileAdvisor.getArtifactRepositoriesFromActiveProfiles( model,
                                                                                        pomFile,
                                                                                        explicitlyActive,
                                                                                        explicitlyInactive,
                                                                                        useProfilesXml,
-                                                                                       context ) );
+                                                                                       context );
+
+        getLogger().debug( "Got pom-profile repositories: " + pomProfileRepos );
+
+        profileRepos.addAll( pomProfileRepos );
 
         if ( !profileRepos.isEmpty() )
         {
@@ -350,6 +358,8 @@ public class DefaultModelLineageBuilder
             {
                 try
                 {
+                    getLogger().debug( "Attempting to resolve parent POM: " + modelParent.getId() + " using repositories:\n" + StringUtils.join( remoteRepositories.iterator(), "\n" ) );
+
                     parentPomFile = resolveParentFromRepositories( modelParent,
                                                                    localRepository,
                                                                    remoteRepositories,

maven-project/src/test/java/org/apache/maven/project/build/model/DefaultModelLineageBuilderTest.java

@@ -387,7 +387,7 @@ public class DefaultModelLineageBuilderTest
         assertEquals( parent.getId(), ( (Model) modelIterator.next() ).getId() );
     }
 
-    public void testReadPOMWithParentInRepoBroughtInViaSettingsProfile()
+    public void testReadPOMWithParentInRepoBroughtInViaExternalProfile()
         throws Exception
     {
         // 1. create project-root directory.