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

Fix: MNG-3822 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@722374 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2008-12-02 05:03:30 +00:00
parent 35ba672d64
commit 3a61ccdc8e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
View File

@ -157,7 +157,8 @@ public interface ProjectBuilder
{ {
if( mp.getValue() != null && !mp.getUri().contains( "#property" ) && !mp.getUri().contains( "#collection" )) 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); firstPassModelProperties.add(mp);
} }
@ -212,7 +213,7 @@ public interface ProjectBuilder
Map<ModelProperty, ModelProperty> buildDirectories = new HashMap<ModelProperty, ModelProperty>(); Map<ModelProperty, ModelProperty> buildDirectories = new HashMap<ModelProperty, ModelProperty>();
for(ModelProperty mp : secondPassModelProperties) 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()); File file = new File(mp.getResolvedValue());
if( !file.isAbsolute() ) if( !file.isAbsolute() )