Author: hboutemy
Date: Sat Mar 26 16:58:19 2011
New Revision: 1085766

URL: http://svn.apache.org/viewvc?rev=1085766&view=rev
Log:
o fixed encoding used when reading pom file (XML detected instead of platform)
o removed reader descriptor leak

Modified:
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java?rev=1085766&r1=1085765&r2=1085766&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDuplicateMojo.java
 Sat Mar 26 16:58:19 2011
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.dependen
  */
 
 import java.io.FileReader;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -34,6 +35,8 @@ import org.apache.maven.plugin.AbstractM
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
 
 /**
  * Analyzes the <code>&lt;dependencies/&gt;</code> and 
<code>&lt;dependencyManagement/&gt;</code> tags in the
@@ -62,14 +65,20 @@ public class AnalyzeDuplicateMojo
     {
         MavenXpp3Reader pomReader = new MavenXpp3Reader();
         Model model = null;
+        Reader reader = null;
         try
         {
-            model = pomReader.read( new FileReader( project.getFile() ) );
+            reader = ReaderFactory.newXmlReader( project.getFile() );
+            model = pomReader.read( reader );
         }
         catch ( Exception e )
         {
             throw new MojoExecutionException( "IOException: " + 
e.getMessage(), e );
         }
+        finally
+        {
+            IOUtil.close( reader );
+        }
 
         Set<String> duplicateDependencies = new HashSet<String>();
         if ( model.getDependencies() != null )


Reply via email to