diff --git a/dependency-check-core/src/main/resources/schema/DependencyCheck.xsd b/dependency-check-core/src/main/resources/schema/dependency-check.1.3.xsd similarity index 98% rename from dependency-check-core/src/main/resources/schema/DependencyCheck.xsd rename to dependency-check-core/src/main/resources/schema/dependency-check.1.3.xsd index 896d1ab3e..aef762057 100644 --- a/dependency-check-core/src/main/resources/schema/DependencyCheck.xsd +++ b/dependency-check-core/src/main/resources/schema/dependency-check.1.3.xsd @@ -1,5 +1,5 @@ - + @@ -111,6 +111,8 @@ + + diff --git a/dependency-check-core/src/main/resources/templates/XmlReport.vsl b/dependency-check-core/src/main/resources/templates/XmlReport.vsl index 7a7049a0a..d771e1b2f 100644 --- a/dependency-check-core/src/main/resources/templates/XmlReport.vsl +++ b/dependency-check-core/src/main/resources/templates/XmlReport.vsl @@ -18,7 +18,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. @author Jeremy Long @version 1.1 *# - + $version #foreach($prop in $properties.getMetaData().entrySet()) @@ -68,8 +68,22 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. #end -#foreach($evidence in $dependency.getEvidenceForDisplay()) - +#foreach($evidence in $dependency.getVendorEvidence()) + + $enc.xml($evidence.getSource()) + $enc.xml($evidence.getName()) + $enc.xml($evidence.getValue().trim()) + +#end +#foreach($evidence in $dependency.getProductEvidence()) + + $enc.xml($evidence.getSource()) + $enc.xml($evidence.getName()) + $enc.xml($evidence.getValue().trim()) + +#end +#foreach($evidence in $dependency.getVersionEvidence()) + $enc.xml($evidence.getSource()) $enc.xml($evidence.getName()) $enc.xml($evidence.getValue().trim())