From 4d925ecea554d641fd70748d9103b204e9643596 Mon Sep 17 00:00:00 2001 From: aheritier Date: Sat, 21 Aug 2004 14:37:41 +0000 Subject: [PATCH] Replace maven.javadoc.copyright by maven.javadoc.bottom git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115987 13f79535-47bb-0310-9956-ffa450edef68 --- javadoc/plugin.jelly | 6 +++--- javadoc/plugin.properties | 2 +- .../src/plugin-test/test04/project.properties | 2 +- .../src/plugin-test/test05/project.properties | 2 +- javadoc/xdocs/changes.xml | 2 +- javadoc/xdocs/properties.xml | 20 +++++++++---------- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly index 04ba99ff..75e40b76 100644 --- a/javadoc/plugin.jelly +++ b/javadoc/plugin.jelly @@ -56,7 +56,7 @@ maven.compile.src.set = [${context.getAntProject().getReferences().g maven.javadoc.additionalparam = [${maven.javadoc.additionalparam}] maven.javadoc.author = [${maven.javadoc.author}] maven.javadoc.customtags = [${maven.javadoc.customtags}] -maven.javadoc.copyright = [${maven.javadoc.copyright}] +maven.javadoc.bottom = [${maven.javadoc.bottom}] maven.javadoc.debug = [${maven.javadoc.debug}] maven.javadoc.destdir = [${maven.javadoc.destdir}] maven.javadoc.doclet = [${maven.javadoc.doclet}] @@ -316,8 +316,8 @@ internal.javadoc.working.dir = [${internal.javadoc.working.dir}] - - + + diff --git a/javadoc/plugin.properties b/javadoc/plugin.properties index c37290b3..40ca648e 100644 --- a/javadoc/plugin.properties +++ b/javadoc/plugin.properties @@ -22,7 +22,7 @@ #maven.javadoc.additionalparam maven.javadoc.author = true -maven.javadoc.copyright = Copyright © ${year} ${pom.organization.name}. All Rights Reserved. +maven.javadoc.bottom = Copyright © ${year} ${pom.organization.name}. All Rights Reserved. #maven.javadoc.customtags = maven.javadoc.debug = false maven.javadoc.destdir = ${maven.docs.dest}/apidocs diff --git a/javadoc/src/plugin-test/test04/project.properties b/javadoc/src/plugin-test/test04/project.properties index 6a69be1e..dae915c1 100644 --- a/javadoc/src/plugin-test/test04/project.properties +++ b/javadoc/src/plugin-test/test04/project.properties @@ -1,2 +1,2 @@ #Test another copyright -maven.javadoc.copyright=another copyright \ No newline at end of file +maven.javadoc.bottom=another copyright \ No newline at end of file diff --git a/javadoc/src/plugin-test/test05/project.properties b/javadoc/src/plugin-test/test05/project.properties index 360c77f3..9d8bc221 100644 --- a/javadoc/src/plugin-test/test05/project.properties +++ b/javadoc/src/plugin-test/test05/project.properties @@ -1,2 +1,2 @@ #Test to remove the copyrigth -maven.javadoc.copyright= \ No newline at end of file +maven.javadoc.bottom= \ No newline at end of file diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml index 932c986a..b83eb7eb 100644 --- a/javadoc/xdocs/changes.xml +++ b/javadoc/xdocs/changes.xml @@ -26,7 +26,7 @@ - Added maven.javadoc.copyright property + Added maven.javadoc.bottom property Default javadoc scope (package) can't be replaced by private or public. Javadoc fails if pom.package isn't specified. diff --git a/javadoc/xdocs/properties.xml b/javadoc/xdocs/properties.xml index 4548f618..cc618823 100644 --- a/javadoc/xdocs/properties.xml +++ b/javadoc/xdocs/properties.xml @@ -50,6 +50,16 @@ maven.javadoc.additionalparam=-charset utf-8 The default value is true. + + maven.javadoc.bottom + Yes + + Specifies the text to be placed at the bottom of each output file. The default value is + Copyright ${year} ${pom.organization.name}. All Rights Reserved. + ${pom.organization.name} + expand to value obtained from the project descriptor. + + maven.javadoc.customtags Yes @@ -311,16 +321,6 @@ maven.javadoc.offlineLinks=http://java.sun.com/j2se/1.4.2/docs/api/#/opt/java-ap expand to values obtained from the project descriptor. - - maven.javadoc.copyright - Yes - - Specifies the copyright notice. The default value is - Copyright ${year} ${pom.organization.name}. All Rights Reserved. - ${pom.organization.name} - expand to value obtained from the project descriptor. - -