Author: jdcasey
Date: Thu Nov 29 16:15:05 2007
New Revision: 599652
URL: http://svn.apache.org/viewvc?rev=599652&view=rev
Log:
Applying patch from Oleg Gusakov to add dependency information to the metadata
returned.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/PomMetadataSource.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/PomMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/PomMetadataSource.java?rev=599652&r1=599651&r2=599652&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/PomMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/PomMetadataSource.java
Thu Nov 29 16:15:05 2007
@@ -95,6 +95,7 @@
catch ( InvalidProjectModelException e )
{
// We want to capture this in the graph so that we can display the
error to the user
+ artifactMetadata.setError( e.getMessage() );
}
catch ( ProjectBuildingException e )
{
@@ -111,7 +112,6 @@
for ( Iterator i = project.getDependencies().iterator(); i.hasNext(); )
{
Dependency d = (Dependency) i.next();
-
artifacts.add( new ArtifactMetadata( d.getGroupId(),
d.getArtifactId(), d.getVersion() ) );
}
@@ -119,7 +119,8 @@
// and making sure repositories added for a POM are scope only for a
particular POM. We don't want
// repositories lingering around or being aggregated after they are
used. jvz
- return new MetadataResolution( artifacts, null );
+ artifactMetadata.setDependencies( artifacts );
+ return new MetadataResolution( artifactMetadata );
}
private void loadProjectBuilder()