brett 2004/03/21 18:25:05
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
move processDependencies until after driver is executed for compatibility with
RC1 and above.
Revision Changes Path
No revision
No revision
1.70.4.25 +10 -6 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.24
retrieving revision 1.70.4.25
diff -u -r1.70.4.24 -r1.70.4.25
--- PluginManager.java 10 Mar 2004 11:18:08 -0000 1.70.4.24
+++ PluginManager.java 22 Mar 2004 02:25:04 -0000 1.70.4.25
@@ -408,7 +408,6 @@
// FIXME: From attainGoals angle, how does it know the project needs to
// to be verified, or that the project object hasn't been used before
project.verifyDependencies();
- processDependencies( project );
AntProjectBuilder.build( project, baseContext );
@@ -450,7 +449,6 @@
driver = getClass().getResourceAsStream( "/driver.jelly" );
driverHousing.parse( transientMapper, driver );
driver.close();
- projectHousings.add( driverHousing );
Project p = project;
@@ -475,7 +473,7 @@
if ( defaultGoalName != null )
{
- log.debug( "Using defailt goal: " + defaultGoalName );
+ log.debug( "Using default goal: " + defaultGoalName );
goals.add( defaultGoalName );
}
}
@@ -504,10 +502,16 @@
try
{
+ runScript( driverHousing, baseContext );
+ transientMapper.addResolvedPlugins( Collections.singletonList(
driverHousing ));
+
+ // Dependencies must be processed after the driver is run for
compatibility
+ processDependencies( project );
+
for ( Iterator j = projectHousings.iterator(); j.hasNext(); )
{
JellyScriptHousing housing = ( JellyScriptHousing ) j.next();
- this.runScript(housing, baseContext);
+ runScript( housing, baseContext );
}
transientMapper.addResolvedPlugins( projectHousings );
@@ -582,7 +586,7 @@
pluginContext.setVariable( "plugin.dir", pluginDirectory );
pluginContext.setVariable( "plugin.resources", new File(
pluginDirectory, "plugin-resources" ) );
- this.runScript( housing, pluginContext );
+ runScript( housing, pluginContext );
}
return pluginSet;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
