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/08/12 23:21:15 UTC
svn commit: r803715 - in
/maven/resources/trunk/apache-source-release-assembly-descriptor/src:
main/resources/assemblies/ test/java/org/apache/its/
test/resources/misc-excludes/misc-excludes-child1/
test/resources/misc-excludes/misc-excludes-child2/
Author: jdcasey
Date: Wed Aug 12 21:21:14 2009
New Revision: 803715
URL: http://svn.apache.org/viewvc?rev=803715&view=rev
Log:
Fixing IT names, and removing .diff, .patch, .bak, .log file exclusions
Removed:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/misc-excludes-child1/debug.log
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/misc-excludes-child2/pom.xml.bak
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/misc-excludes-child2/pom.xml.diff
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/resources/misc-excludes/misc-excludes-child2/pom.xml.patch
Modified:
maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_004_IdeExcludes.java
maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml?rev=803715&r1=803714&r2=803715&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/main/resources/assemblies/source-release.xml Wed Aug 12 21:21:14 2009
@@ -60,12 +60,10 @@
<exclude>**/.deployables/**</exclude>
<exclude>**/.wtpmodules</exclude>
<exclude>**/.wtpmodules/**</exclude>
+
<!-- misc -->
<exclude>**/cobertura.ser</exclude>
- <exclude>**/*.bak</exclude>
- <exclude>**/*.diff</exclude>
- <exclude>**/*.patch</exclude>
- <exclude>**/*.log</exclude>
+
<!-- release-plugin temp files -->
<exclude>**/pom.xml.releaseBackup</exclude>
<exclude>**/release.properties</exclude>
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_004_IdeExcludes.java
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_004_IdeExcludes.java?rev=803715&r1=803714&r2=803715&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_004_IdeExcludes.java (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_004_IdeExcludes.java Wed Aug 12 21:21:14 2009
@@ -41,17 +41,28 @@
Set<String> banned = new HashSet<String>();
- banned.add( archivePathFromProject( BASENAME, VERSION, "/cobertura.ser" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/release.properties" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/debug.log" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/pom.xml.releaseBackup" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/.classpath" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/.project" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/maven-eclipse.xml" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/ide-excludes.iml" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/ide-excludes.ipr" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/ide-excludes.iws" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/.deployables" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/.settings" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/.wtpmodules" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/.externalToolBuilders" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/debug.log" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.classpath" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.project" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/maven-eclipse.xml" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.deployables" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.settings" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.wtpmodules" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.externalToolBuilders" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/cobertura.ser" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/pom.xml.bak" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/pom.xml.diff" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/pom.xml.patch" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/ide-excludes-child2.iml" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/ide-excludes-child2.ipr" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/ide-excludes-child2.iws" ) );
assertZipContents( required, banned, assembly );
}
Modified: maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java
URL: http://svn.apache.org/viewvc/maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java?rev=803715&r1=803714&r2=803715&view=diff
==============================================================================
--- maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java (original)
+++ maven/resources/trunk/apache-source-release-assembly-descriptor/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java Wed Aug 12 21:21:14 2009
@@ -41,28 +41,11 @@
Set<String> banned = new HashSet<String>();
- banned.add( archivePathFromProject( BASENAME, VERSION, "/.classpath" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/.project" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/maven-eclipse.xml" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/ide-excludes.iml" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/ide-excludes.ipr" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/ide-excludes.iws" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/.deployables" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/.settings" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/.wtpmodules" ) );
- banned.add( archivePathFromProject( BASENAME, VERSION, "/.externalToolBuilders" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/cobertura.ser" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/release.properties" ) );
+ banned.add( archivePathFromProject( BASENAME, VERSION, "/pom.xml.releaseBackup" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.classpath" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.project" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/maven-eclipse.xml" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.deployables" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.settings" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.wtpmodules" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child1", "/.externalToolBuilders" ) );
-
- banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/ide-excludes-child2.iml" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/ide-excludes-child2.ipr" ) );
- banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/ide-excludes-child2.iws" ) );
+ banned.add( archivePathFromChild( BASENAME, VERSION, "child2", "/cobertura.ser" ) );
assertZipContents( required, banned, assembly );
}