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 2009/05/28 00:42:58 UTC
svn commit: r779347 - in
/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex:
child/target/ child/target/omit.txt target/ target/omit.txt verify.bsh
Author: jdcasey
Date: Wed May 27 22:42:58 2009
New Revision: 779347
URL: http://svn.apache.org/viewvc?rev=779347&view=rev
Log:
Adjust the verification script to include the parent version in the assembly basedir, and also add some more test files that should be EXCLUDED in this test.
Added:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/target/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt (with props)
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/target/
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/target/omit.txt (with props)
Modified:
maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt?rev=779347&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt Wed May 27 22:42:58 2009
@@ -0,0 +1 @@
+test
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/child/target/omit.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/target/omit.txt
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/target/omit.txt?rev=779347&view=auto
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/target/omit.txt (added)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/target/omit.txt Wed May 27 22:42:58 2009
@@ -0,0 +1 @@
+test
Propchange: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/target/omit.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh?rev=779347&r1=779346&r2=779347&view=diff
==============================================================================
--- maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh (original)
+++ maven/plugins/branches/maven-assembly-plugin-2.2-beta-4/src/it/projects/file-sets/excludes-using-regex/verify.bsh Wed May 27 22:42:58 2009
@@ -14,7 +14,7 @@
}
JarFile jf = new JarFile( f );
- JarEntry je = jf.getEntry( "parent/src/main/java/org/test/target/file.properties" );
+ JarEntry je = jf.getEntry( "parent-1.0/src/main/java/org/test/target/file.properties" );
if ( je == null )
{
@@ -22,13 +22,29 @@
return false;
}
- je = jf.getEntry( "parent/child/src/main/resources/target/file.txt" );
+ je = jf.getEntry( "parent-1.0/child/src/main/resources/target/file.txt" );
if ( je == null )
{
System.out.println( "target/file.txt in child resources is missing from the jar." );
return false;
}
+
+ je = jf.getEntry( "parent-1.0/target/omit.txt" );
+
+ if ( je != null )
+ {
+ System.out.println( "target/omit.txt in parent project was included the jar." );
+ return false;
+ }
+
+ je = jf.getEntry( "parent-1.0/child/target/omit.txt" );
+
+ if ( je != null )
+ {
+ System.out.println( "target/omit.txt in child project was included the jar." );
+ return false;
+ }
}
catch( IOException e )
{