Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4440] error message should clearly indicate the module that failed, and how to continue 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@836267 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-11-14 21:36:31 +00:00
parent 2ae3616c3f
commit 0f465258e5
8 changed files with 157 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
View File

@ -25,6 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.LifecycleNotFoundException;
import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
@ -33,12 +34,8 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.MojoNotFoundException;
import org.apache.maven.plugin.PluginConfigurationException;
import org.apache.maven.plugin.PluginDescriptorParsingException;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
@ -115,7 +112,7 @@ public class EmptyLifecycleExecutor
}
public List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session )
throws MojoFailureException, MojoExecutionException, PluginConfigurationException, PluginManagerException
throws LifecycleExecutionException
{
return Collections.emptyList();
}

10
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -175,6 +175,10 @@ public class DefaultMaven
session.setProjects( projects );
result.setTopologicallySortedProjects( session.getProjects() );
result.setProject( session.getTopLevelProject() );
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try
{
@ -224,6 +228,8 @@ public class DefaultMaven
return processResult( result, e );
}
result.setTopologicallySortedProjects( session.getProjects() );
// Desired order of precedence for local artifact repositories
//
// Reactor
@ -245,10 +251,6 @@ public class DefaultMaven
return processResult( result, session.getResult().getExceptions().get( 0 ) );
}
result.setTopologicallySortedProjects( session.getProjects() );
result.setProject( session.getTopLevelProject() );
return result;
}

5
maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
View File

@ -23,6 +23,7 @@ import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.plugin.AbstractMojoExecutionException;
import org.apache.maven.plugin.MojoExecutionException;
@ -181,6 +182,10 @@ public class DefaultExceptionHandler
reference = exception.getClass().getSimpleName();
}
}
else if ( exception instanceof LifecycleExecutionException )
{
reference = getReference( exception.getCause() );
}
else if ( !( exception instanceof RuntimeException ) )
{
reference = exception.getClass().getSimpleName();

78
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -367,10 +367,12 @@ public class DefaultLifecycleExecutor
private void resolveProjectDependencies( MavenProject project, Collection<String> scopesToCollect,
Collection<String> scopesToResolve, MavenSession session,
boolean aggregating )
throws ArtifactResolutionException, ArtifactNotFoundException
throws LifecycleExecutionException
{
Set<Artifact> artifacts;
try
{
try
{
artifacts = projectDependenciesResolver.resolve( project, scopesToCollect, scopesToResolve, session );
@ -401,6 +403,15 @@ public class DefaultLifecycleExecutor
throw e;
}
}
}
catch ( ArtifactResolutionException e )
{
throw new LifecycleExecutionException( null, project, e );
}
catch ( ArtifactNotFoundException e )
{
throw new LifecycleExecutionException( null, project, e );
}
project.setArtifacts( artifacts );
@ -488,7 +499,7 @@ public class DefaultLifecycleExecutor
}
void checkForUpdate( MavenSession session )
throws ArtifactResolutionException, ArtifactNotFoundException
throws LifecycleExecutionException
{
if ( lastProject == session.getCurrentProject() )
{
@ -509,23 +520,25 @@ public class DefaultLifecycleExecutor
private void execute( MavenSession session, MojoExecution mojoExecution, ProjectIndex projectIndex,
DependencyContext dependencyContext )
throws MojoFailureException, MojoExecutionException, PluginConfigurationException, PluginManagerException,
ArtifactResolutionException, ArtifactNotFoundException
throws LifecycleExecutionException
{
MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
if ( mojoDescriptor.isProjectRequired() && !session.isUsingPOMsFromFilesystem() )
{
throw new MojoExecutionException( "Goal " + mojoDescriptor.getId()
+ " requires a project to execute but there is no POM in this build." );
Throwable cause =
new IllegalStateException( "Goal requires a project to execute but there is no POM in this build." );
throw new LifecycleExecutionException( mojoExecution, null, cause );
}
if ( mojoDescriptor.isOnlineRequired() && session.isOffline() )
{
if ( MojoExecution.Source.CLI.equals( mojoExecution.getSource() ) )
{
throw new MojoExecutionException( "Goal " + mojoDescriptor.getId()
+ " requires online mode for execution but Maven is currently offline." );
Throwable cause =
new IllegalStateException( "Goal requires online mode for execution"
+ " but Maven is currently offline." );
throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), cause );
}
else
{
@ -542,31 +555,32 @@ public class DefaultLifecycleExecutor
fireEvent( session, mojoExecution, LifecycleEventCatapult.MOJO_STARTED );
try
{
try
{
pluginManager.executeMojo( session, mojoExecution );
fireEvent( session, mojoExecution, LifecycleEventCatapult.MOJO_SUCCEEDED );
}
catch ( MojoFailureException e )
{
fireEvent( session, mojoExecution, LifecycleEventCatapult.MOJO_FAILED );
throw e;
throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), e );
}
catch ( MojoExecutionException e )
{
fireEvent( session, mojoExecution, LifecycleEventCatapult.MOJO_FAILED );
throw e;
throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), e );
}
catch ( PluginConfigurationException e )
{
fireEvent( session, mojoExecution, LifecycleEventCatapult.MOJO_FAILED );
throw e;
throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), e );
}
catch ( PluginManagerException e )
{
throw new LifecycleExecutionException( mojoExecution, session.getCurrentProject(), e );
}
fireEvent( session, mojoExecution, LifecycleEventCatapult.MOJO_SUCCEEDED );
}
catch ( LifecycleExecutionException e )
{
fireEvent( session, mojoExecution, LifecycleEventCatapult.MOJO_FAILED );
@ -582,8 +596,7 @@ public class DefaultLifecycleExecutor
}
public List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session )
throws MojoFailureException, MojoExecutionException, PluginConfigurationException, PluginManagerException,
ArtifactResolutionException, ArtifactNotFoundException
throws LifecycleExecutionException
{
return executeForkedExecutions( mojoExecution, session, new ProjectIndex( session.getProjects() ),
new DependencyContext( mojoExecution ) );
@ -591,8 +604,7 @@ public class DefaultLifecycleExecutor
private List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session,
ProjectIndex projectIndex, DependencyContext dependencyContext )
throws MojoFailureException, MojoExecutionException, PluginConfigurationException, PluginManagerException,
ArtifactResolutionException, ArtifactNotFoundException
throws LifecycleExecutionException
{
List<MavenProject> forkedProjects = Collections.emptyList();
@ -643,25 +655,7 @@ public class DefaultLifecycleExecutor
fireEvent( session, mojoExecution, LifecycleEventCatapult.FORK_SUCCEEDED );
}
catch ( MojoFailureException e )
{
fireEvent( session, mojoExecution, LifecycleEventCatapult.FORK_FAILED );
throw e;
}
catch ( MojoExecutionException e )
{
fireEvent( session, mojoExecution, LifecycleEventCatapult.FORK_FAILED );
throw e;
}
catch ( PluginConfigurationException e )
{
fireEvent( session, mojoExecution, LifecycleEventCatapult.FORK_FAILED );
throw e;
}
catch ( PluginManagerException e )
catch ( LifecycleExecutionException e )
{
fireEvent( session, mojoExecution, LifecycleEventCatapult.FORK_FAILED );

58
maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
View File

@ -1,7 +1,5 @@
package org.apache.maven.lifecycle;
import org.apache.maven.project.MavenProject;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@ -21,6 +19,9 @@ import org.apache.maven.project.MavenProject;
* under the License.
*/
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.project.MavenProject;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
@ -51,8 +52,61 @@ public class LifecycleExecutionException
this.project = project;
}
LifecycleExecutionException( String message, MojoExecution execution, MavenProject project )
{
super( message );
this.project = project;
}
LifecycleExecutionException( String message, MojoExecution execution, MavenProject project, Throwable cause )
{
super( message, cause );
this.project = project;
}
LifecycleExecutionException( MojoExecution execution, MavenProject project, Throwable cause )
{
this( createMessage( execution, project, cause ), execution, project, cause );
}
public MavenProject getProject()
{
return project;
}
private static String createMessage( MojoExecution execution, MavenProject project, Throwable cause )
{
StringBuilder buffer = new StringBuilder( 256 );
buffer.append( "Failed to execute goal" );
if ( execution != null )
{
buffer.append( ' ' );
buffer.append( execution.getGroupId() );
buffer.append( ':' );
buffer.append( execution.getArtifactId() );
buffer.append( ':' );
buffer.append( execution.getVersion() );
buffer.append( ':' );
buffer.append( execution.getGoal() );
buffer.append( " (" );
buffer.append( execution.getExecutionId() );
buffer.append( ")" );
}
if ( project != null )
{
buffer.append( " on project " );
buffer.append( project.getArtifactId() );
}
if ( cause != null )
{
buffer.append( ": " ).append( cause.getMessage() );
}
return buffer.toString();
}
}

8
maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
View File

@ -22,16 +22,11 @@ package org.apache.maven.lifecycle;
import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.MojoNotFoundException;
import org.apache.maven.plugin.PluginConfigurationException;
import org.apache.maven.plugin.PluginDescriptorParsingException;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
@ -109,7 +104,6 @@ public interface LifecycleExecutor
* will never be {@code null}.
*/
List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session )
throws MojoFailureException, MojoExecutionException, PluginConfigurationException, PluginManagerException,
ArtifactResolutionException, ArtifactNotFoundException;
throws LifecycleExecutionException;
}

7
maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
View File

@ -25,6 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.LifecycleNotFoundException;
import org.apache.maven.lifecycle.LifecyclePhaseNotFoundException;
@ -33,12 +34,8 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.MojoNotFoundException;
import org.apache.maven.plugin.PluginConfigurationException;
import org.apache.maven.plugin.PluginDescriptorParsingException;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
@ -115,7 +112,7 @@ public class EmptyLifecycleExecutor
}
public List<MavenProject> executeForkedExecutions( MojoExecution mojoExecution, MavenSession session )
throws MojoFailureException, MojoExecutionException, PluginConfigurationException, PluginManagerException
throws LifecycleExecutionException
{
return Collections.emptyList();
}

16
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -38,7 +38,9 @@ import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequestPopulator;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.model.building.ModelProcessor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.ArtifactTransferListener;
import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
import org.apache.maven.settings.building.SettingsBuilder;
@ -426,11 +428,18 @@ public class MavenCli
Map<String, String> references = new LinkedHashMap<String, String>();
MavenProject project = null;
for ( Throwable exception : result.getExceptions() )
{
ExceptionSummary summary = handler.handleException( exception );
logSummary( summary, references, "", cliRequest.showErrors );
if ( project == null && exception instanceof LifecycleExecutionException )
{
project = ( (LifecycleExecutionException) exception ).getProject();
}
}
logger.error( "" );
@ -455,6 +464,13 @@ public class MavenCli
}
}
if ( project != null && !project.equals( result.getTopologicallySortedProjects().get( 0 ) ) )
{
logger.error( "" );
logger.error( "After correcting the problems, you can resume the build with the command" );
logger.error( " mvn <goals> -rf :" + project.getArtifactId() );
}
if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( cliRequest.request.getReactorFailureBehavior() ) )
{
logger.info( "Build failures were ignored." );