Merge remote-tracking branch 'upstream/master'

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 base="true">
+        <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>

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)