From ff341b7228db08e3e40b378398cd552001538df2 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Tue, 4 Oct 2016 06:19:41 -0400
Subject: [PATCH 1/3] corrected false positive per issue #582

---
 .../main/resources/dependencycheck-base-suppression.xml    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml b/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml
index 4496840ac..54b0f49f1 100644
--- a/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml
+++ b/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml
@@ -434,4 +434,11 @@
         <gav regex="true">^(?!com.thoughtworks).*xstream.*$</gav>
         <cpe>cpe:/a:x-stream:xstream</cpe>
     </suppress>
+    <suppress>
+        <notes><![CDATA[
+        false positive per issue #582
+        ]]></notes>
+        <gav regex="true">^org\.glassfish\.jersey\.ext:jersey-proxy-client:.*$</gav>
+        <cpe>cpe:/a:oracle:oracle_client</cpe>
+    </suppress>
 </suppressions>

From 7dd9a52e78f372dbcef240346796feb735af74a9 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Tue, 4 Oct 2016 06:20:34 -0400
Subject: [PATCH 2/3] corrected false positive per issue #582

---
 .../src/main/resources/dependencycheck-base-suppression.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml b/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml
index 54b0f49f1..55231e8e8 100644
--- a/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml
+++ b/dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml
@@ -434,7 +434,7 @@
         <gav regex="true">^(?!com.thoughtworks).*xstream.*$</gav>
         <cpe>cpe:/a:x-stream:xstream</cpe>
     </suppress>
-    <suppress>
+    <suppress base="true">
         <notes><![CDATA[
         false positive per issue #582
         ]]></notes>

From 128a600f182a9bd3fff6b63c54f9e0b44fb2b65f Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Tue, 4 Oct 2016 06:45:17 -0400
Subject: [PATCH 3/3] fixed issue with cpeSort being null on first row if no
 CPE is present

---
 .../src/main/resources/templates/HtmlReport.vsl                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependency-check-core/src/main/resources/templates/HtmlReport.vsl b/dependency-check-core/src/main/resources/templates/HtmlReport.vsl
index b62cd39b4..8f6724209 100644
--- a/dependency-check-core/src/main/resources/templates/HtmlReport.vsl
+++ b/dependency-check-core/src/main/resources/templates/HtmlReport.vsl
@@ -644,8 +644,8 @@ Getting Help: <a href="https://groups.google.com/forum/#!forum/dependency-check"
                         #end
                         <td data-sort-value="$sortValue">
                         #set($sortValue="")
+                        #set($cpeSort=0)
                         #foreach($id in $dependency.getIdentifiers())
-                            #set($cpeSort=0)
                             #if ($id.type=="maven")
                                 #if ($mavenlink=="" || !$mavenlink.url)
                                     #set($mavenlink=$id)