svn commit: r1396239 - in /maven/doxia/doxia-tools/trunk/doxia-converter: pom.xml src/main/java/org/apache/maven/doxia/DefaultConverter.java

[krosenvold]

Author: krosenvold
Date: Tue Oct  9 19:49:26 2012
New Revision: 1396239

URL: http://svn.apache.org/viewvc?rev=1396239&view=rev
Log:
o Switched to commons-io XmlReader

Modified:
    maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml
    
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java

Modified: maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml?rev=1396239&r1=1396238&r2=1396239&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml Tue Oct  9 19:49:26 
2012
@@ -129,6 +129,11 @@ under the License.
       <version>1.1</version>
     </dependency>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.2</version>
+    </dependency>
+    <dependency>
       <groupId>com.ibm.icu</groupId>
       <artifactId>icu4j</artifactId>
       <version>3.8</version>

Modified: 
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java?rev=1396239&r1=1396238&r2=1396239&view=diff
==============================================================================
--- 
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
 (original)
+++ 
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
 Tue Oct  9 19:49:26 2012
@@ -61,7 +61,7 @@ import org.codehaus.plexus.util.ReaderFa
 import org.codehaus.plexus.util.SelectorUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.WriterFactory;
-import org.codehaus.plexus.util.xml.XmlStreamReader;
+import org.apache.commons.io.input.XmlStreamReader;
 import org.codehaus.plexus.util.xml.XmlUtil;
 import org.codehaus.plexus.util.xml.pull.MXParser;
 import org.codehaus.plexus.util.xml.pull.XmlPullParser;
@@ -558,7 +558,7 @@ public class DefaultConverter
         {
             if ( XmlUtil.isXml( f ) )
             {
-                reader = ReaderFactory.newXmlReader( f );
+                reader = new XmlStreamReader( f );
                 return ( (XmlStreamReader) reader ).getEncoding();
             }