jvanzyl 2002/11/13 16:07:30
Modified: src/java/org/apache/maven/jelly/tags/project MavenTag.java
Log:
o Always use getProject(file,dir) to ensure that the <maven/> tag works
with project that inherit from a parent POM.
Revision Changes Path
1.10 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java
Index: MavenTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MavenTag.java 12 Nov 2002 04:04:37 -0000 1.9
+++ MavenTag.java 14 Nov 2002 00:07:30 -0000 1.10
@@ -121,7 +121,7 @@
{
return;
}
-
+
e.fillInStackTrace();
throw e;
@@ -141,7 +141,7 @@
Maven maven = new Maven();
maven.setMavenHome(parent.getMavenHome());
maven.setDir(getBasedir());
- maven.setProject(MavenUtils.getProject(getDescriptor()));
+ maven.setProject(MavenUtils.getProject(getDescriptor(), getBasedir()));
maven.setXMLOutput(output, parent.isDebug());
if (this.goals != null)
--
To unsubscribe, e-mail: <mailto:turbine-maven-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-maven-dev-help@;jakarta.apache.org>
