You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2007/05/30 05:00:41 UTC
svn commit: r542734 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
Author: jdcasey
Date: Tue May 29 20:00:40 2007
New Revision: 542734
URL: http://svn.apache.org/viewvc?view=rev&rev=542734
Log:
Fixing issue with different lifecycles getting in the way of one another, as when `mvn clean install` on a maven-plugin project catches the clean:clean binding from the clean lifecycle, and knocks out the plugin:descriptor binding from the beginning of the default lifecycle.
Plugins can now be built using maven trunk once again.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
maven/components/trunk/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java?view=diff&rev=542734&r1=542733&r2=542734
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java Tue May 29 20:00:40 2007
@@ -155,7 +155,8 @@
List newRendered = new ArrayList( bindingsToAdd );
// if we've already executed part of the lifecycle, just continue with the new bindings.
- if ( ( renderedLifecycleMojos != null ) && ( renderedLifecycleMojos.size() < bindingsToAdd.size() ) )
+ if ( ( renderedLifecycleMojos != null ) && ( renderedLifecycleMojos.size() < bindingsToAdd.size() )
+ && bindingsToAdd.containsAll( renderedLifecycleMojos ) )
{
bindingsToAdd = bindingsToAdd.subList( renderedLifecycleMojos.size(), bindingsToAdd.size() );
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java?view=diff&rev=542734&r1=542733&r2=542734
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java Tue May 29 20:00:40 2007
@@ -71,6 +71,7 @@
throws LifecycleSpecificationException, LifecycleLoaderException
{
List tasks = plan.getTasks();
+
for ( Iterator it = tasks.iterator(); it.hasNext(); )
{
String task = (String) it.next();
Modified: maven/components/trunk/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo?view=diff&rev=542734&r1=542733&r2=542734
==============================================================================
--- maven/components/trunk/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo (original)
+++ maven/components/trunk/maven-lifecycle/src/main/mdo/maven-lifecycle.mdo Tue May 29 20:00:40 2007
@@ -564,6 +564,7 @@
<field>
<name>groupId</name>
<required>true</required>
+ <identifier>true</identifier>
<version>1.0.0</version>
<description>Plugin's groupId.</description>
<type>String</type>
@@ -571,6 +572,7 @@
<field>
<name>artifactId</name>
<required>true</required>
+ <identifier>true</identifier>
<version>1.0.0</version>
<description>Plugin's artifactId.</description>
<type>String</type>
@@ -585,6 +587,7 @@
<field>
<name>goal</name>
<required>true</required>
+ <identifier>true</identifier>
<version>1.0.0</version>
<description>Mojo's goal name.</description>
<type>String</type>
@@ -592,6 +595,7 @@
<field>
<name>executionId</name>
<version>1.0.0</version>
+ <identifier>true</identifier>
<defaultValue>default</defaultValue>
<description>A name for this mojo binding, for purposes of merging configurations via inheritance, etc.</description>
<type>String</type>
@@ -615,6 +619,7 @@
<type>boolean</type>
</field>
</fields>
+<!--
<codeSegments>
<codeSegment>
<version>1.0.0</version>
@@ -627,6 +632,7 @@
]]></code>
</codeSegment>
</codeSegments>
+ -->
</class>
</classes>
</model>