From 16fa8c1dbd412607109ebec2c4b1fa8e3a7f498f Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sat, 21 Mar 2009 16:07:44 +0000 Subject: [PATCH] o Fixed prerequisite processing git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@756962 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/project/processor/ProcessorContext.java | 13 +++++++------ .../apache/maven/project/PomConstructionTest.java | 2 -- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java b/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java index c4b60d8205..fd8d362329 100644 --- a/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java +++ b/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java @@ -171,12 +171,13 @@ public class ProcessorContext } List processors = - Arrays. asList( new BuildProcessor( new ArrayList() ), - 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. asList( new BuildProcessor( new ArrayList() ), 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 ); diff --git a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java index 87e96b0067..38c583a2d5 100644 --- a/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -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" ) );