Author: jvanzyl
Date: Thu Apr 30 21:53:23 2009
New Revision: 770460
URL: http://svn.apache.org/viewvc?rev=770460&view=rev
Log:
o restoring method in model builder, i can't fix them all in old plugins
because there are 3.x classes i won't backport
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
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=770460&r1=770459&r2=770460&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
Thu Apr 30 21:53:23 2009
@@ -121,7 +121,6 @@
for ( String goal : goals )
{
String target = currentProject.getId() + " ( " + goal
+ " )";
- System.out.println( "target: " + target );
executeGoalAndHandleFailures( goal, session,
currentProject, buildStartTime, target );
}
}
@@ -179,6 +178,7 @@
{
try
{
+ logger.info( executionDescription( mojoExecution ) );
pluginManager.executeMojo( session, mojoExecution );
}
catch ( PluginExecutionException e )
@@ -193,6 +193,14 @@
}
}
}
+
+ private String executionDescription( MojoExecution me )
+ {
+ PluginDescriptor pd = me.getMojoDescriptor().getPluginDescriptor();
+ StringBuffer sb = new StringBuffer();
+ sb.append( pd.getArtifactId() + ":" + pd.getVersion() + ":" +
me.getMojoDescriptor().getGoal() );
+ return sb.toString();
+ }
// 1. Find the lifecycle given the phase (default lifecycle when given
install)
// 2. Find the lifecycle mapping that corresponds to the project packaging
(jar lifecycle mapping given the jar packaging)
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=770460&r1=770459&r2=770460&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Thu Apr 30 21:53:23 2009
@@ -323,7 +323,14 @@
return null;
}
-
+
+
+ public MavenProject buildFromRepository( Artifact artifact,
List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository
)
+ throws ProjectBuildingException
+ {
+ return buildFromRepository( artifact, new
DefaultProjectBuilderConfiguration( localRepository, remoteRepositories ) );
+ }
+
public MavenProject buildFromRepository(Artifact artifact,
ProjectBuilderConfiguration configuration )
throws ProjectBuildingException
{
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=770460&r1=770459&r2=770460&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
Thu Apr 30 21:53:23 2009
@@ -16,6 +16,7 @@
*/
import java.io.File;
+import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -26,7 +27,11 @@
// site
MavenProject build( File project, ArtifactRepository localRepository,
ProfileManager profileManager )
throws ProjectBuildingException;
-
+
+ // remote-resources-plugin
+ MavenProject buildFromRepository( Artifact artifact,
List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository
)
+ throws ProjectBuildingException;
+
MavenProject build( File project, ProjectBuilderConfiguration
configuration )
throws ProjectBuildingException;
