[MJAVADOC-355] Encoding problem if platform encoding used to run Maven is different from default platform encoding.
revert r1720609 and r1720589
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-javadoc-plugin@1747276 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
index 5db48c5..0230400 100644
--- a/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
@@ -1984,16 +1984,12 @@
// 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 );
}
@@ -2001,19 +1997,10 @@
{
for ( String jo : additionalJOptions )
{
- if ( !fileEncodingSeen )
- {
- fileEncodingSeen = jo.contains( "-J-Dfile.encoding=" );
- }
cmd.createArg().setValue( jo );
}
}
- if ( !fileEncodingSeen )
- {
- cmd.createArg().setValue( "-J-Dfile.encoding=" + ReaderFactory.FILE_ENCODING );
- }
-
List<String> arguments = new ArrayList<String>();
// ----------------------------------------------------------------------
