From ed9e0c3b686d7d57d3b9bb9c30ce0b3ea1a1c56d Mon Sep 17 00:00:00 2001 From: ltheussl Date: Fri, 9 Jun 2006 23:11:57 +0000 Subject: [PATCH] PR: MPDIST-26 Allow distribution of artifact types other than jar. New property maven.dist.bin.artifact.type, deprecated property maven.dist.bin.artifact. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@413190 13f79535-47bb-0310-9956-ffa450edef68 --- dist/plugin.jelly | 25 ++++++++++++++++++++++++- dist/plugin.properties | 3 ++- dist/xdocs/changes.xml | 1 + dist/xdocs/properties.xml | 15 ++++++++++++++- 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dist/plugin.jelly b/dist/plugin.jelly index e63b306d..3f4bc370 100644 --- a/dist/plugin.jelly +++ b/dist/plugin.jelly @@ -34,7 +34,6 @@ diff --git a/dist/plugin.properties b/dist/plugin.properties index ab870a72..94e99e80 100644 --- a/dist/plugin.properties +++ b/dist/plugin.properties @@ -26,7 +26,8 @@ maven.dist.src.archive.dir=${maven.dist.assembly.dir}/src maven.dist.bin.assembly.dir=${maven.dist.assembly.dir}/bin/${maven.final.name} maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name} maven.dist.dir=${maven.build.dir}/distributions -maven.dist.bin.artifact=${maven.final.name}.jar +#maven.dist.bin.artifact=${maven.final.name}.jar maven.dist.crlf.filter=**/*.txt maven.dist.lf.filter= maven.dist.bin.include.site=true +maven.dist.bin.artifact.type=jar \ No newline at end of file diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml index 3f9cd8d2..1d66c504 100644 --- a/dist/xdocs/changes.xml +++ b/dist/xdocs/changes.xml @@ -25,6 +25,7 @@ + Allow distribution of artifact types other than jar. New property maven.dist.bin.artifact.type, deprecated property maven.dist.bin.artifact. New property maven.dist.bin.include.site to optionally include the site docs in the binary distribution. build-src goal does not use pom.build.sourceDirectory. Fix compatibility with the version of ant plugin newer or equal to 1.10. diff --git a/dist/xdocs/properties.xml b/dist/xdocs/properties.xml index cc6bfb38..093ce6a7 100644 --- a/dist/xdocs/properties.xml +++ b/dist/xdocs/properties.xml @@ -65,7 +65,20 @@ maven.dist.bin.artifact yes - default is ${maven.final.name}.jar. - The name of the binary artifact to include in distribution, relative to target dir. + + DEPRECATED: this property is not used anymore. + The name of the binary artifact depends on its type + and is given by + ${maven.[jar,ear,rar,war,ejb].final.name}. + + + + maven.dist.bin.artifact.type + yes - default is jar. + + The type of artifact to be included in the binary distribution. + Possible values are jar, rar, war, ear and ejb. + maven.dist.bin.include.site