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

o Added missing processors 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757927 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-03-24 18:02:05 +00:00
parent f5c0ef6ecc
commit 60f3a9b0cb
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,20 +337,11 @@ public class DefaultMavenProjectBuilder
try
{
// TODO: Review why this blows up the tests when we inject all the profiles in one go
for ( Iterator<Profile> it = projectProfiles.iterator(); it.hasNext(); )
{
Profile profile = it.next();
PomClassicDomainModel dm =
ProcessorContext.mergeProfilesIntoModel( Arrays.asList( profile ), model, false );
if ( !it.hasNext() )
{
ProcessorContext.interpolateModelProperties( dm.getModelProperties(),
new ArrayList<InterpolatorProperty>(), dm );
dm = new PomClassicDomainModel( dm.getModelProperties(), false );
}
model = dm.getModel();
}
PomClassicDomainModel dm = ProcessorContext.mergeProfilesIntoModel( projectProfiles, model, false );
ProcessorContext.interpolateModelProperties( dm.getModelProperties(),
new ArrayList<InterpolatorProperty>(), dm );
dm = new PomClassicDomainModel( dm.getModelProperties(), false );
model = dm.getModel();
}
catch ( IOException e )
{

13
maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
View File

@ -82,11 +82,14 @@ public class ProcessorContext
Collections.reverse( profileModels );
profileModels.add( 0, model );
List<Processor> processors =
Arrays.asList( (Processor) new BuildProcessor( new ArrayList<Processor>() ),
(Processor) new ProfilesModuleProcessor(), new ProfilePropertiesProcessor(), new ParentProcessor(),
new OrganizationProcessor(), new MailingListProcessor(), new IssueManagementProcessor(),
new CiManagementProcessor(), new ReportingProcessor(), new RepositoriesProcessor(),
new DistributionManagementProcessor());
Arrays.<Processor> asList( new BuildProcessor( new ArrayList<Processor>() ), new ProfilesModuleProcessor(),
new ProfilePropertiesProcessor(), new ParentProcessor(),
new OrganizationProcessor(), new MailingListProcessor(),
new IssueManagementProcessor(), new CiManagementProcessor(),
new ReportingProcessor(), new RepositoriesProcessor(),
new DistributionManagementProcessor(), new LicensesProcessor(),
new ScmProcessor(), new PrerequisitesProcessor(), new ContributorsProcessor(),
new DevelopersProcessor() );
Model target = processModelsForInheritance(profileModels, processors, false);