jvanzyl 2003/12/08 13:22:41
Modified: maven-project/src/java/org/apache/maven/project
DefaultProjectBuilder.java
Log:
o pass on the interpolated model to the child.
Revision Changes Path
1.13 +6 -0
maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultProjectBuilder.java 8 Dec 2003 18:25:27 -0000 1.12
+++ DefaultProjectBuilder.java 8 Dec 2003 21:22:41 -0000 1.13
@@ -129,6 +129,8 @@
}
setupModelInheritance( project.getModel(), parent.getModel() );
+
+ project.setInterpolatedModel( parent.getInterpolatedModel() );
}
project.setProperties( properties );
@@ -287,6 +289,8 @@
child.setReports( parent.getReports() );
}
+ System.out.println( "child.getBuild() = " + child.getBuild() );
+
// Build
if ( child.getBuild() == null )
{
@@ -341,6 +345,8 @@
defaultProperties,
driverProperties
} );
+
+ System.out.println( "descriptorDirectory = " + descriptorDirectory );
// Set the basedir value in the context.
result.put( "basedir", descriptorDirectory.getPath() );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
