You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2012/10/10 23:59:51 UTC
svn commit: r1396824 - in /maven/plugins/trunk/maven-dependency-plugin/src:
it/analyze-report/ it/analyze-report/invoker.properties
it/analyze-report/pom.xml it/analyze-report/verify.bsh
main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
Author: aheritier
Date: Wed Oct 10 21:59:50 2012
New Revision: 1396824
URL: http://svn.apache.org/viewvc?rev=1396824&view=rev
Log:
MDEP-366 - Fix NPE when using site report : dependency:analyze-report
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/
maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/invoker.properties
maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/verify.bsh
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
Added: maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/invoker.properties?rev=1396824&view=auto
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/invoker.properties (added)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/invoker.properties Wed Oct 10 21:59:50 2012
@@ -0,0 +1 @@
+invoker.goals = clean ${project.groupId}:${project.artifactId}:${project.version}:analyze-report
Added: maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/pom.xml?rev=1396824&view=auto
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/pom.xml (added)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/pom.xml Wed Oct 10 21:59:50 2012
@@ -0,0 +1,7 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.dependency</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+</project>
Added: maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/verify.bsh?rev=1396824&view=auto
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/verify.bsh (added)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/analyze-report/verify.bsh Wed Oct 10 21:59:50 2012
@@ -0,0 +1,14 @@
+import java.io.*;
+
+File htmlFile = new File( basedir, "target/dependency-analysis.html" );
+
+if ( !htmlFile.isFile() )
+{
+ throw new Exception( "Dependency analysis file missing " + htmlFile );
+}
+if ( htmlFile.length() == 0 )
+{
+ throw new Exception( "Dependency analysis file empty " + htmlFile );
+}
+
+return true;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java?rev=1396824&r1=1396823&r2=1396824&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java Wed Oct 10 21:59:50 2012
@@ -59,7 +59,7 @@ public class AnalyzeReportMojo
/**
* The Maven project to analyze.
*/
- @Parameter
+ @Component
private MavenProject project;
/**