From 4a1d287e0f057a03c9b6b991a8d47a065e8f3040 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 3 Nov 2012 02:37:32 +0000 Subject: [PATCH] fixed encoding used when reading HelpMojo Velocity template git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1405266 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/tools/plugin/generator/PluginHelpGenerator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java index 9aeeeeb..dfc9d6f 100644 --- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java +++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java @@ -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 );