Author: dennisl
Date: Sat Oct 27 19:16:52 2012
New Revision: 1402850
URL: http://svn.apache.org/viewvc?rev=1402850&view=rev
Log:
[MASSEMBLY-532] Documentation has parts reversed for full include/exclude
patterns in dependencySet
[MASSEMBLY-567] Version wildcard in dependencySet include does not work
[MASSEMBLY-599] Mistake in javadoc for dependencySet/includes
[MASSEMBLY-620] The dependencySet/includes/include format is documented
incorrectly
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/component.mdo
maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
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=1402850&r1=1402849&r2=1402850&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 Sat
Oct 27 19:16:52 2012
@@ -222,7 +222,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -241,7 +241,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -338,7 +338,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -402,8 +402,8 @@
artifact coordinates to include. If none is present, then
<includes> represents all valid values.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -421,8 +421,8 @@
dependency artifact coordinates to exclude. If none is present,
then
<excludes> represents no exclusions.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -442,7 +442,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -461,7 +461,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -624,8 +624,8 @@
project coordinates to include. If none is present, then
<includes> represents all valid values.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -643,8 +643,8 @@
project artifact coordinates to exclude. If none is present, then
<excludes> represents no exclusions.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -748,7 +748,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -767,7 +767,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -857,8 +857,8 @@
artifact coordinates to include. If none is present, then
<includes> represents all valid values.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -876,8 +876,8 @@
dependency artifact coordinates to exclude. If none is present,
then
<excludes> represents no exclusions.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -897,7 +897,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -916,7 +916,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -1035,8 +1035,8 @@
artifact coordinates to include. If none is present, then
<includes> represents all valid values.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -1054,8 +1054,8 @@
dependency artifact coordinates to exclude. If none is present,
then
<excludes> represents no exclusions.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -1075,7 +1075,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -1094,7 +1094,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</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=1402850&r1=1402849&r2=1402850&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 Sat
Oct 27 19:16:52 2012
@@ -339,7 +339,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -358,7 +358,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -456,7 +456,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -521,8 +521,8 @@
artifact coordinates to include. If none is present, then
<includes> represents all valid values.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -540,8 +540,8 @@
dependency artifact coordinates to exclude. If none is present,
then
<excludes> represents no exclusions.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -561,7 +561,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -580,7 +580,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -739,8 +739,8 @@
project coordinates to include. If none is present, then
<includes> represents all valid values.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -758,8 +758,8 @@
project artifact coordinates to exclude. If none is present, then
<excludes> represents no exclusions.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -863,7 +863,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -882,7 +882,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -971,8 +971,8 @@
artifact coordinates to include. If none is present, then
<includes> represents all valid values.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -990,8 +990,8 @@
dependency artifact coordinates to exclude. If none is present,
then
<excludes> represents no exclusions.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -1011,7 +1011,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -1030,7 +1030,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -1148,8 +1148,8 @@
artifact coordinates to include. If none is present, then
<includes> represents all valid values.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -1167,8 +1167,8 @@
dependency artifact coordinates to exclude. If none is present,
then
<excludes> represents no exclusions.
- Artifact coordinatess may be given in simple groupId:artifactId
form,
- or they may be fully qualified in the form
groupId:artifactId:type:version[:classifier].
+ Artifact coordinates may be given in simple groupId:artifactId
form,
+ or they may be fully qualified in the form
groupId:artifactId:type[:classifier]:version.
Additionally, wildcards can be used, as in *:maven-*
]]>
</description>
@@ -1188,7 +1188,7 @@
Write = 2, and Execute = 1. For example, the value 0644
translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
@@ -1207,7 +1207,7 @@
Read = 4, Write = 2, and Execute = 1. For example, the value
0755 translates to User read-write, Group and Other read-only.
<a
href="http://www.onlamp.com/pub/a/bsd/2000/09/06/FreeBSD_Basics.html";>(more on
unix-style permissions)</a>
- ]]>
+ ]]>
</description>
</field>
<field>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm?rev=1402850&r1=1402849&r2=1402850&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/advanced-descriptor-topics.apt.vm
Sat Oct 27 19:16:52 2012
@@ -132,7 +132,7 @@ Advanced Assembly-Descriptor Topics
* <<<groupId:artifactId>>>
( <<<ArtifactUtils.versionlessKey( artifact )>>> )
- * <<<groupId:artifactId:version:type:classifier>>>
+ * <<<groupId:artifactId:type:classifier:version>>>
( <<<artifact.getId()>>> )
[]
