Author: brett
Date: Thu Jan 5 21:30:34 2006
New Revision: 366433
URL: http://svn.apache.org/viewcvs?rev=366433&view=rev
Log:
[MASSEMBLY-51] Only instantiate executedProject in projects that fork a
lifecycle
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java?rev=366433&r1=366432&r2=366433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractAssemblyMojo.java
Thu Jan 5 21:30:34 2006
@@ -71,7 +71,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Vincent Siveton</a>
* @version $Id$
*/
-public class AbstractAssemblyMojo
+public abstract class AbstractAssemblyMojo
extends AbstractUnpackingMojo
{
/**
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java?rev=366433&r1=366432&r2=366433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
Thu Jan 5 21:30:34 2006
@@ -88,14 +88,6 @@
private List reactorProjects;
/**
- * The executed project when the base was forked.
- *
- * @parameter expression="${executedProject}"
- * @readonly
- */
- private MavenProject executedProject;
-
- /**
* @parameter expression="${classifier}"
*/
protected String classifier;
@@ -118,7 +110,7 @@
{
Map dependencies = new HashMap();
- MavenProject project = executedProject != null ? executedProject :
this.project;
+ MavenProject project = getExecutedProject();
// TODO: this is not mediating dependencies versions - first wins. Is
there a way we can do that properly from here?
if ( project != null )
@@ -164,6 +156,8 @@
return new HashSet( dependencies.values() );
}
+
+ protected abstract MavenProject getExecutedProject();
/**
* Unpacks the archive file.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java?rev=366433&r1=366432&r2=366433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
Thu Jan 5 21:30:34 2006
@@ -1,5 +1,7 @@
package org.apache.maven.plugin.assembly;
+import org.apache.maven.project.MavenProject;
+
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -30,4 +32,16 @@
public class AssemblyMojo
extends AbstractAssemblyMojo
{
+ /**
+ * Get the executed project from the forked lifecycle.
+ *
+ * @parameter expression="${executedProject}"
+ */
+ private MavenProject executedProject;
+
+ protected MavenProject getExecutedProject()
+ {
+ return executedProject;
+ }
+
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.java?rev=366433&r1=366432&r2=366433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AttachedAssemblyMojo.java
Thu Jan 5 21:30:34 2006
@@ -1,5 +1,7 @@
package org.apache.maven.plugin.assembly;
+import org.apache.maven.project.MavenProject;
+
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -29,4 +31,8 @@
public class AttachedAssemblyMojo
extends AbstractAssemblyMojo
{
+ protected MavenProject getExecutedProject()
+ {
+ return project;
+ }
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java?rev=366433&r1=366432&r2=366433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/DirectoryMojo.java
Thu Jan 5 21:30:34 2006
@@ -20,6 +20,7 @@
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.assembly.archiver.DirectoryArchiver;
import org.apache.maven.plugins.assembly.model.Assembly;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -38,6 +39,18 @@
public class DirectoryMojo
extends AbstractAssemblyMojo
{
+ /**
+ * Get the executed project from the forked lifecycle.
+ *
+ * @parameter expression="${executedProject}"
+ */
+ private MavenProject executedProject;
+
+ protected MavenProject getExecutedProject()
+ {
+ return executedProject;
+ }
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java?rev=366433&r1=366432&r2=366433&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
Thu Jan 5 21:30:34 2006
@@ -19,6 +19,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import java.io.File;
@@ -34,6 +35,11 @@
public class UnpackMojo
extends AbstractUnpackingMojo
{
+ protected MavenProject getExecutedProject()
+ {
+ return project;
+ }
+
/**
* Unpacks the archive file.
*
