github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-21 08:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
bloihl
2016-10-04 09:45:01 -07:00
parent 92a8b4ca85 128a600f18
commit 452969cc92
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dependency-check-core/src/main/resources/dependencycheck-base-suppression.xml
View File

@@ -434,4 +434,11 @@
<gav regex="true">^(?!com.thoughtworks).*xstream.*$</gav> <gav regex="true">^(?!com.thoughtworks).*xstream.*$</gav>
<cpe>cpe:/a:x-stream:xstream</cpe> <cpe>cpe:/a:x-stream:xstream</cpe>
</suppress> </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> </suppressions>

2
dependency-check-core/src/main/resources/templates/HtmlReport.vsl
View File

@@ -644,8 +644,8 @@ Getting Help: <a href="https://groups.google.com/forum/#!forum/dependency-check"
#end #end
<td data-sort-value="$sortValue"> <td data-sort-value="$sortValue">
#set($sortValue="") #set($sortValue="")
#foreach($id in $dependency.getIdentifiers())
#set($cpeSort=0) #set($cpeSort=0)
#foreach($id in $dependency.getIdentifiers())
#if ($id.type=="maven") #if ($id.type=="maven")
#if ($mavenlink=="" || !$mavenlink.url) #if ($mavenlink=="" || !$mavenlink.url)
#set($mavenlink=$id) #set($mavenlink=$id)