mirror of https://github.com/apache/maven.git
Kept John's constructors but still use File/URL instead of String
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@587693 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
1241d1b299
commit
880785ac04
|
@ -109,7 +109,7 @@ public class DefaultProfileAdvisor
|
||||||
|
|
||||||
String projectId = ArtifactUtils.versionlessKey( groupId, artifactId );
|
String projectId = ArtifactUtils.versionlessKey( groupId, artifactId );
|
||||||
|
|
||||||
throw new ProjectBuildingException( projectId, e.getMessage(), pomFile.getAbsolutePath(), e );
|
throw new ProjectBuildingException( projectId, e.getMessage(), pomFile, e );
|
||||||
}
|
}
|
||||||
|
|
||||||
for ( Iterator it = activeProfiles.iterator(); it.hasNext(); )
|
for ( Iterator it = activeProfiles.iterator(); it.hasNext(); )
|
||||||
|
@ -166,7 +166,7 @@ public class DefaultProfileAdvisor
|
||||||
catch ( ProfileActivationException e )
|
catch ( ProfileActivationException e )
|
||||||
{
|
{
|
||||||
throw new ProjectBuildingException( modelId,
|
throw new ProjectBuildingException( modelId,
|
||||||
"Failed to compute active profiles for repository aggregation.", pomFile.getAbsolutePath(), e );
|
"Failed to compute active profiles for repository aggregation.", pomFile, e );
|
||||||
}
|
}
|
||||||
|
|
||||||
LinkedHashSet remoteRepositories = new LinkedHashSet();
|
LinkedHashSet remoteRepositories = new LinkedHashSet();
|
||||||
|
@ -239,13 +239,13 @@ public class DefaultProfileAdvisor
|
||||||
catch ( IOException e )
|
catch ( IOException e )
|
||||||
{
|
{
|
||||||
throw new ProjectBuildingException( model.getId(), "Cannot read profiles.xml resource from directory: "
|
throw new ProjectBuildingException( model.getId(), "Cannot read profiles.xml resource from directory: "
|
||||||
+ projectDir, pomFile.getAbsolutePath(), e );
|
+ projectDir, pomFile, e );
|
||||||
}
|
}
|
||||||
catch ( XmlPullParserException e )
|
catch ( XmlPullParserException e )
|
||||||
{
|
{
|
||||||
throw new ProjectBuildingException( model.getId(),
|
throw new ProjectBuildingException( model.getId(),
|
||||||
"Cannot parse profiles.xml resource from directory: " + projectDir,
|
"Cannot parse profiles.xml resource from directory: " + projectDir,
|
||||||
pomFile.getAbsolutePath(), e );
|
pomFile, e );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -198,11 +198,11 @@ public class DefaultModelLineageBuilder
|
||||||
}
|
}
|
||||||
catch ( IOException e )
|
catch ( IOException e )
|
||||||
{
|
{
|
||||||
throw new ProjectBuildingException( "unknown", "Failed to read model from: " + pomFile, pomFile.getAbsolutePath(), e );
|
throw new ProjectBuildingException( "unknown", "Failed to read model from: " + pomFile, pomFile, e );
|
||||||
}
|
}
|
||||||
catch ( XmlPullParserException e )
|
catch ( XmlPullParserException e )
|
||||||
{
|
{
|
||||||
throw new ProjectBuildingException( "unknown", "Failed to parse model from: " + pomFile, pomFile.getAbsolutePath(), e );
|
throw new ProjectBuildingException( "unknown", "Failed to parse model from: " + pomFile, pomFile, e );
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
@ -251,7 +251,7 @@ public class DefaultModelLineageBuilder
|
||||||
catch ( InvalidRepositoryException e )
|
catch ( InvalidRepositoryException e )
|
||||||
{
|
{
|
||||||
throw new ProjectBuildingException( model.getId(), "Failed to create ArtifactRepository list for: "
|
throw new ProjectBuildingException( model.getId(), "Failed to create ArtifactRepository list for: "
|
||||||
+ pomFile, pomFile.getAbsolutePath(), e );
|
+ pomFile, pomFile, e );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue