You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/11/03 03:37:33 UTC
svn commit: r1405266 -
/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
Author: hboutemy
Date: Sat Nov 3 02:37:32 2012
New Revision: 1405266
URL: http://svn.apache.org/viewvc?rev=1405266&view=rev
Log:
fixed encoding used when reading HelpMojo Velocity template
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java?rev=1405266&r1=1405265&r2=1405266&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java Sat Nov 3 02:37:32 2012
@@ -50,6 +50,7 @@ import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Properties;
@@ -195,9 +196,13 @@ public class PluginHelpGenerator
InputStreamReader isReader = null;
try
{
- isReader = new InputStreamReader( is ); // FIXME platform encoding
+ isReader = new InputStreamReader( is, "UTF-8" ); // plugin-tools sources are UTF-8 (and even ASCII in this case)
velocityComponent.getEngine().evaluate( context, stringWriter, "", isReader );
}
+ catch ( UnsupportedEncodingException e )
+ {
+ // not supposed to happen since UTF-8 is supposed to be supported by any JVM
+ }
finally
{
IOUtil.close( is );