You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/05/25 20:12:20 UTC
svn commit: r409421 -
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
Author: carlos
Date: Thu May 25 11:12:19 2006
New Revision: 409421
URL: http://svn.apache.org/viewvc?rev=409421&view=rev
Log:
[MPIR-2] Dependencies report throws NullPointerException when a transitive dependency has system scope
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=409421&r1=409420&r2=409421&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Thu May 25 11:12:19 2006
@@ -387,46 +387,63 @@
Artifact artifact = node.getArtifact();
String id = artifact.getDependencyConflictId();
- try
+ if ( !Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
- MavenProject artifactProject = getMavenProjectFromRepository( artifact, localRepository );
- String artifactDescription = artifactProject.getDescription();
- String artifactUrl = artifactProject.getUrl();
- String artifactName = artifactProject.getName();
-
- sink.paragraph();
- sink.anchor( id );
- sink.bold();
- sink.text( artifactName );
- sink.bold_();
- sink.anchor_();
- sink.paragraph_();
-
- if ( artifactDescription != null )
+ try
{
+ MavenProject artifactProject = getMavenProjectFromRepository( artifact, localRepository );
+ String artifactDescription = artifactProject.getDescription();
+ String artifactUrl = artifactProject.getUrl();
+ String artifactName = artifactProject.getName();
+
sink.paragraph();
- sink.text( artifactDescription );
+ sink.anchor( id );
+ sink.bold();
+ sink.text( artifactName );
+ sink.bold_();
+ sink.anchor_();
sink.paragraph_();
+
+ if ( artifactDescription != null )
+ {
+ sink.paragraph();
+ sink.text( artifactDescription );
+ sink.paragraph_();
+ }
+
+ if ( artifactUrl != null )
+ {
+ sink.paragraph();
+ sink.link( artifactUrl );
+ sink.text( artifactUrl );
+ sink.link_();
+ sink.paragraph_();
+ }
+ }
+ catch ( ProjectBuildingException e )
+ {
+ getLog().debug( e );
}
- if ( artifactUrl != null )
+ for ( Iterator deps = node.getChildren().iterator(); deps.hasNext(); )
{
- sink.paragraph();
- sink.link( artifactUrl );
- sink.text( artifactUrl );
- sink.link_();
- sink.paragraph_();
+ ReportResolutionListener.Node dep = (ReportResolutionListener.Node) deps.next();
+ printDescriptionsAndURLs( dep );
}
}
- catch ( ProjectBuildingException e )
+ else
{
- getLog().debug( e );
- }
+ sink.paragraph();
+ sink.anchor( id );
+ sink.bold();
+ sink.text( id );
+ sink.bold_();
+ sink.anchor_();
+ sink.paragraph_();
- for ( Iterator deps = node.getChildren().iterator(); deps.hasNext(); )
- {
- ReportResolutionListener.Node dep = (ReportResolutionListener.Node) deps.next();
- printDescriptionsAndURLs( dep );
+ sink.paragraph();
+ sink.text( artifact.getFile().toString() );
+ sink.paragraph_();
}
}