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/05/26 22:56:05 UTC
svn commit: r1342963 - in /maven/plugin-tools/trunk: maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/ maven-plugin-plugin/src/it/help-basic/ maven-plugin-plugin/src/it/help-package/ maven-plugin-tools-generators/src/main/resources/

Author: hboutemy
Date: Sat May 26 20:56:04 2012
New Revision: 1342963

URL: http://svn.apache.org/viewvc?rev=1342963&view=rev
Log:
read plugin-help.xml with encoding detection

Modified:
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-basic/pom.xml
    maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml
    maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml?rev=1342963&r1=1342962&r2=1342963&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/pom.xml Sat May 26 20:56:04 2012
@@ -84,6 +84,11 @@ under the License.
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>3.0.1</version>
+    </dependency>
   </dependencies>
 
   <build>

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-basic/pom.xml?rev=1342963&r1=1342962&r2=1342963&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-basic/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-basic/pom.xml Sat May 26 20:56:04 2012
@@ -45,7 +45,6 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>3.0.1</version>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 

Modified: maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml?rev=1342963&r1=1342962&r2=1342963&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/src/it/help-package/pom.xml Sat May 26 20:56:04 2012
@@ -45,7 +45,6 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>3.0.1</version>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 

Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm?rev=1342963&r1=1342962&r2=1342963&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm Sat May 26 20:56:04 2012
@@ -4,6 +4,7 @@ package ${helpPackageName};
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -93,7 +94,7 @@ public class HelpMojo
         InputStream is = getClass().getResourceAsStream( pluginHelpPath );
         try
         {
-            return Xpp3DomBuilder.build( is, "ISO-8859-1" );
+            return Xpp3DomBuilder.build( ReaderFactory.newXmlReader( is ) );
         }
         catch ( XmlPullParserException e )
         {
@@ -122,7 +123,6 @@ public class HelpMojo
             indentSize = 2;
         }
 
-        // FIXME encoding as parameter
         Xpp3Dom pluginElement = build();
 
         StringBuilder sb = new StringBuilder();