You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2015/12/17 17:15:10 UTC
svn commit: r1720609 -
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: schulte
Date: Thu Dec 17 16:15:10 2015
New Revision: 1720609
URL: http://svn.apache.org/viewvc?rev=1720609&view=rev
Log:
[MJAVADOC-355] Encoding problem if platform encoding used to run Maven is different from default platform encoding.
o Updated to preserve user supplied 'file.enconding' values.
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1720609&r1=1720608&r2=1720609&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Thu Dec 17 16:15:10 2015
@@ -1984,12 +1984,16 @@ public abstract class AbstractJavadocMoj
// Wrap Javadoc JVM args
// ----------------------------------------------------------------------
+ boolean fileEncodingSeen = false;
+
addMemoryArg( cmd, "-Xmx", this.maxmemory );
addMemoryArg( cmd, "-Xms", this.minmemory );
addProxyArg( cmd );
if ( StringUtils.isNotEmpty( additionalJOption ) )
{
+ fileEncodingSeen = this.additionalJOption.contains( "-J-Dfile.encoding=" );
+
cmd.createArg().setValue( additionalJOption );
}
@@ -1997,11 +2001,18 @@ public abstract class AbstractJavadocMoj
{
for ( String jo : additionalJOptions )
{
+ if ( !fileEncodingSeen )
+ {
+ fileEncodingSeen = jo.contains( "-J-Dfile.encoding=" );
+ }
cmd.createArg().setValue( jo );
}
}
- cmd.createArg().setValue( "-J-Dfile.encoding=" + ReaderFactory.FILE_ENCODING );
+ if ( !fileEncodingSeen )
+ {
+ cmd.createArg().setValue( "-J-Dfile.encoding=" + ReaderFactory.FILE_ENCODING );
+ }
List<String> arguments = new ArrayList<String>();