patch for issue #1109

jeremylong · Feb 24, 2018 · 185e99e · 185e99e
1 parent 2acb356
commit 185e99e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/core/src/main/resources/templates/htmlReport.vsl b/core/src/main/resources/templates/htmlReport.vsl
@@ -584,6 +584,9 @@ Getting Help: <a href="https://groups.google.com/forum/#!forum/dependency-check"
 <a href="https://github.com/jeremylong/DependencyCheck/issues" target="_blank">github issues</a></h3>
 ]]#
             <h2 class="">Project:&nbsp;$enc.html($applicationName)</h2>
+            #if ($groupID && $artifactID && $applicationVersion)
+            <h4>$enc.html($groupID):$enc.html($artifactID):$enc.html($applicationVersion)</h4>
+            #end
             <div class="">
                 #set($depCount=$dependencies.size())
                 #set($vulnDepCount=0)

diff --git a/core/src/main/resources/templates/jsonReport.vsl b/core/src/main/resources/templates/jsonReport.vsl
@@ -15,7 +15,7 @@
         "name": "$enc.json($applicationName)",
         #if($groupID)"groupID":"$enc.json($groupID)",#end
         #if($artifactID)"artifactID":"$enc.json($artifactID)",#end
-        #if($version)"version":"$enc.json($version)",#end
+        #if($applicationVersion)"version":"$enc.json($applicationVersion)",#end
         "reportDate": "$scanDateXML",
         "credits": {
             "NVD": "This report contains data retrieved from the National Vulnerability Database: http://nvd.nist.gov",

diff --git a/core/src/main/resources/templates/xmlReport.vsl b/core/src/main/resources/templates/xmlReport.vsl
@@ -37,8 +37,8 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
 #if ($artifactID)        
         <artifactID>$enc.xml($artifactID)</artifactID>
 #end
-#if ($version)
-        <version>$enc.xml($version)</version>
+#if ($applicationVersion)
+        <version>$enc.xml($applicationVersion)</version>
 #end
         <reportDate>$scanDateXML</reportDate>
         <credits>This report contains data retrieved from the National Vulnerability Database: https://nvd.nist.gov and from the Node Security Platform: https://nodesecurity.io</credits>