svn commit: r756962 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/processor/ProcessorContext.java test/java/org/apache/maven/project/PomConstructionTest.java

[bentmann]

Author: bentmann
Date: Sat Mar 21 16:07:44 2009
New Revision: 756962

URL: http://svn.apache.org/viewvc?rev=756962&view=rev
Log:
o Fixed prerequisite processing

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java?rev=756962&r1=756961&r2=756962&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
 Sat Mar 21 16:07:44 2009
@@ -171,12 +171,13 @@
         }
         
         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 );

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=756962&r1=756961&r2=756962&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
 Sat Mar 21 16:07:44 2009
@@ -1006,9 +1006,7 @@
         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" 
) );