You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/09/19 23:49:57 UTC
svn commit: r447987 - in /maven/maven-1/plugins/trunk/dist: plugin.jelly
plugin.properties src/plugin-test/project.properties xdocs/changes.xml
xdocs/properties.xml
Author: ltheussl
Date: Tue Sep 19 14:49:56 2006
New Revision: 447987
URL: http://svn.apache.org/viewvc?view=rev&rev=447987
Log:
PR: MPDIST-20
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.
Modified:
maven/maven-1/plugins/trunk/dist/plugin.jelly
maven/maven-1/plugins/trunk/dist/plugin.properties
maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties
maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
maven/maven-1/plugins/trunk/dist/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/dist/plugin.jelly
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/plugin.jelly?view=diff&rev=447987&r1=447986&r2=447987
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Tue Sep 19 14:49:56 2006
@@ -54,11 +54,7 @@
</ant:echo>
<ant:copy todir="${maven.dist.bin.assembly.dir}">
- <ant:fileset dir=".">
- <ant:include name="README.txt"/>
- <ant:include name="LICENSE*"/>
- <ant:include name="NOTICE*"/>
- </ant:fileset>
+ <ant:fileset dir="." includes="${maven.dist.bin.includes}"/>
</ant:copy>
<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>
<ant:copy todir="${maven.dist.src.assembly.dir}">
- <ant:fileset dir=".">
- <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:fileset dir="." includes="${maven.dist.src.includes}"/>
</ant:copy>
<!-- 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:copy todir="${maven.dist.bin.assembly.dir}">
- <ant:fileset dir=".">
- <ant:include name="README.txt"/>
- <ant:include name="LICENSE*"/>
- <ant:include name="NOTICE*"/>
- <ant:include name="INCUBATOR-DISCLAIMER.txt"/>
- </ant:fileset>
+ <ant:fileset dir="." includes="${maven.dist.bin.includes}"/>
</ant:copy>
<ant:echo>
@@ -538,10 +520,12 @@
<packageset dir="${project.build.sourceDirectory}"/>
</j:if>
</j:forEach>
+ <j:useBean var="classPathBuilder" class="org.apache.maven.DependencyClasspathBuilder"/>
<classpath>
- <fileset dir="${basedir}">
- <include name="**/*.jar"/>
- </fileset>
+ <path location="${maven.build.dest}"/>
+ <j:forEach var="project" items="${reactorProjects}">
+ <pathelement path="${classPathBuilder.build(project)}"/>
+ </j:forEach>
</classpath>
</javadoc>
Modified: maven/maven-1/plugins/trunk/dist/plugin.properties
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/plugin.properties?view=diff&rev=447987&r1=447986&r2=447987
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.properties Tue Sep 19 14:49:56 2006
@@ -31,4 +31,6 @@
maven.dist.lf.filter=
maven.dist.bin.include.site=true
maven.dist.bin.artifact.type=jar
-maven.dist.formats=zip,tgz
\ No newline at end of file
+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
Modified: maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties?view=diff&rev=447987&r1=447986&r2=447987
==============================================================================
--- maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties (original)
+++ maven/maven-1/plugins/trunk/dist/src/plugin-test/project.properties Tue Sep 19 14:49:56 2006
@@ -1 +1 @@
-maven.dist.src.include=custom.txt,doesntexists.txt
+maven.dist.src.includes=maven.xml,project.properties,project.xml,custom.txt,doesntexists.txt
Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?view=diff&rev=447987&r1=447986&r2=447987
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Tue Sep 19 14:49:56 2006
@@ -24,6 +24,11 @@
</properties>
<body>
<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" issue="MPDIST-29">Source distribution archive has incorrect directory structure.</action>
</release>
Modified: maven/maven-1/plugins/trunk/dist/xdocs/properties.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/properties.xml?view=diff&rev=447987&r1=447986&r2=447987
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/properties.xml Tue Sep 19 14:49:56 2006
@@ -53,11 +53,6 @@
<td>The directory where the sources are copied to so that it can be archived</td>
</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>
<td>maven.dist.include.dirs</td>
<td>yes</td>
<td>
@@ -115,6 +110,20 @@
<td>
A comma-separated list of distribution formats to build.
Possible values are tgz and zip.
+ </td>
+ </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>