diff --git a/core/src/main/resources/schema/dependency-check.2.5.xsd b/core/src/main/resources/schema/dependency-check.2.5.xsd index f258e0661bc..9e18c373499 100644 --- a/core/src/main/resources/schema/dependency-check.2.5.xsd +++ b/core/src/main/resources/schema/dependency-check.2.5.xsd @@ -195,21 +195,6 @@ - - - - - - - - - - - - - - - diff --git a/core/src/main/resources/schema/dependency-check.3.1.xsd b/core/src/main/resources/schema/dependency-check.3.1.xsd new file mode 100644 index 00000000000..3866e7b4bb4 --- /dev/null +++ b/core/src/main/resources/schema/dependency-check.3.1.xsd @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/src/main/resources/templates/xmlReport.vsl b/core/src/main/resources/templates/xmlReport.vsl index b1e2018d645..d334e6597e7 100644 --- a/core/src/main/resources/templates/xmlReport.vsl +++ b/core/src/main/resources/templates/xmlReport.vsl @@ -19,7 +19,7 @@ Copyright (c) 2018 Jeremy Long. All Rights Reserved. @version 2.0 *# - + $version #foreach($prop in $properties.getMetaData().entrySet()) diff --git a/core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java b/core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java index d62abdc6fc4..c0f4f820b9c 100644 --- a/core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java +++ b/core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java @@ -198,7 +198,7 @@ public void generateReport(Settings settings, File writeTo, File writeJsonTo, Fi engine.writeReports("Test Report", "org.owasp", "dependency-check-core", "1.4.8", writeSarifTo, "SARIF", exceptions); } //Test XML - InputStream xsdStream = ReportGenerator.class.getClassLoader().getResourceAsStream("schema/dependency-check.3.0.xsd"); + InputStream xsdStream = ReportGenerator.class.getClassLoader().getResourceAsStream("schema/dependency-check.3.1.xsd"); StreamSource xsdSource = new StreamSource(xsdStream); StreamSource xmlSource = new StreamSource(writeTo); SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);