carlos 2004/08/13 13:16:53
Modified: javadoc plugin.jelly
javadoc/xdocs properties.xml changes.xml
Added: javadoc/src/plugin-test/test05 project.properties
Log:
Added maven.javadoc.copyright property
Revision Changes Path
1.53 +4 -2 maven-plugins/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.jelly,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- plugin.jelly 29 Jul 2004 22:59:24 -0000 1.52
+++ plugin.jelly 13 Aug 2004 20:16:53 -0000 1.53
@@ -247,8 +247,10 @@
</j:choose>
</ant:tstamp>
- <ant:property name="copyright"
- value="Copyright &copy; ${year} ${pom.organization.name}. All Rights
Reserved." />
+ <maven:property var="copyrightNotice" name="maven.javadoc.copyright"
+ defaultValue="Copyright &copy; ${year} ${pom.organization.name}. All
Rights Reserved."/>
+
+ <ant:property name="copyright" value="${copyrightNotice}" />
<!-- calculate online/offline mode -->
<j:set var="online" value="${maven.javadoc.mode.online}"/>
1.20 +10 -0 maven-plugins/javadoc/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/properties.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- properties.xml 29 Jul 2004 22:59:24 -0000 1.19
+++ properties.xml 13 Aug 2004 20:16:53 -0000 1.20
@@ -311,6 +311,16 @@
expand to values obtained from the project descriptor.
</td>
</tr>
+ <tr>
+ <td>maven.javadoc.copyright</td>
+ <td>Yes</td>
+ <td>
+ Specifies the copyright notice. The default value is
+ <source>Copyright ${year} ${pom.organization.name}. All Rights
Reserved.</source>
+ <code>${pom.organization.name}</code>
+ expand to value obtained from the project descriptor.
+ </td>
+ </tr>
</table>
</section>
<section name="Other Settings">
1.45 +2 -1 maven-plugins/javadoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/xdocs/changes.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- changes.xml 29 Jul 2004 22:59:24 -0000 1.44
+++ changes.xml 13 Aug 2004 20:16:53 -0000 1.45
@@ -25,7 +25,8 @@
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
- <release version="1.7" date="In CVS">
+ <release version="1.7-SNAPSHOT" date="In CVS">
+ <action dev="carlos" type="add" issue="MPJAVADOC-39">Added
maven.javadoc.copyright property</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-37">Default javadoc scope
(package) can't be replaced by private or public.</action>
<action dev="aheritier" type="fix" issue="MPJAVADOC-36">Javadoc fails if
pom.package isn't specified.</action>
</release>
1.1 maven-plugins/javadoc/src/plugin-test/test05/project.properties
Index: project.properties
===================================================================
maven.javadoc.copyright=another copyright
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
