Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPDIST-20

Browse Source 
Submitted by: Phil Steitz
Fix combined javadoc classpath in dist:multiproject-bin.
New properties maven.dist.src.includes and maven.dist.bin.includes.
Removed the maven.dist.src.include property.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@447987 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-09-19 21:49:56 +00:00
parent 24b9662e6e
commit 81fd3cb557
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dist/plugin.jelly vendored
View File

@ -54,11 +54,7 @@
</ant:echo> </ant:echo>
<ant:copy todir="${maven.dist.bin.assembly.dir}"> <ant:copy todir="${maven.dist.bin.assembly.dir}">
<ant:fileset dir="."> <ant:fileset dir="." includes="${maven.dist.bin.includes}"/>
<ant:include name="README.txt"/>
<ant:include name="LICENSE*"/>
<ant:include name="NOTICE*"/>
</ant:fileset>
</ant:copy> </ant:copy>
<j:set var="binArtifactType" value="${maven.dist.bin.artifact.type}"/> <j:set var="binArtifactType" value="${maven.dist.bin.artifact.type}"/>
@ -141,16 +137,7 @@
<util:tokenize var="includelist" delim=",">${maven.dist.src.include}</util:tokenize> <util:tokenize var="includelist" delim=",">${maven.dist.src.include}</util:tokenize>
<ant:copy todir="${maven.dist.src.assembly.dir}"> <ant:copy todir="${maven.dist.src.assembly.dir}">
<ant:fileset dir="."> <ant:fileset dir="." includes="${maven.dist.src.includes}"/>
<ant:include name="README.txt"/>
<ant:include name="LICENSE*"/>
<ant:include name="NOTICE*"/>
<ant:include name="project.properties"/>
<ant:include name="maven.xml"/>
<j:forEach items="${includelist}" var="includeitem">
<ant:include name="${includeitem}" />
</j:forEach>
</ant:fileset>
</ant:copy> </ant:copy>
<!-- We can't use it in the bootstrap phase because classes aren't yet build in the artifact plugin. --> <!-- We can't use it in the bootstrap phase because classes aren't yet build in the artifact plugin. -->
@ -486,12 +473,7 @@
</ant:echo> </ant:echo>
<ant:copy todir="${maven.dist.bin.assembly.dir}"> <ant:copy todir="${maven.dist.bin.assembly.dir}">
<ant:fileset dir="."> <ant:fileset dir="." includes="${maven.dist.bin.includes}"/>
<ant:include name="README.txt"/>
<ant:include name="LICENSE*"/>
<ant:include name="NOTICE*"/>
<ant:include name="INCUBATOR-DISCLAIMER.txt"/>
</ant:fileset>
</ant:copy> </ant:copy>
<ant:echo> <ant:echo>
@ -538,10 +520,12 @@
<packageset dir="${project.build.sourceDirectory}"/> <packageset dir="${project.build.sourceDirectory}"/>
</j:if> </j:if>
</j:forEach> </j:forEach>
<j:useBean var="classPathBuilder" class="org.apache.maven.DependencyClasspathBuilder"/>
<classpath> <classpath>
<fileset dir="${basedir}"> <path location="${maven.build.dest}"/>
<include name="**/*.jar"/> <j:forEach var="project" items="${reactorProjects}">
</fileset> <pathelement path="${classPathBuilder.build(project)}"/>
</j:forEach>
</classpath> </classpath>
</javadoc> </javadoc>

4
dist/plugin.properties vendored
View File

@ -31,4 +31,6 @@ maven.dist.crlf.filter=**/*.txt
maven.dist.lf.filter= maven.dist.lf.filter=
maven.dist.bin.include.site=true maven.dist.bin.include.site=true
maven.dist.bin.artifact.type=jar maven.dist.bin.artifact.type=jar
maven.dist.formats=zip,tgz maven.dist.formats=zip,tgz
maven.dist.bin.includes=README*,LICENSE*,NOTICE*
maven.dist.src.includes=README*,LICENSE*,NOTICE*,project.properties,maven.xml,project.xml

2
dist/src/plugin-test/project.properties vendored
View File

@ -1 +1 @@
maven.dist.src.include=custom.txt,doesntexists.txt maven.dist.src.includes=maven.xml,project.properties,project.xml,custom.txt,doesntexists.txt

5
dist/xdocs/changes.xml vendored
View File

@ -24,6 +24,11 @@
</properties> </properties>
<body> <body>
<release version="1.7.1-SNAPSHOT" date="In SVN"> <release version="1.7.1-SNAPSHOT" date="In SVN">
<action dev="ltheussl" type="fix" issue="MPDIST-20" due-to="Phil Steitz">Fix combined javadoc classpath in <code>dist:multiproject-bin</code>.</action>
<action dev="ltheussl" type="update" issue="MPDIST-20" due-to="Phil Steitz">New
<code>maven.dist.src.includes</code> and <code>maven.dist.bin.includes</code> properties.
Removed the <code>maven.dist.src.include</code> property.
</action>
<action dev="ltheussl" type="fix"><code>dist:multiproject-bin</code> fails if one of the projects does not have any java sources.</action> <action dev="ltheussl" type="fix"><code>dist:multiproject-bin</code> fails if one of the projects does not have any java sources.</action>
<action dev="ltheussl" type="fix" issue="MPDIST-29">Source distribution archive has incorrect directory structure.</action> <action dev="ltheussl" type="fix" issue="MPDIST-29">Source distribution archive has incorrect directory structure.</action>
</release> </release>

19
dist/xdocs/properties.xml vendored
View File

@ -52,11 +52,6 @@
<td>yes - default is ${maven.dist.assembly.dir}/src/${maven.final.name}</td> <td>yes - default is ${maven.dist.assembly.dir}/src/${maven.final.name}</td>
<td>The directory where the sources are copied to so that it can be archived</td> <td>The directory where the sources are copied to so that it can be archived</td>
</tr> </tr>
<tr>
<td>maven.dist.src.include</td>
<td>yes</td>
<td>Comma delimited list of additional files which should be included in the source distribution</td>
</tr>
<tr> <tr>
<td>maven.dist.include.dirs</td> <td>maven.dist.include.dirs</td>
<td>yes</td> <td>yes</td>
@ -117,6 +112,20 @@
Possible values are tgz and zip. Possible values are tgz and zip.
</td> </td>
</tr> </tr>
<tr>
<td>maven.dist.bin.includes</td>
<td>yes - default is <code>README*,LICENSE*,NOTICE*</code>.</td>
<td>
A comma-separated list of files to include in the binary distribtion.
</td>
</tr>
<tr>
<td>maven.dist.src.includes</td>
<td>yes - default is <code>README*,LICENSE*,NOTICE*,project.properties,maven.xml,project.xml</code>.</td>
<td>
A comma-separated list of files to include in the source distribtion.
</td>
</tr>
</table> </table>
</section> </section>
</body> </body>