jvanzyl 2003/01/13 11:28:48
Modified: src/java/org/apache/maven/jelly/tags/maven ReactorTag.java
src/java/org/apache/maven/plugin PluginManager.java
Log:
o The maven.xml inheritance now works as a general feature and not just
specific to the reactor.
Revision Changes Path
1.11 +2 -10
jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
Index: ReactorTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ReactorTag.java 13 Jan 2003 19:13:19 -0000 1.10
+++ ReactorTag.java 13 Jan 2003 19:28:48 -0000 1.11
@@ -338,14 +338,6 @@
project.setGoalNames( getGoals() );
}
- // If this project has a parent then we will load it's maven.xml
- // file into this project so any goals the parent specifies in
- // its maven.xml file are available to the child.
- if ( project.hasParent() )
- {
- project.loadJellyScript( project.parentMavenXml() );
- }
-
// If an additional Jelly script has been specified load it as well.
if ( getReactorXml() != null )
{
1.33 +9 -1
jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- PluginManager.java 13 Jan 2003 18:51:35 -0000 1.32
+++ PluginManager.java 13 Jan 2003 19:28:48 -0000 1.33
@@ -334,6 +334,14 @@
loadJellyScript( mavenXmlFile, project );
}
+ // If this project has a parent then we will load it's maven.xml
+ // file into this project so any goals the parent specifies in
+ // its maven.xml file are available to the child.
+ if ( project.hasParent() )
+ {
+ project.loadJellyScript( project.parentMavenXml() );
+ }
+
// There will always be at least one goal present which is the build:start
// goal. If this is the only goal present then we want to add either the
// default goal specified in the project.xml file, or the default goal
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
