You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/06 10:05:52 UTC
svn commit: r168565 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical
Author: brett
Date: Fri May 6 01:05:52 2005
New Revision: 168565
URL: http://svn.apache.org/viewcvs?rev=168565&view=rev
Log:
avoid NPE if there are not report plugins defined in the POM when generating the site.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=168565&r1=168564&r2=168565&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Fri May 6 01:05:52 2005
@@ -200,7 +200,7 @@
private void processPluginConfiguration( MavenProject project, MavenSession mavenSession, Map phaseMap )
throws LifecycleExecutionException, ArtifactResolutionException
{
- for ( Iterator i = project.getPlugins().iterator(); i.hasNext(); )
+ for ( Iterator i = project.getBuildPlugins().iterator(); i.hasNext(); )
{
Plugin plugin = (Plugin) i.next();
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=168565&r1=168564&r2=168565&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Fri May 6 01:05:52 2005
@@ -152,7 +152,7 @@
org.apache.maven.model.Plugin pluginConfig = null;
- for ( Iterator it = project.getPlugins().iterator(); it.hasNext(); )
+ for ( Iterator it = project.getBuildPlugins().iterator(); it.hasNext(); )
{
org.apache.maven.model.Plugin plugin = (org.apache.maven.model.Plugin) it.next();
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=168565&r1=168564&r2=168565&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Fri May 6 01:05:52 2005
@@ -28,6 +28,7 @@
import java.io.File;
import java.util.Iterator;
import java.util.Map;
+import java.util.List;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -84,11 +85,15 @@
try
{
PluginManager pluginManager = (PluginManager) context.lookup( role );
- for ( Iterator it = context.getProject().getReports().getPlugins().iterator(); it.hasNext(); )
+ List reportPlugins = context.getProject().getReportPlugins();
+ if ( reportPlugins != null )
{
- org.apache.maven.model.Plugin plugin = (org.apache.maven.model.Plugin) it.next();
- pluginManager.verifyPlugin( plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(),
- context );
+ for ( Iterator it = reportPlugins.iterator(); it.hasNext(); )
+ {
+ org.apache.maven.model.Plugin plugin = (org.apache.maven.model.Plugin) it.next();
+ pluginManager.verifyPlugin( plugin.getGroupId(), plugin.getArtifactId(), plugin.getVersion(),
+ context );
+ }
}
}
catch ( ComponentLookupException cle )
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=168565&r1=168564&r2=168565&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Fri May 6 01:05:52 2005
@@ -677,7 +677,16 @@
// Plugins
// ----------------------------------------------------------------------
- public List getPlugins()
+ public List getReportPlugins()
+ {
+ if ( model.getReports() == null )
+ {
+ return null;
+ }
+ return model.getReports().getPlugins();
+
+ }
+ public List getBuildPlugins()
{
if ( model.getBuild() == null )
{
@@ -811,9 +820,9 @@
// for now I have to iterate through and see what we have.
// ----------------------------------------------------------------------
- if ( getPlugins() != null )
+ if ( getBuildPlugins() != null )
{
- for ( Iterator iterator = getPlugins().iterator(); iterator.hasNext(); )
+ for ( Iterator iterator = getBuildPlugins().iterator(); iterator.hasNext(); )
{
Plugin plugin = (Plugin) iterator.next();
@@ -845,4 +854,5 @@
{
return model.getPluginRepositories();
}
+
}
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java?rev=168565&r1=168564&r2=168565&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java Fri May 6 01:05:52 2005
@@ -49,7 +49,7 @@
// Plugins
// ----------------------------------------------------------------------
- List plugins = project.getPlugins();
+ List plugins = project.getBuildPlugins();
// Plugin0 [plexus]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org