[MNG-5527] Relocation does not work for imported poms o Updated to improve error message when building an import POM fails.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/de817fd8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/de817fd8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/de817fd8 Branch: refs/heads/jigsaw Commit: de817fd82253c6191b02044e33795acf4ff076d9 Parents: d3761d4 Author: Christian Schulte <schu...@apache.org> Authored: Wed Jun 22 01:21:00 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Wed Jun 22 01:21:00 2016 +0200 ---------------------------------------------------------------------- .../model/building/DefaultModelBuilder.java | 26 +++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/de817fd8/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index 87b6a96..06ee1fa 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -1510,10 +1510,11 @@ public class DefaultModelBuilder return importModel; } } - catch ( UnresolvableModelException e ) + catch ( final UnresolvableModelException e ) { - StringBuilder buffer = new StringBuilder( 256 ); + final StringBuilder buffer = new StringBuilder( 256 ); buffer.append( "Non-resolvable " + dependency.getScope() + " POM" ); + if ( !containsCoordinates( e.getMessage(), dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() ) ) { @@ -1521,6 +1522,7 @@ public class DefaultModelBuilder dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() ) ); } + buffer.append( ": " ).append( e.getMessage() ); problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ). @@ -1529,8 +1531,26 @@ public class DefaultModelBuilder setException( e ) ); } - catch ( ModelBuildingException e ) + catch ( final ModelBuildingException e ) { + final StringBuilder buffer = new StringBuilder( 256 ); + buffer.append( "Failure building " + dependency.getScope() + " POM" ); + + if ( !containsCoordinates( e.getMessage(), dependency.getGroupId(), dependency.getArtifactId(), + dependency.getVersion() ) ) + { + buffer.append( ' ' ).append( ModelProblemUtils.toId( + dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() ) ); + + } + + buffer.append( ": " ).append( e.getMessage() ); + + problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ). + setMessage( buffer.toString() ). + setLocation( dependency.getLocation( "" ) ). + setException( e ) ); + problems.addAll( e.getProblems() ); }
