From 6a507f0f6bece53ff8b418b982d5c316d2c1401b Mon Sep 17 00:00:00 2001 From: aheritier Date: Fri, 24 Sep 2004 22:52:08 +0000 Subject: [PATCH] Fix MPJAVADOC-45 : Output encoding and charset are setted to ${maven.docs.outputencoding} git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116074 13f79535-47bb-0310-9956-ffa450edef68 --- javadoc/plugin.jelly | 5 +++++ javadoc/xdocs/changes.xml | 1 + javadoc/xdocs/properties.xml | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly index 6cd48f80..08722789 100644 --- a/javadoc/plugin.jelly +++ b/javadoc/plugin.jelly @@ -444,6 +444,11 @@ internal_javadoc_working_dir = [${internal_javadoc_working_dir}] + + + + + ${maven.javadoc.customtags} diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml index 8c8e44fb..43d96837 100644 --- a/javadoc/xdocs/changes.xml +++ b/javadoc/xdocs/changes.xml @@ -26,6 +26,7 @@ Standard doclet parameters were passed to javadoc even if another doclet is used. + Output encoding and charset are setted to ${maven.docs.outputencoding} Cannot build the plugin with jdk 1.3 Javadoc plugin causes site to fail Javadoc warning report was throwing exception when used with Java 1.3. diff --git a/javadoc/xdocs/properties.xml b/javadoc/xdocs/properties.xml index cc618823..76078de1 100644 --- a/javadoc/xdocs/properties.xml +++ b/javadoc/xdocs/properties.xml @@ -339,6 +339,14 @@ maven.javadoc.offlineLinks=http://java.sun.com/j2se/1.4.2/docs/api/#/opt/java-ap Sets the encoding of the .java files being documented (and compiled). + + Property + maven.docs.outputencoding + Yes + + The character encoding for generated documentation. + + Project descriptor pom.package