Author: jdcasey
Date: Tue Sep 16 13:12:41 2008
New Revision: 696035
URL: http://svn.apache.org/viewvc?rev=696035&view=rev
Log:
[MASSEMBLY-312] Adding notice to outputFileNameMapping element in the MDO files
to warn against combining outputFileNameMapping and unpack == true.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo?rev=696035&r1=696034&r2=696035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo Tue
Sep 16 13:12:41 2008
@@ -382,10 +382,11 @@
<type>String</type>
<defaultValue>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</defaultValue>
<description>
- Sets the mapping pattern for all dependencies included in this
+ Sets the mapping pattern for all NON-UNPACKED dependencies
included in this
assembly. Default is
${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}.
If the artifact doesn't have a classifier, that part of the
pattern will be left off.
- (Since 2.2-beta-2; 2.2-beta-1 uses
${artifactId}-${version}${dashClassifier?}.${extension})
+ (Since 2.2-beta-2; 2.2-beta-1 uses
${artifactId}-${version}${dashClassifier?}.${extension}) NOTE: If the
+ dependencySet specifies unpack == true, outputFileNameMapping WILL
NOT BE USED; in these cases, use outputDirectory.
</description>
</field>
<field>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=696035&r1=696034&r2=696035&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Tue
Sep 16 13:12:41 2008
@@ -814,10 +814,11 @@
<type>String</type>
<defaultValue>${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}</defaultValue>
<description>
- Sets the mapping pattern for all dependencies included
+ Sets the mapping pattern for all NON-UNPACKED dependencies included
in this assembly.
Default is
${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}.
- (Since 2.2-beta-2; 2.2-beta-1 uses
${artifactId}-${version}${dashClassifier?}.${extension})
+ (Since 2.2-beta-2; 2.2-beta-1 uses
${artifactId}-${version}${dashClassifier?}.${extension}) NOTE: If the
+ dependencySet specifies unpack == true, outputFileNameMapping WILL
NOT BE USED; in these cases, use outputDirectory.
</description>
</field>
</fields>
