Author: bentmann
Date: Mon Aug 3 18:08:55 2009
New Revision: 800482
URL: http://svn.apache.org/viewvc?rev=800482&view=rev
Log:
o Polished error reporting
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=800482&r1=800481&r2=800482&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Mon Aug 3 18:08:55 2009
@@ -38,6 +38,7 @@
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.execution.ProjectSorter;
import org.apache.maven.lifecycle.LifecycleExecutor;
+import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
@@ -293,6 +294,27 @@
for ( ProjectBuildingResult result : results )
{
projects.add( result.getProject() );
+
+ if ( !result.getProblems().isEmpty() && logger.isWarnEnabled() )
+ {
+ logger.warn( "" );
+ logger.warn( "Some problems were encountered while building
the effective model for "
+ + result.getProject().getId() );
+ logger.warn( "" );
+
+ for ( ModelProblem problem : result.getProblems() )
+ {
+ logger.warn( problem.getMessage() + " @ " +
problem.getSource() );
+ }
+
+ logger.warn( "" );
+ logger.warn( "It is highly recommended to fix these problems"
+ + " because they threaten the stability of your build." );
+ logger.warn( "" );
+ logger.warn( "For this reason, future Maven versions will no"
+ + " longer support building such malformed projects." );
+ logger.warn( "" );
+ }
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=800482&r1=800481&r2=800482&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Mon Aug 3 18:08:55 2009
@@ -1115,7 +1115,7 @@
}
catch ( PluginNotFoundException e )
{
- throw new LifecycleExecutionException( "Error resolving
version for plugin " + plugin, e );
+ throw new LifecycleExecutionException( "Error resolving
version for plugin " + plugin.getKey(), e );
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java?rev=800482&r1=800481&r2=800482&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
Mon Aug 3 18:08:55 2009
@@ -315,8 +315,12 @@
{
for ( ModelProblem problem : result.getProblems() )
{
- writer.print( "o " );
- writer.println( problem.getMessage() );
+ writer.print( "[" );
+ writer.print( problem.getSeverity() );
+ writer.print( "] " );
+ writer.print( problem.getMessage() );
+ writer.print( " @ " );
+ writer.println( problem.getSource() );
}
}
writer.close();
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=800482&r1=800481&r2=800482&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Mon Aug 3 18:08:55 2009
@@ -185,7 +185,10 @@
{
System.out.println( es.getMessage() );
- es.getException().printStackTrace();
+ if ( showErrors )
+ {
+ es.getException().printStackTrace();
+ }
}
if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals(
request.getReactorFailureBehavior() ) )
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=800482&r1=800481&r2=800482&view=diff
==============================================================================
---
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
(original)
+++
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Mon Aug 3 18:08:55 2009
@@ -510,9 +510,9 @@
catch ( UnresolvableModelException e )
{
problems.add( new ModelProblem( "Non-resolvable parent POM "
- + ModelProblemUtils.toId( groupId, artifactId, version ) + "
for POM "
- + ModelProblemUtils.toSourceHint( childModel ) + ": " +
e.getMessage(), ModelProblem.Severity.FATAL,
- ModelProblemUtils.toSourceHint(
childModel ), e ) );
+ + ModelProblemUtils.toId( groupId, artifactId, version ) + ":
" + e.getMessage(),
+ ModelProblem.Severity.FATAL,
ModelProblemUtils.toSourceHint( childModel ),
+ e ) );
throw new ModelBuildingException( problems.getProblems() );
}
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java?rev=800482&r1=800481&r2=800482&view=diff
==============================================================================
---
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
(original)
+++
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingException.java
Mon Aug 3 18:08:55 2009
@@ -75,8 +75,12 @@
for ( ModelProblem problem : problems )
{
- writer.print( "o " );
- writer.println( problem.getMessage() );
+ writer.print( "[" );
+ writer.print( problem.getSeverity() );
+ writer.print( "] " );
+ writer.print( problem.getMessage() );
+ writer.print( " @ " );
+ writer.println( problem.getSource() );
}
return buffer.toString();
