Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=592859&r1=592858&r2=592859&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Wed Nov 7 11:24:30 2007 @@ -371,8 +371,7 @@ } catch ( InvalidVersionSpecificationException e ) { - throw new InvalidDependencyVersionException( "Unable to parse version '" + d.getVersion() + - "' for dependency '" + d.getManagementKey() + "': " + e.getMessage(), e ); + throw new InvalidDependencyVersionException( project.getId(), d, project.getFile(), e ); } Artifact artifact = artifactFactory.createDependencyArtifact( d.getGroupId(), d.getArtifactId(), versionRange, d.getType(), d.getClassifier(),
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java?rev=592859&r1=592858&r2=592859&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java (original) +++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java Wed Nov 7 11:24:30 2007 @@ -323,7 +323,7 @@ { try { - parentPomFile = resolveParentFromRepositories( modelParent, localRepository, remoteRepositories, model.getId() ); + parentPomFile = resolveParentFromRepositories( modelParent, localRepository, remoteRepositories, model.getId(), modelPomFile ); isResolved = true; } catch( ProjectBuildingException e ) @@ -396,29 +396,23 @@ } private File resolveParentFromRepositories( Parent modelParent, ArtifactRepository localRepository, - List remoteRepositories, String childId ) + List remoteRepositories, String childId, File childPomFile ) throws ProjectBuildingException { Artifact parentPomArtifact = artifactFactory.createBuildArtifact( modelParent.getGroupId(), modelParent .getArtifactId(), modelParent.getVersion(), "pom" ); -// getLogger().debug( "Looking for parent: " + modelParent.getId() + " using artifact: " + parentPomArtifact ); -// getLogger().debug( "\tLocal repository: " + localRepository.getBasedir() + "\n" ); -// getLogger().debug( "\tRemote repositories:\n" + remoteRepositories.toString().replace( ',', '\n' ) + "\n" ); - try { artifactResolver.resolve( parentPomArtifact, remoteRepositories, localRepository ); } catch ( ArtifactResolutionException e ) { - throw new ProjectBuildingException( "Parent: " + modelParent.getId(), - "Failed to resolve POM for parent of: " + childId, e ); + throw new ProjectBuildingException( childId, "Failed to resolve parent POM: " + modelParent.getId(), childPomFile, e ); } catch ( ArtifactNotFoundException e ) { - throw new ProjectBuildingException( "Parent: " + modelParent.getId(), "Cannot find parent: " - + parentPomArtifact.getId() + " of: " + childId, e ); + throw new ProjectBuildingException( childId, "Cannot find artifact for parent POM: " + modelParent.getId(), childPomFile, e ); } if ( parentPomArtifact.isResolved() )
