Author: bentmann
Date: Tue Oct 20 21:28:08 2009
New Revision: 827805
URL: http://svn.apache.org/viewvc?rev=827805&view=rev
Log:
[MASSEMBLY-446] apache-source-release-assembly DOES NOT exclude target/** in
maven-remote-resources-plugin build
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/classes/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt
(with props)
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/classes/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/classes/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt
(with props)
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=827805&r1=827804&r2=827805&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Oct 20 21:28:08 2009
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.12</version>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt?rev=827805&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt
Tue Oct 20 21:28:08 2009
@@ -0,0 +1 @@
+test
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/child/target/classes/src/omit.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml?rev=827805&r1=827804&r2=827805&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
Tue Oct 20 21:28:08 2009
@@ -10,7 +10,7 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>**/*.log</exclude>
- <exclude>%regex[(?!.*src/).*target.*]</exclude>
+ <exclude>%regex[(?!((?!target/)[^/]+/)*src/).*target.*]</exclude>
</excludes>
</fileSet>
</fileSets>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt?rev=827805&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt
Tue Oct 20 21:28:08 2009
@@ -0,0 +1 @@
+test
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/target/classes/src/omit.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh?rev=827805&r1=827804&r2=827805&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/excludes-using-regex/verify.bsh
Tue Oct 20 21:28:08 2009
@@ -45,6 +45,22 @@
System.out.println( "target/omit.txt in child project was
included the jar." );
return false;
}
+
+ je = jf.getEntry( "parent-1.0/target/classes/src/omit.txt" );
+
+ if ( je != null )
+ {
+ System.out.println( "target/classes/src/omit.txt in parent
project was included the jar." );
+ return false;
+ }
+
+ je = jf.getEntry( "parent-1.0/child/target/classes/src/omit.txt" );
+
+ if ( je != null )
+ {
+ System.out.println( "target/classes/src/omit.txt in child
project was included the jar." );
+ return false;
+ }
}
catch( IOException e )
{
