You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/05/20 06:25:59 UTC
svn commit: r776540 - in /maven/components/branches/MNG-2766:
maven-compat/src/main/java/org/apache/maven/artifact/resolver/
maven-core/src/main/java/org/apache/maven/lifecycle/
maven-core/src/test/java/org/apache/maven/lifecycle/
Author: jvanzyl
Date: Wed May 20 04:25:59 2009
New Revision: 776540
URL: http://svn.apache.org/viewvc?rev=776540&view=rev
Log:
o clean lifecycle is handled by defaults populator
Modified:
maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
Modified: maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=776540&r1=776539&r2=776540&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/branches/MNG-2766/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Wed May 20 04:25:59 2009
@@ -42,10 +42,8 @@
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.events.TransferListener;
-import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.FileUtils;
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=776540&r1=776539&r2=776540&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Wed May 20 04:25:59 2009
@@ -267,24 +267,6 @@
// on to the given phases in the lifecycle are going to be a little different then, say, a project of type JAR.
//
- Map<String, String> lifecyclePhasesForPackaging;
-
- if ( task.equals( "clean" ) )
- {
- lifecyclePhasesForPackaging = new HashMap<String, String>();
-
- for ( String phase : lifecycle.getDefaultPhases() )
- {
- lifecyclePhasesForPackaging.put( "clean", "org.apache.maven.plugins:maven-clean-plugin:clean" );
- }
- }
- else
- {
- LifecycleMapping lifecycleMappingForPackaging = lifecycleMappings.get( project.getPackaging() );
-
- lifecyclePhasesForPackaging = lifecycleMappingForPackaging.getLifecycles().get( lifecycle.getId() ).getPhases();
- }
-
// 3.
//
// Once we have the lifecycle mapping for the given packaging, we need to know whats phases we need to worry about executing.
@@ -300,7 +282,12 @@
for ( String phase : lifecycle.getPhases() )
{
List<String> mojos = new ArrayList<String>();
-
+
+ if ( phase.equals( "clean" ) )
+ {
+ mojos.add( "org.apache.maven.plugins:maven-clean-plugin:clean" );
+ }
+
// This is just just laying out the initial structure of the mojos to run in each phase of the
// lifecycle. Everything is now done in the project builder correctly so this could likely
// go away shortly. We no longer need to pull out bits from the default lifecycle. The MavenProject
@@ -384,31 +371,6 @@
MojoExecution mojoExecution = getMojoExecution( project, mojoDescriptor );
- /*
- MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
-
- String g = mojoExecution.getMojoDescriptor().getPluginDescriptor().getGroupId();
-
- String a = mojoExecution.getMojoDescriptor().getPluginDescriptor().getArtifactId();
-
- Plugin p = project.getPlugin( g + ":" + a );
-
- for ( PluginExecution e : p.getExecutions() )
- {
- for ( String goal : e.getGoals() )
- {
- if ( mojoDescriptor.getGoal().equals( goal ) )
- {
- Xpp3Dom executionConfiguration = (Xpp3Dom) e.getConfiguration();
-
- Xpp3Dom mojoConfiguration = extractMojoConfiguration( executionConfiguration, mojoDescriptor );
-
- mojoExecution.setConfiguration( mojoConfiguration );
- }
- }
- }
- */
-
lifecyclePlan.add( mojoExecution );
}
}
Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java?rev=776540&r1=776539&r2=776540&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java Wed May 20 04:25:59 2009
@@ -71,7 +71,25 @@
assertEquals( "2.3", mojoExecution.getMojoDescriptor().getPluginDescriptor().getVersion() );
}
- public void testCalculationOfBuildPlanWithIndividualTaskWherePluginIsNotSpecifiedInThePom()
+ public void testCalculationOfBuildPlanWithIndividualTaskOfTheCleanLifecycle()
+ throws Exception
+ {
+ // We are doing something like "mvn clean:clean" where no version is specified but this
+ // project we are working on has the version specified in the POM so the version should come from there.
+ File pom = getProject( "project-with-additional-lifecycle-elements" );
+ MavenSession session = createMavenSession( pom );
+ assertEquals( "project-with-additional-lifecycle-elements", session.getCurrentProject().getArtifactId() );
+ assertEquals( "1.0", session.getCurrentProject().getVersion() );
+ List<MojoExecution> lifecyclePlan = lifecycleExecutor.calculateBuildPlan( "clean", session );
+ assertEquals( 1, lifecyclePlan.size() );
+ MojoExecution mojoExecution = lifecyclePlan.get( 0 );
+ assertNotNull( mojoExecution );
+ assertEquals( "org.apache.maven.plugins", mojoExecution.getMojoDescriptor().getPluginDescriptor().getGroupId() );
+ assertEquals( "maven-clean-plugin", mojoExecution.getMojoDescriptor().getPluginDescriptor().getArtifactId() );
+ assertEquals( "2.2", mojoExecution.getMojoDescriptor().getPluginDescriptor().getVersion() );
+ }
+
+ public void testCalculationOfBuildPlanWithIndividualTaskOfTheCleanCleanGoal()
throws Exception
{
// We are doing something like "mvn clean:clean" where no version is specified but this
@@ -88,7 +106,7 @@
assertEquals( "maven-clean-plugin", mojoExecution.getMojoDescriptor().getPluginDescriptor().getArtifactId() );
assertEquals( "2.2", mojoExecution.getMojoDescriptor().getPluginDescriptor().getVersion() );
}
-
+
public void testLifecycleQueryingUsingADefaultLifecyclePhase()
throws Exception
{