Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
John Dennis Casey 2007-12-05 00:03:55 +00:00
parent 3488401f83
commit 589db485fd
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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() );

15
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -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();

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

@ -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,

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

@ -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.