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

o Fixed prerequisite processing 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@756962 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-03-21 16:07:44 +00:00
parent 1229d17047
commit 16fa8c1dbd
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,12 +171,13 @@ public class ProcessorContext
}
List<Processor> processors =
Arrays.<Processor> asList( new BuildProcessor( new ArrayList<Processor>() ),
new ModuleProcessor(), new PropertiesProcessor(), new ParentProcessor(),
new OrganizationProcessor(), new MailingListProcessor(), new IssueManagementProcessor(),
new CiManagementProcessor(), new ReportingProcessor(), new RepositoriesProcessor(),
new DistributionManagementProcessor(), new LicensesProcessor(), new ScmProcessor());
Model target = processModelsForInheritance(convertDomainModelsToMavenModels(domainModels), processors, true);
Arrays.<Processor> asList( new BuildProcessor( new ArrayList<Processor>() ), new ModuleProcessor(),
new PropertiesProcessor(), new ParentProcessor(), new OrganizationProcessor(),
new MailingListProcessor(), new IssueManagementProcessor(),
new CiManagementProcessor(), new ReportingProcessor(),
new RepositoriesProcessor(), new DistributionManagementProcessor(),
new LicensesProcessor(), new ScmProcessor(), new PrerequisitesProcessor() );
Model target = processModelsForInheritance( convertDomainModelsToMavenModels( domainModels ), processors, true );
PomClassicDomainModel model = convertToDomainModel( target, false );
interpolateModelProperties( model.getModelProperties(), interpolationProperties, child );

2
maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
View File

@ -1006,9 +1006,7 @@ public class PomConstructionTest
assertEquals( 1, ( (List<?>) pom.getValue( "mailingLists[1]/otherArchives" ) ).size() );
assertEquals( "other-archive", pom.getValue( "mailingLists[1]/otherArchives[1]" ) );
/* FIXME
assertEquals( "2.0.1", pom.getValue( "prerequisites/maven" ) );
//*/
assertEquals( "http://project.url/trunk", pom.getValue( "scm/url" ) );
assertEquals( "http://project.url/scm", pom.getValue( "scm/connection" ) );