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
This commit is contained in:
@@ -444,6 +444,11 @@ internal_javadoc_working_dir = [${internal_javadoc_working_dir}]
|
||||
<ant:setProperty name="stylesheetfile" value="${maven.javadoc.stylesheet}" />
|
||||
</j:if>
|
||||
|
||||
<j:if test="${context.getVariable('maven.docs.outputencoding') != null}">
|
||||
<ant:setProperty name="docencoding" value="${maven.docs.outputencoding}" />
|
||||
<ant:setProperty name="charset" value="${maven.docs.outputencoding}" />
|
||||
</j:if>
|
||||
|
||||
<!-- allow custom tags -->
|
||||
<util:tokenize var="listOfTags" delim=" ">${maven.javadoc.customtags}</util:tokenize>
|
||||
<j:forEach var="someTag" items="${listOfTags}">
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
<body>
|
||||
<release version="1.7-SNAPSHOT" date="In CVS">
|
||||
<action dev="aheritier" type="fix" issue="MPJAVADOC-46">Standard doclet parameters were passed to javadoc even if another doclet is used.</action>
|
||||
<action dev="aheritier" type="add" issue="MPJAVADOC-45">Output encoding and charset are setted to ${maven.docs.outputencoding}</action>
|
||||
<action dev="aheritier" type="fix" issue="MPJAVADOC-44">Cannot build the plugin with jdk 1.3</action>
|
||||
<action dev="aheritier" type="fix" issue="MPJAVADOC-43">Javadoc plugin causes site to fail </action>
|
||||
<action dev="felipeal" type="fix" issue="MPJAVADOC-42">Javadoc warning report was throwing exception when used with <code>Java 1.3</code>.</action>
|
||||
|
||||
@@ -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).
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Property</td>
|
||||
<td>maven.docs.outputencoding</td>
|
||||
<td>Yes</td>
|
||||
<td>
|
||||
The character encoding for generated documentation.
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Project descriptor</td>
|
||||
<td>pom.package</td>
|
||||
|
||||
Reference in New Issue
Block a user