You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/12/14 03:17:02 UTC
svn commit: r726334 -
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/Interpolator.java
Author: sisbell
Date: Sat Dec 13 18:17:02 2008
New Revision: 726334
URL: http://svn.apache.org/viewvc?rev=726334&view=rev
Log:
If build property starts with another build property, don't attempt to resolve absolute path.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/Interpolator.java
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/Interpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/Interpolator.java?rev=726334&r1=726333&r2=726334&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/Interpolator.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/Interpolator.java Sat Dec 13 18:17:02 2008
@@ -177,7 +177,7 @@
if(mp.getUri().startsWith( ProjectUri.Build.xUri ) || mp.getUri().equals( ProjectUri.Reporting.outputDirectory ))
{
File file = new File(mp.getResolvedValue());
- if( !file.isAbsolute() )
+ if( !file.isAbsolute() && !mp.getResolvedValue().startsWith("${project.build."))
{
buildDirectories.put(mp, new ModelProperty(mp.getUri(), new File(basedir, file.getPath()).getAbsolutePath()));
}