Author: brett
Date: Thu Jul 21 05:37:43 2005
New Revision: 220050
URL: http://svn.apache.org/viewcvs?rev=220050&view=rev
Log:
fix NPE in dependencies report
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=220050&r1=220049&r2=220050&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
Thu Jul 21 05:37:43 2005
@@ -17,6 +17,7 @@
*/
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
@@ -85,6 +86,13 @@
private MavenProjectBuilder mavenProjectBuilder;
/**
+ * @parameter expression="${localRepository}"
+ * @required
+ * @readonly
+ */
+ private ArtifactRepository localRepository;
+
+ /**
* @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
*/
public String getName( Locale locale )
@@ -139,7 +147,7 @@
throws MavenReportException
{
DependenciesRenderer r = new DependenciesRenderer( getSink(),
getProject(), locale, mavenProjectBuilder,
- artifactFactory );
+ artifactFactory,
localRepository );
r.render();
}
@@ -163,8 +171,11 @@
private MavenProjectBuilder mavenProjectBuilder;
+ private ArtifactRepository localRepository;
+
public DependenciesRenderer( Sink sink, MavenProject project, Locale
locale,
- MavenProjectBuilder mavenProjectBuilder,
ArtifactFactory artifactFactory )
+ MavenProjectBuilder mavenProjectBuilder,
ArtifactFactory artifactFactory,
+ ArtifactRepository localRepository )
{
super( sink );
@@ -175,6 +186,8 @@
this.mavenProjectBuilder = mavenProjectBuilder;
this.artifactFactory = artifactFactory;
+
+ this.localRepository = localRepository;
}
public String getTitle()
@@ -187,7 +200,7 @@
// Dependencies report
List dependencies = project.getDependencies();
- if ( ( dependencies == null ) || ( dependencies.isEmpty() ) )
+ if ( dependencies == null || dependencies.isEmpty() )
{
startSection( getTitle() );
@@ -224,7 +237,7 @@
MavenProject artifactProject = null;
try
{
- artifactProject = getMavenProjectFromRepository( artifact
);
+ artifactProject = getMavenProjectFromRepository( artifact,
localRepository );
}
catch ( ProjectBuildingException e )
{
@@ -269,7 +282,7 @@
MavenProject artifactProject = null;
try
{
- artifactProject = getMavenProjectFromRepository(
artifact );
+ artifactProject = getMavenProjectFromRepository(
artifact, localRepository );
}
catch ( ProjectBuildingException e )
{
@@ -277,8 +290,6 @@
"Can't find a
valid Maven project in the repository for the artifact ["
+ artifact +
"]." );
}
- System.out.println( "nklj-----------------------------" );
- System.out.println( artifactProject.getUrl() );
tableRow( new String[] {
artifact.getGroupId(),
artifact.getArtifactId(),
@@ -308,7 +319,7 @@
List dependencies = project.getDependencies();
Set artifacts = project.getArtifacts();
- if ( ( dependencies == null ) || ( artifacts == null ) )
+ if ( dependencies == null || artifacts == null )
{
return transitiveDependencies;
}
@@ -341,18 +352,17 @@
/**
* Get the <code>Maven project</code> from the repository depending
* the <code>Artifact</code> given.
- *
+ *
* @param artifact
* an artifact
* @return the Maven project for the given artifact
- * @throws ProjectBuildingException
+ * @throws org.apache.maven.project.ProjectBuildingException
* if any
*/
- private MavenProject getMavenProjectFromRepository( Artifact artifact )
+ private MavenProject getMavenProjectFromRepository( Artifact artifact,
ArtifactRepository localRepository )
throws ProjectBuildingException
{
- return mavenProjectBuilder.buildFromRepository( artifact,
project.getRepositories(), artifact
- .getRepository() );
+ return mavenProjectBuilder.buildFromRepository( artifact,
project.getRepositories(), localRepository );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
