You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/01/06 04:51:01 UTC
svn commit: r366411 - in
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly:
AbstractAssemblyMojo.java AbstractUnpackingMojo.java
Author: brett
Date: Thu Jan 5 19:50:57 2006
New Revision: 366411
URL: http://svn.apache.org/viewcvs?rev=366411&view=rev
Log:
[MASSEMBLY-51] Can't require executedProject, as the assembly:attached mojo doesn't fork an execution. Use real project instead.
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
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=366411&r1=366410&r2=366411&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 19:50:57 2006
@@ -32,7 +32,6 @@
import org.apache.maven.plugins.assembly.model.FileItem;
import org.apache.maven.plugins.assembly.model.FileSet;
import org.apache.maven.plugins.assembly.model.io.xpp3.AssemblyXpp3Reader;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
@@ -114,15 +113,6 @@
* @readonly
*/
private File basedir;
-
- /**
- * The Maven Project.
- *
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
- private MavenProject project;
/**
* Maven ProjectHelper
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=366411&r1=366410&r2=366411&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 19:50:57 2006
@@ -91,7 +91,6 @@
* The executed project when the base was forked.
*
* @parameter expression="${executedProject}"
- * @required
* @readonly
*/
private MavenProject executedProject;
@@ -102,6 +101,15 @@
protected String classifier;
/**
+ * The Maven Project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ protected MavenProject project;
+
+ /**
* Retrieves all artifact dependencies within the reactor
*
* @return A HashSet of artifacts
@@ -110,10 +118,12 @@
{
Map dependencies = new HashMap();
+ MavenProject project = executedProject != null ? executedProject : this.project;
+
// TODO: this is not mediating dependencies versions - first wins. Is there a way we can do that properly from here?
- if ( executedProject != null )
+ if ( project != null )
{
- Artifact artifact = executedProject.getArtifact();
+ Artifact artifact = project.getArtifact();
if ( artifact.getFile() != null )
{