From 3a61ccdc8ef213053aeef22773907326e075207a Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Tue, 2 Dec 2008 05:03:30 +0000 Subject: [PATCH] Fix: MNG-3822 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@722374 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/project/builder/ProjectBuilder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java index ef655ce456..b49f8521a1 100644 --- a/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java +++ b/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java @@ -157,7 +157,8 @@ public interface ProjectBuilder { if( mp.getValue() != null && !mp.getUri().contains( "#property" ) && !mp.getUri().contains( "#collection" )) { - if( !buildProperty.isParentOf( mp ) || mp.getUri().equals(ProjectUri.Build.finalName ) ) + if( (!buildProperty.isParentOf( mp ) && !mp.getUri().equals(ProjectUri.Reporting.outputDirectory) + || mp.getUri().equals(ProjectUri.Build.finalName ) )) { firstPassModelProperties.add(mp); } @@ -212,7 +213,7 @@ public interface ProjectBuilder Map buildDirectories = new HashMap(); for(ModelProperty mp : secondPassModelProperties) { - if(mp.getUri().equals( ProjectUri.Build.directory )) + if(mp.getUri().startsWith( ProjectUri.Build.xUri ) || mp.getUri().equals( ProjectUri.Reporting.outputDirectory )) { File file = new File(mp.getResolvedValue()); if( !file.isAbsolute() )