From 70e0c84a20b622a8c9bcff858f78f0889b0e6afa Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Tue, 7 Apr 2015 08:56:45 -0400
Subject: [PATCH] updated pom parsing to resolve issue #210

Former-commit-id: e1092139cc27a01fba8ecfa37aa3904ee96154e6
---
 .../owasp/dependencycheck/xml/pom/PomParser.java |  4 ++--
 .../owasp/dependencycheck/xml/pom/PomUtils.java  |  2 +-
 .../dependencycheck/xml/pom/PomUtilsTest.java    | 16 +---------------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParser.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParser.java
index 98f54f8a9..493995909 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParser.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomParser.java
@@ -83,8 +83,8 @@ public class PomParser {
         try {
             final PomHandler handler = new PomHandler();
             final SAXParserFactory factory = SAXParserFactory.newInstance();
-            factory.setNamespaceAware(true);
-            factory.setValidating(true);
+//            factory.setNamespaceAware(true);
+//            factory.setValidating(true);
             final SAXParser saxParser = factory.newSAXParser();
             final XMLReader xmlReader = saxParser.getXMLReader();
             xmlReader.setContentHandler(handler);
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomUtils.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomUtils.java
index 00e9dc937..2fee221c0 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomUtils.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/xml/pom/PomUtils.java
@@ -56,7 +56,7 @@ public final class PomUtils {
         Model model = null;
         try {
             PomParser parser = new PomParser();
-            parser.parse(file);
+            model = parser.parse(file);
         } catch (PomParseException ex) {
             final String msg = String.format("Unable to parse pom '%s'", file.getPath());
             LOGGER.log(Level.WARNING, msg);
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java
index d1c81179a..c4ceeff19 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/xml/pom/PomUtilsTest.java
@@ -58,24 +58,10 @@ public class PomUtilsTest {
      */
     @Test
     public void testReadPom_File() throws Exception {
-        File file = BaseTest.getResourceAsFile(this, "dwr-xml.pom");
-
+        File file = BaseTest.getResourceAsFile(this, "dwr-pom.xml");
         String expResult = "Direct Web Remoting";
         Model result = PomUtils.readPom(file);
         assertEquals(expResult, result.getName());
     }
 
-//    /**
-//     * Test of analyzePOM method, of class PomUtils.
-//     */
-//    @Test
-//    public void testAnalyzePOM() throws Exception {
-//        System.out.println("analyzePOM");
-//        Dependency dependency = null;
-//        File pomFile = null;
-//        PomUtils instance = new PomUtils();
-//        instance.analyzePOM(dependency, pomFile);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
 }