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 2008/09/19 01:57:40 UTC
svn commit: r696859 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/resources/assemblies/ site/apt/
Author: jdcasey
Date: Thu Sep 18 16:57:39 2008
New Revision: 696859
URL: http://svn.apache.org/viewvc?rev=696859&view=rev
Log:
cleaning up built-in descriptor refs, and documentation of these refs.
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml?rev=696859&r1=696858&r2=696859&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/bin.xml Thu Sep 18 16:57:39 2008
@@ -28,16 +28,14 @@
<fileSets>
<fileSet>
<includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
+ <include>${project.basedir}/README*</include>
+ <include>${project.basedir}/LICENSE*</include>
+ <include>${project.basedir}/NOTICE*</include>
</includes>
</fileSet>
<!-- TODO: docs? -->
<fileSet>
- <!-- TODO: use expresssions instead: ${project.build.directory}, ${project.build.finalName} -->
- <directory>target</directory>
- <outputDirectory></outputDirectory>
+ <directory>${project.build.directory}</directory>
<includes>
<include>*.jar</include>
</includes>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml?rev=696859&r1=696858&r2=696859&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/jar-with-dependencies.xml Thu Sep 18 16:57:39 2008
@@ -27,16 +27,14 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
- <outputDirectory></outputDirectory>
- <outputFileNameMapping></outputFileNameMapping>
+ <outputDirectory>/</outputDirectory>
<unpack>true</unpack>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
- <directory>target/classes</directory>
- <outputDirectory></outputDirectory>
+ <directory>${project.build.outputDirectory}</directory>
</fileSet>
</fileSets>
</assembly>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml?rev=696859&r1=696858&r2=696859&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/project.xml Thu Sep 18 16:57:39 2008
@@ -27,12 +27,10 @@
</formats>
<fileSets>
<fileSet>
- <!-- TODO: use expresssions instead: ${project.build.sourceDirectory}, etc -->
- <directory>.</directory>
- <outputDirectory></outputDirectory>
+ <directory>${project.basedir}</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
- <exclude>**/target/**</exclude>
+ <exclude>**/${project.build.directory}/**</exclude>
</excludes>
</fileSet>
</fileSets>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml?rev=696859&r1=696858&r2=696859&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/resources/assemblies/src.xml Thu Sep 18 16:57:39 2008
@@ -28,16 +28,16 @@
<fileSets>
<fileSet>
<includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>pom.xml</include>
+ <include>${project.basedir}/README*</include>
+ <include>${project.basedir}/LICENSE*</include>
+ <include>${project.basedir}/NOTICE*</include>
+ <include>${project.basedir}/pom.xml</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
<fileSet>
<!-- TODO: use expresssions instead: ${project.build.sourceDirectory}, etc -->
- <directory>src</directory>
+ <directory>${project.basedir}/src</directory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt?rev=696859&r1=696858&r2=696859&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/site/apt/descriptor-refs.apt Thu Sep 18 16:57:39 2008
@@ -70,14 +70,13 @@
<fileSets>
<fileSet>
<includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
+ <include>${project.basedir}/README*</include>
+ <include>${project.basedir}/LICENSE*</include>
+ <include>${project.basedir}/NOTICE*</include>
</includes>
</fileSet>
<fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
+ <directory>${project.build.directory}</directory>
<includes>
<include>*.jar</include>
</includes>
@@ -105,16 +104,13 @@
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
- <outputDirectory></outputDirectory>
- <outputFileNameMapping></outputFileNameMapping>
<unpack>true</unpack>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
- <directory>target/classes</directory>
- <outputDirectory></outputDirectory>
+ <directory>${project.build.outputDirectory}</directory>
</fileSet>
</fileSets>
</assembly>
@@ -141,15 +137,15 @@
<fileSets>
<fileSet>
<includes>
- <include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
- <include>pom.xml</include>
+ <include>${project.basedir}/README*</include>
+ <include>${project.basedir}/LICENSE*</include>
+ <include>${project.basedir}/NOTICE*</include>
+ <include>${project.basedir}/pom.xml</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
<fileSet>
- <directory>src</directory>
+ <directory>${project.basedir}/src</directory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
@@ -178,11 +174,10 @@
</formats>
<fileSets>
<fileSet>
- <directory>.</directory>
- <outputDirectory></outputDirectory>
+ <directory>${project.basedir}</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
- <exclude>**/target/**</exclude>
+ <exclude>${project.build.directory}/**</exclude>
</excludes>
</fileSet>
</fileSets>