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 2006/09/21 00:56:07 UTC
svn commit: r448393 -
/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Author: jdcasey
Date: Wed Sep 20 15:56:07 2006
New Revision: 448393
URL: http://svn.apache.org/viewvc?view=rev&rev=448393
Log:
Adding parameter <attach>false</attach> to allow users an override to avoid attaching assemblies to the project artifact. Also, adding a check to verify that the result of an assembly build is a file before attaching it to the project artifact, since directories cannot be installed or deployed.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?view=diff&rev=448393&r1=448392&r2=448393
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Wed Sep 20 15:56:07 2006
@@ -222,6 +222,11 @@
* @readonly
*/
protected List filters;
+
+ /**
+ * @parameter expression="${attach}" default-value="true"
+ */
+ private boolean attach;
/**
* @component
@@ -275,17 +280,20 @@
MavenProject project = getProject();
String classifier = getClassifier();
- if ( isAssemblyIdAppended() )
- {
- projectHelper.attachArtifact( project, format, assembly.getId(), destFile );
- }
- else if ( classifier != null )
- {
- projectHelper.attachArtifact( project, format, classifier, destFile );
- }
- else
+ if ( attach && destFile.isFile() )
{
- projectHelper.attachArtifact( project, format, null, destFile );
+ if ( isAssemblyIdAppended() )
+ {
+ projectHelper.attachArtifact( project, format, assembly.getId(), destFile );
+ }
+ else if ( classifier != null )
+ {
+ projectHelper.attachArtifact( project, format, classifier, destFile );
+ }
+ else
+ {
+ projectHelper.attachArtifact( project, format, null, destFile );
+ }
}
}
}