Author: pottlinger
Date: Mon Aug 11 05:24:57 2014
New Revision: 1617203
URL: http://svn.apache.org/r1617203
Log:
https://issues.apache.org/jira/browse/RAT-168
RAT-168 Check CLI usage
Trying to get rid of the NPE by upgrading the way project is injected into our
mojos.
Modified:
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
Modified:
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java?rev=1617203&r1=1617202&r2=1617203&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
(original)
+++
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
Mon Aug 11 05:24:57 2014
@@ -34,6 +34,7 @@ import javax.xml.transform.TransformerCo
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.rat.Defaults;
@@ -199,7 +200,8 @@ public abstract class AbstractRatMojo ex
/**
*
*/
- @Parameter(name = "project", readonly = true)
+ //@Parameter(name = "project", readonly = true)
+ @Component
private MavenProject project;
/**
Modified:
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java?rev=1617203&r1=1617202&r2=1617203&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
(original)
+++
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
Mon Aug 11 05:24:57 2014
@@ -113,15 +113,7 @@ public class RatReportMojo extends Abstr
factory.createDependencyArtifact( skin.getGroupId(),
skin.getArtifactId(), versionSpec, "jar", null,
null );
- // FIXME Try to avoid NPE / found during 0.11-build checks
- // API is so old/without type information
- @SuppressWarnings("unchecked")
- List<ArtifactRepository> remoteArtifactRepositories =
getProject().getRemoteArtifactRepositories();
- if(remoteArtifactRepositories == null) {
- remoteArtifactRepositories = Collections.emptyList();
- }
-
- resolver.resolve( artifact, remoteArtifactRepositories,
localRepository );
+ resolver.resolve( artifact,
getProject().getRemoteArtifactRepositories(), localRepository );
}
catch ( InvalidVersionSpecificationException e )
{
