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 2010/09/25 00:11:20 UTC
svn commit: r1001095 - in
/maven/plugins/trunk/maven-assembly-plugin/src/main:
java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
mdo/component.mdo mdo/descriptor.mdo
Author: jdcasey
Date: Fri Sep 24 22:11:20 2010
New Revision: 1001095
URL: http://svn.apache.org/viewvc?rev=1001095&view=rev
Log:
[MASSEMBLY-488] REMOVE support for useStrictFiltering in FileSets and ModuleSets, until we can add support for those in the deeper components (plexus-utils, for instance).
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
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/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?rev=1001095&r1=1001094&r2=1001095&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java Fri Sep 24 22:11:20 2010
@@ -302,7 +302,6 @@ public class AddDependencySetsTask
fs.setLineEnding( opts.getLineEnding() );
fs.setUseDefaultExcludes( opts.isUseDefaultExcludes() );
- fs.setUseStrictFiltering( opts.isUseStrictFiltering() );
final AddFileSetsTask task = new AddFileSetsTask( fs );
task.setProject( depProject );
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=1001095&r1=1001094&r2=1001095&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 Fri Sep 24 22:11:20 2010
@@ -151,18 +151,6 @@
<version>1.0.0+</version>
<fields>
<field>
- <name>useStrictFiltering</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- When specified as true, any include/exclude patterns which aren't used to filter an actual
- artifact during assembly creation will cause the build to fail with an error. This is meant
- to highlight obsolete inclusions or exclusions, or else signal that the assembly descriptor
- is incorrectly configured.
- </description>
- </field>
- <field>
<name>useDefaultExcludes</name>
<version>1.1.0+</version>
<type>boolean</type>
@@ -392,6 +380,18 @@
</description>
<fields>
<field>
+ <name>useStrictFiltering</name>
+ <version>1.1.2+</version>
+ <type>boolean</type>
+ <defaultValue>false</defaultValue>
+ <description>
+ When specified as true, any include/exclude patterns which aren't used to filter an actual
+ artifact during assembly creation will cause the build to fail with an error. This is meant
+ to highlight obsolete inclusions or exclusions, or else signal that the assembly descriptor
+ is incorrectly configured. (Since 2.2)
+ </description>
+ </field>
+ <field>
<name>outputFileNameMapping</name>
<version>1.0.0+</version>
<type>String</type>
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=1001095&r1=1001094&r2=1001095&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 Fri Sep 24 22:11:20 2010
@@ -255,18 +255,6 @@
<version>1.0.0+</version>
<fields>
<field>
- <name>useStrictFiltering</name>
- <version>1.1.0+</version>
- <type>boolean</type>
- <defaultValue>false</defaultValue>
- <description>
- When specified as true, any include/exclude patterns which aren't used to filter an actual
- artifact during assembly creation will cause the build to fail with an error. This is meant
- to highlight obsolete inclusions or exclusions, or else signal that the assembly descriptor
- is incorrectly configured. (Since 2.2)
- </description>
- </field>
- <field>
<name>useDefaultExcludes</name>
<version>1.1.0+</version>
<type>boolean</type>
@@ -496,6 +484,18 @@
</description>
<fields>
<field>
+ <name>useStrictFiltering</name>
+ <version>1.1.2+</version>
+ <type>boolean</type>
+ <defaultValue>false</defaultValue>
+ <description>
+ When specified as true, any include/exclude patterns which aren't used to filter an actual
+ artifact during assembly creation will cause the build to fail with an error. This is meant
+ to highlight obsolete inclusions or exclusions, or else signal that the assembly descriptor
+ is incorrectly configured. (Since 2.2)
+ </description>
+ </field>
+ <field>
<name>outputFileNameMapping</name>
<version>1.0.0+</version>
<type>String</type>