You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/08/08 00:48:12 UTC
svn commit: r683741 -
/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Author: jdcasey
Date: Thu Aug 7 15:48:11 2008
New Revision: 683741
URL: http://svn.apache.org/viewvc?rev=683741&view=rev
Log:
Attempt to guard against a null project instance during plugin-configuration interpolation.
Modified:
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified: maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=683741&r1=683740&r2=683741&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Thu Aug 7 15:48:11 2008
@@ -54,6 +54,7 @@
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.interpolation.ModelInterpolationException;
import org.apache.maven.project.interpolation.ModelInterpolator;
@@ -676,6 +677,19 @@
String domStr = writer.toString();
+ if ( project == null )
+ {
+ try
+ {
+ project = mavenProjectBuilder.buildStandaloneSuperProject( session.getProjectBuilderConfiguration() );
+ }
+ catch ( ProjectBuildingException e )
+ {
+ throw new LifecycleExecutionException( "Error building super-POM to interpolate configuration for: '" + mojoExecution.getMojoDescriptor().getRoleHint() +
+ "' (execution: '" + mojoExecution.getExecutionId() + "')", e );
+ }
+ }
+
try
{
domStr =