jvanzyl 2002/12/12 03:03:27
Modified: src/java/org/apache/maven/plugin PluginManager.java
Log:
o Applying patch by Alexei Barantsev <[EMAIL PROTECTED]>
which once again allows the overriding of goals in maven.xml.
Revision Changes Path
1.19 +10 -10
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PluginManager.java 10 Dec 2002 02:44:53 -0000 1.18
+++ PluginManager.java 12 Dec 2002 11:03:27 -0000 1.19
@@ -552,11 +552,6 @@
{
Goal eachGoal = (Goal) i.next();
- if ( isGoalCached( eachGoal.getName() ) )
- {
- continue;
- }
-
if ( eachGoal.getAction() == null )
{
continue;
@@ -646,13 +641,18 @@
seen.add( eachGoal );
- pluginName = this.pluginsCache.getProperty( eachGoal );
+ String spec = this.transientGoalsCache.getProperty( eachGoal );
- if ( pluginName != null )
+ if ( spec == null )
{
- loadPlugin( pluginName );
+ pluginName = this.pluginsCache.getProperty( eachGoal );
- prepForCallbacks( eachGoal );
+ if ( pluginName != null )
+ {
+ loadPlugin( pluginName );
+
+ prepForCallbacks( eachGoal );
+ }
}
List prereqs = getPrereqs( eachGoal );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
