You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/07/01 06:04:12 UTC
svn commit: r790034 - in
/maven/components/branches/maven-2.2.x/apache-maven: pom.xml
src/assemble/source-release.xml src/assemble/src.xml
Author: brett
Date: Wed Jul 1 04:04:11 2009
New Revision: 790034
URL: http://svn.apache.org/viewvc?rev=790034&view=rev
Log:
merge the dual source descriptors to use best of both.
Removed:
maven/components/branches/maven-2.2.x/apache-maven/src/assemble/source-release.xml
Modified:
maven/components/branches/maven-2.2.x/apache-maven/pom.xml
maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml
Modified: maven/components/branches/maven-2.2.x/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/apache-maven/pom.xml?rev=790034&r1=790033&r2=790034&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.x/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.2.x/apache-maven/pom.xml Wed Jul 1 04:04:11 2009
@@ -219,7 +219,6 @@
<configuration>
<descriptors>
<descriptor>src/assemble/src.xml</descriptor>
- <descriptor>src/assemble/source-release.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
Modified: maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml?rev=790034&r1=790033&r2=790034&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml (original)
+++ maven/components/branches/maven-2.2.x/apache-maven/src/assemble/src.xml Wed Jul 1 04:04:11 2009
@@ -22,26 +22,26 @@
<formats>
<format>zip</format>
<format>tar.gz</format>
- <format>tar.bz2</format>
</formats>
<fileSets>
<fileSet>
- <directory>..</directory>
+ <directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<excludes>
- <exclude>**/target/**</exclude>
+ <exclude>%regex[(?!.*src/).*target.*]</exclude>
<exclude>**/*.log</exclude>
</excludes>
</fileSet>
<fileSet>
- <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>DEPENDENCIES</include>
+ <!-- exclude the license and notice as they are not as accurate as the ones below -->
</includes>
</fileSet>
<fileSet>
- <directory>.</directory>
+ <directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>LICENSE.txt</include>