brett 2004/02/26 08:11:26
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
process parent maven.xml even if project doesn't specify one
Revision Changes Path
No revision
No revision
1.70.4.19 +9 -7 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.18
retrieving revision 1.70.4.19
diff -u -r1.70.4.18 -r1.70.4.19
--- PluginManager.java 19 Feb 2004 23:31:20 -0000 1.70.4.18
+++ PluginManager.java 26 Feb 2004 16:11:26 -0000 1.70.4.19
@@ -502,14 +502,16 @@
Project p = project;
// Project's Jelly script
- while ( p != null && p.hasMavenXml() )
+ while ( p != null )
{
- File mavenXml = p.getMavenXml();
-
- JellyScriptHousing jellyScriptHousing = createJellyScriptHousing( p,
mavenXml );
- jellyScriptHousing.parse( transientMapper );
- projectHousings.add( jellyScriptHousing );
+ if ( p.hasMavenXml() )
+ {
+ File mavenXml = p.getMavenXml();
+ JellyScriptHousing jellyScriptHousing = createJellyScriptHousing(
p, mavenXml );
+ jellyScriptHousing.parse( transientMapper );
+ projectHousings.add( jellyScriptHousing );
+ }
p = p.getParent();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
