maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r726343 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/Interpolator.java
Date Sun, 14 Dec 2008 03:12:09 GMT
Author: sisbell
Date: Sat Dec 13 19:12:08 2008
New Revision: 726343

URL: http://svn.apache.org/viewvc?rev=726343&view=rev
Log:
If build property starts with project.basedir, don't 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=726343&r1=726342&r2=726343&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 19:12:08 2008
@@ -177,7 +177,8 @@
                 if(mp.getUri().startsWith( ProjectUri.Build.xUri ) || mp.getUri().equals(
ProjectUri.Reporting.outputDirectory ))
                 {
                     File file = new File(mp.getResolvedValue());
-                    if( !file.isAbsolute() && !mp.getResolvedValue().startsWith("${project.build."))
+                    if( !file.isAbsolute() && !mp.getResolvedValue().startsWith("${project.build.")
+                            && !mp.getResolvedValue().equals("${project.basedir}"))
                     {
                         buildDirectories.put(mp, new ModelProperty(mp.getUri(), new File(basedir,
file.getPath()).getAbsolutePath()));
                     }



Mime
View raw message