From c9364e7b94e08968ce60b5150901c1eb00907228 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 20 Apr 2013 14:41:08 -0400 Subject: [PATCH] added a schema for the dependency-check XML report Former-commit-id: a1ddac261454dd46e4d875c0de451db943db3674 --- src/main/resources/schema/DependencyCheck.xsd | 163 ++++++++++++++++++ src/main/resources/templates/XmlReport.vsl | 23 ++- 2 files changed, 180 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/schema/DependencyCheck.xsd diff --git a/src/main/resources/schema/DependencyCheck.xsd b/src/main/resources/schema/DependencyCheck.xsd new file mode 100644 index 000000000..71688d96d --- /dev/null +++ b/src/main/resources/schema/DependencyCheck.xsd @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/XmlReport.vsl b/src/main/resources/templates/XmlReport.vsl index dbfcfa6f8..9101e125f 100644 --- a/src/main/resources/templates/XmlReport.vsl +++ b/src/main/resources/templates/XmlReport.vsl @@ -16,14 +16,14 @@ along with DependencyCheck. If not, see http://www.gnu.org/licenses/. Copyright (c) 2012 Jeremy Long. All Rights Reserved. -* @author Jeremy Long (jeremy.long@gmail.com) +@author Jeremy Long (jeremy.long@gmail.com) @version 1 -*# - - +*# + $esc.html($applicationName) $date + This report contains data retrieved from the National Vulnerability Database: http://nvd.nist.gov #foreach($dependency in $dependencies) @@ -38,6 +38,17 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. #if ($dependency.license) $esc.html($dependency.license) #end +#if ($dependency.getRelatedDependencies().size()>0) + +#foreach($related in $dependency.getRelatedDependencies()) + + $esc.html($related.FilePath) + $esc.html($related.Sha1sum) + $esc.html($related.Md5sum) + +#end + +#end #if ( $dependency.analysisExceptions.size() != 0 ) #foreach($ex in $dependency.analysisExceptions) @@ -71,7 +82,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. $esc.html($evidence.getSource()) $esc.html($evidence.getName()) - $esc.html($evidence.getValue()) + $esc.html($evidence.getValue().trim()) #end @@ -110,7 +121,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. $esc.html($ref.source) $esc.html($ref.url) - $ref.name + $esc.html($ref.name) #end