Note: failures are anticipated and checked for with assertions while errors are unanticipated.
Files
@@ -277,11 +277,6 @@
0
2
-org/owasp/dependencycheck/data/update/task/DownloadTask.java
-0
-0
-1
-
org/owasp/dependencycheck/dependency/Dependency.java
0
0
@@ -291,63 +286,52 @@
org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java
-
+
Violation
Message
Line
-
+
Total number of methods is 70 (max allowed is 40).
60
org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
-
+
Violation
Message
Line
-
+
Inner assignments should be avoided.
124
-
+
Must have at least one statement.
239
org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java
-
+
Violation
Message
Line
-
+
Variable 'file' should be declared final.
114
-
+
Variable 'sb' should be declared final.
116
-
org/owasp/dependencycheck/data/update/task/DownloadTask.java
-
-
-Violation
-Message
-Line
-
-
-Variable 'gzip' should be declared final.
-264
-
org/owasp/dependencycheck/dependency/Dependency.java
-
+
Violation
Message
Line
-
+
Total number of methods is 49 (max allowed is 40).
40
diff --git a/dependency-check-core/checkstyle.rss b/dependency-check-core/checkstyle.rss
index 1d0ed9941..816ad93d4 100644
--- a/dependency-check-core/checkstyle.rss
+++ b/dependency-check-core/checkstyle.rss
@@ -25,8 +25,8 @@ under the License.
en-us
©2012 - 2014 OWASP
-
-
File: 207,
- Errors: 7,
+ File: 189,
+ Errors: 6,
Warnings: 0,
Infos: 0
@@ -46,7 +46,7 @@ under the License.
- org/owasp/dependencycheck/data/update/StandardUpdate.java
+ org/owasp/dependencycheck/data/lucene/package-info.java
0
@@ -71,1448 +71,6 @@ under the License.
0
-
-
-
- org/owasp/dependencycheck/data/nexus/NexusSearch.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/HintAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/exception/ScanAgentException.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/update/CachedWebDataSource.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-ant/target/generated-classes/cobertura/cobertura.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/utils/DependencyVersion.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Dependency.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/dependency/Dependency.java
-
-
- 0
-
-
- 0
-
-
- 1
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/IssueManagement.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-ant/target/generated-classes/cobertura/task.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/utils/Pair.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/nexus/MavenArtifact.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/exception/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/dependency/EvidenceCollection.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Parent.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-ant/target/classes/task.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-maven/target/generated-classes/cobertura/log.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/RepositoryPolicy.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/utils/NonClosingStream.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/cwe/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/nvdcve/CorruptDatabaseException.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Exclusion.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Build.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/utils/DBUtils.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Relocation.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-ant/target/generated-classes/cobertura/taskdefs.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Developer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/dependency/VulnerableSoftware.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Notifier.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/lucene/DependencySimilarity.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/suppression/PropertyType.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/cpe/Fields.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/suppression/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-cli/target/maven-archiver/pom.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/dependency/VulnerabilityComparator.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/CiManagement.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/update/exception/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/dependency/Identifier.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-core/src/main/resources/dependencycheck.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-ant/target/classes/log.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/NexusAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/update/task/DownloadTask.java
-
-
- 0
-
-
- 0
-
-
- 1
-
-
-
-
- org/owasp/dependencycheck/data/nvdcve/DriverLoader.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-utils/src/test/resources/dependencycheck.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Reporting.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-cli/target/generated-classes/cobertura/log.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-core/src/test/resources/dependencycheck.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-core/target/generated-classes/cobertura/dependencycheck-resources.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/lucene/FieldAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/dependency/Confidence.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 2
-
-
-
-
- org/owasp/dependencycheck/dependency/Evidence.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Prerequisites.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-core/target/test-classes/log.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/dependency/Reference.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-cli/src/main/resources/log.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/nvdcve/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/PluginManagement.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/update/exception/UpdateException.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-utils/src/test/resources/test.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-maven/target/generated-classes/cobertura/cobertura.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/cwe/CweHandler.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/lucene/LuceneUtils.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/utils/Filter.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/cwe/CweDB.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/utils/ExtractionUtil.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/nvdcve/CveDB.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Profile.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/ActivationFile.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Organization.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-cli/target/generated-classes/cobertura/cobertura.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-ant/target/generated-classes/cobertura/log.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/nuget/NuspecParseException.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/cpe/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/suppression/SuppressionParseException.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-core/target/generated-classes/cobertura/dependencycheck.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/lucene/VersionTokenizingFilter.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/exception/NoDataException.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/update/task/ProcessTask.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/DistributionManagement.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/nvdcve/DriverShim.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/dependency/Vulnerability.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/MailingList.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/jaxb/pom/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-maven/src/main/resources/log.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java
-
-
- 0
-
-
- 0
-
-
- 2
-
-
-
-
- org/owasp/dependencycheck/data/update/xml/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/nuget/NugetPackage.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-core/target/classes/dependencycheck.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- org/owasp/dependencycheck/data/update/NvdCveUpdater.java
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- dependency-check-maven/target/classes/log.properties
-
-
- 0
-
-
- 0
-
-
- 0
-
@@ -1530,7 +88,7 @@ under the License.
- org/owasp/dependencycheck/data/lucene/package-info.java
+ org/owasp/dependencycheck/data/update/StandardUpdate.java
0
@@ -1544,7 +102,7 @@ under the License.
- dependency-check-maven/target/generated-classes/cobertura/mojo.properties
+ org/owasp/dependencycheck/data/nexus/NexusSearch.java
0
@@ -1569,6 +127,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/analyzer/HintAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1583,6 +155,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/exception/ScanAgentException.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1614,7 +200,21 @@ under the License.
- org/owasp/dependencycheck/jaxb/pom/generated/BuildBase.java
+ org/owasp/dependencycheck/data/update/CachedWebDataSource.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/utils/DependencyVersion.java
0
@@ -1639,6 +239,34 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/BuildBase.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Dependency.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1653,6 +281,34 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/dependency/Dependency.java
+
+
+ 0
+
+
+ 0
+
+
+ 1
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/IssueManagement.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1684,7 +340,7 @@ under the License.
- dependency-check-maven/target/maven-archiver/pom.properties
+ org/owasp/dependencycheck/utils/Pair.java
0
@@ -1709,6 +365,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/analyzer/FileTypeAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1740,7 +410,7 @@ under the License.
- dependency-check-maven/target/maven-plugin-help.properties
+ org/owasp/dependencycheck/data/nexus/MavenArtifact.java
0
@@ -1768,7 +438,21 @@ under the License.
- org/owasp/dependencycheck/jaxb/pom/generated/Model.java
+ org/owasp/dependencycheck/analyzer/CpeSuppressionAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/analyzer/exception/package-info.java
0
@@ -1793,6 +477,48 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Parent.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Model.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/dependency/EvidenceCollection.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1821,6 +547,76 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/utils/NonClosingStream.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/RepositoryPolicy.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/cwe/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Exclusion.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/nvdcve/CorruptDatabaseException.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1863,6 +659,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Build.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1891,6 +701,48 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/utils/DBUtils.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Relocation.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Developer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1905,6 +757,34 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Notifier.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/dependency/VulnerableSoftware.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1919,6 +799,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/cpe/CpeMemoryIndex.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1961,6 +855,34 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/suppression/PropertyType.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/lucene/DependencySimilarity.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -1992,7 +914,7 @@ under the License.
- dependency-check-ant/target/maven-archiver/pom.properties
+ org/owasp/dependencycheck/analyzer/AbstractFileTypeAnalyzer.java
0
@@ -2017,6 +939,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/cpe/Fields.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2090,7 +1026,7 @@ under the License.
- org/owasp/dependencycheck/data/lucene/VersionAnalyzer.java
+ org/owasp/dependencycheck/suppression/package-info.java
0
@@ -2104,7 +1040,7 @@ under the License.
- org/owasp/dependencycheck/data/nuget/package-info.java
+ org/owasp/dependencycheck/data/lucene/VersionAnalyzer.java
0
@@ -2129,6 +1065,48 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/nuget/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/dependency/VulnerabilityComparator.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/CiManagement.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2143,6 +1121,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/update/exception/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2157,6 +1149,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/dependency/Identifier.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2171,6 +1177,20 @@ under the License.
0
+
+
+
+ dependency-check-core/src/main/resources/dependencycheck.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2199,6 +1219,34 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/analyzer/NexusAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/update/task/DownloadTask.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2213,6 +1261,90 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/nvdcve/DriverLoader.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ dependency-check-utils/src/test/resources/dependencycheck.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilter.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Reporting.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ dependency-check-core/src/test/resources/dependencycheck.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ dependency-check-core/target/generated-classes/cobertura/dependencycheck-resources.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2227,6 +1359,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/lucene/FieldAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2241,6 +1387,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/dependency/Confidence.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2258,7 +1418,7 @@ under the License.
- dependency-check-ant/target/classes/taskdefs.properties
+ org/owasp/dependencycheck/jaxb/pom/generated/Scm.java
0
@@ -2272,7 +1432,7 @@ under the License.
- org/owasp/dependencycheck/jaxb/pom/generated/Scm.java
+ org/owasp/dependencycheck/analyzer/AssemblyAnalyzer.java
0
@@ -2281,7 +1441,7 @@ under the License.
0
- 0
+ 2
@@ -2339,6 +1499,76 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/dependency/Evidence.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ dependency-check-core/target/test-classes/log.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Prerequisites.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/analyzer/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ dependency-check-cli/src/main/resources/log.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2353,6 +1583,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/dependency/Reference.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2367,6 +1611,62 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/PluginManagement.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/nvdcve/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/update/exception/UpdateException.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2381,6 +1681,20 @@ under the License.
0
+
+
+
+ dependency-check-utils/src/test/resources/test.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2423,6 +1737,34 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/lucene/LuceneUtils.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/cwe/CweHandler.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2451,20 +1793,6 @@ under the License.
0
-
-
-
- org/owasp/dependencycheck/dependency/package-info.java
-
-
- 0
-
-
- 0
-
-
- 0
-
@@ -2482,7 +1810,21 @@ under the License.
- org/owasp/dependencycheck/analyzer/CentralAnalyzer.java
+ org/owasp/dependencycheck/dependency/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/utils/Filter.java
0
@@ -2507,6 +1849,34 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/analyzer/CentralAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/cwe/CweDB.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2521,6 +1891,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2535,6 +1919,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/utils/ExtractionUtil.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2552,7 +1950,7 @@ under the License.
- org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java
+ org/owasp/dependencycheck/jaxb/pom/generated/Extension.java
0
@@ -2566,7 +1964,7 @@ under the License.
- org/owasp/dependencycheck/jaxb/pom/generated/Extension.java
+ org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzer.java
0
@@ -2608,7 +2006,7 @@ under the License.
- org/owasp/dependencycheck/data/update/task/package-info.java
+ dependency-check-maven/src/test/resources/mojo.properties
0
@@ -2633,6 +2031,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/update/task/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2647,6 +2059,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/nvdcve/CveDB.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2661,6 +2087,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Profile.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2675,6 +2115,48 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/ActivationFile.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/Organization.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2689,6 +2171,62 @@ under the License.
0
+
+
+
+ dependency-check-core/target/generated-classes/cobertura/dependencycheck.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/suppression/SuppressionParseException.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/cpe/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/nuget/NuspecParseException.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2720,7 +2258,35 @@ under the License.
- dependency-check-cli/target/classes/log.properties
+ org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/lucene/SearchFieldAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/analyzer/exception/ArchiveExtractionException.java
0
@@ -2759,6 +2325,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/lucene/VersionTokenizingFilter.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2773,6 +2353,20 @@ under the License.
1
+
+
+
+ org/owasp/dependencycheck/exception/NoDataException.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2815,6 +2409,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/update/task/ProcessTask.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2832,7 +2440,21 @@ under the License.
- dependency-check-maven/target/classes/mojo.properties
+ org/owasp/dependencycheck/jaxb/pom/generated/DistributionManagement.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/nvdcve/DriverShim.java
0
@@ -2857,6 +2479,20 @@ under the License.
0
+
+
+
+ dependency-check-core/target/test-classes/test.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2874,7 +2510,35 @@ under the License.
- dependency-check-core/target/test-classes/test.properties
+ org/owasp/dependencycheck/dependency/Vulnerability.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/jaxb/pom/generated/MailingList.java
0
@@ -2899,6 +2563,20 @@ under the License.
0
+
+
+
+ dependency-check-maven/src/main/resources/log.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2913,6 +2591,62 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/analyzer/JavaScriptAnalyzer.java
+
+
+ 0
+
+
+ 0
+
+
+ 2
+
+
+
+
+ org/owasp/dependencycheck/data/nuget/NugetPackage.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ org/owasp/dependencycheck/data/update/xml/package-info.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+
+
+ dependency-check-core/target/classes/dependencycheck.properties
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
@@ -2927,6 +2661,20 @@ under the License.
0
+
+
+
+ org/owasp/dependencycheck/data/update/NvdCveUpdater.java
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.analyzer.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.analyzer.html
index cec66b54e..7a506a55a 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.analyzer.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.analyzer.html
@@ -18,7 +18,7 @@ org.owasp.dependencycheck.analyzer
AbstractAnalyzer (100%)
-AbstractFileTypeAnalyzer (74%)
+AbstractFileTypeAnalyzer (75%)
AbstractSuppressionAnalyzer (82%)
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html
index 09f33b14a..0d224747a 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.cpe.html
@@ -15,7 +15,7 @@ org.owasp.dependencycheck.data.cpe
-CpeMemoryIndex (71%)
+CpeMemoryIndex (72%)
Fields (N/A)
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.html
index 76ee5a224..84836b040 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.update.html
@@ -18,7 +18,7 @@ org.owasp.dependencycheck.data.update
CachedWebDataSource (N/A)
-EngineVersionCheck (44%)
+EngineVersionCheck (45%)
NvdCveInfo (N/A)
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.dependency.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.dependency.html
index 914d4ea05..f844740d4 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.dependency.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.dependency.html
@@ -18,7 +18,7 @@ org.owasp.dependencycheck.dependency
Confidence (100%)
-Dependency (61%)
+Dependency (59%)
Evidence (66%)
diff --git a/dependency-check-core/cobertura/frame-sourcefiles.html b/dependency-check-core/cobertura/frame-sourcefiles.html
index 7f84ec364..0b1b98855 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles.html
@@ -18,7 +18,7 @@ All Packages
AbstractAnalyzer (100%)
-AbstractFileTypeAnalyzer (74%)
+AbstractFileTypeAnalyzer (75%)
AbstractSuppressionAnalyzer (82%)
@@ -96,7 +96,7 @@ All Packages
CorruptDatabaseException (N/A)
-CpeMemoryIndex (71%)
+CpeMemoryIndex (72%)
CpeSuppressionAnalyzer (88%)
@@ -120,7 +120,7 @@ All Packages
DateUtil (100%)
-Dependency (61%)
+Dependency (59%)
Dependency (0%)
@@ -165,7 +165,7 @@ All Packages
Engine (53%)
-EngineVersionCheck (44%)
+EngineVersionCheck (45%)
EscapeTool (0%)
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.agent.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.agent.html
index 5a3614d03..3e1800a83 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.agent.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.agent.html
@@ -37,6 +37,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.exception.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.exception.html
index 6b3e87ed0..4a8c9b16e 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.exception.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.exception.html
@@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.html
index 6da79ce97..71015102f 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.analyzer.html
@@ -16,7 +16,7 @@
@@ -31,7 +31,7 @@ packageTable.sort(0);
AbstractAnalyzer 1.0; 1
- AbstractFileTypeAnalyzer 1.6153846153846154; 1.615
+ AbstractFileTypeAnalyzer 1.5714285714285714; 1.571
AbstractSuppressionAnalyzer 3.8333333333333335; 3.833
@@ -83,6 +83,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.central.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.central.html
index cf0ba8147..9f770f40f 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.central.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.central.html
@@ -37,6 +37,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cpe.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cpe.html
index b7caefaea..86a1d6019 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cpe.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cpe.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cwe.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cwe.html
index 31e731152..ead7d3e1f 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cwe.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cwe.html
@@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html
index 7fa0de7d2..3c78f8ca0 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.lucene.html
@@ -57,6 +57,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nexus.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nexus.html
index d51c7fd4d..23887a6a0 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nexus.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nexus.html
@@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nuget.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nuget.html
index 64a459fcf..422d60d0f 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nuget.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nuget.html
@@ -43,6 +43,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html
index c090f0ea1..4cb105551 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html
@@ -50,6 +50,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.exception.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.exception.html
index 1ac4046d6..e89bfc1b0 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.exception.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.exception.html
@@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html
index fe439c8a3..e5df87860 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.html
@@ -16,7 +16,7 @@
Package # Classes Line Coverage Branch Coverage Complexity
- org.owasp.dependencycheck.data.update 7 2.925; 2.925
+ org.owasp.dependencycheck.data.update 7 2.925; 2.925
org.owasp.dependencycheck.data.update.exception 2 1.0; 1
org.owasp.dependencycheck.data.update.task 1 3.5; 3.5
org.owasp.dependencycheck.data.update.xml 4 2.914285714285714; 2.914
@@ -33,7 +33,7 @@ packageTable.sort(0);
CachedWebDataSource 1.0; 1
- EngineVersionCheck 4.285714285714286; 4.286
+ EngineVersionCheck 4.285714285714286; 4.286
NvdCveInfo 1.0; 1
@@ -52,6 +52,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.task.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.task.html
index 69fc25118..84ae0ed0d 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.task.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.task.html
@@ -37,6 +37,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.xml.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.xml.html
index b769674eb..1eb2a8f71 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.xml.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.update.xml.html
@@ -41,6 +41,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html
index 174800684..30ecb4153 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.dependency.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.exception.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.exception.html
index 020854fbb..b41afb5c8 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.exception.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.exception.html
@@ -39,6 +39,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
index 3610cca9e..35f867af5 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
@@ -16,26 +16,26 @@
Package # Classes Line Coverage Branch Coverage Complexity
- org.owasp.dependencycheck 1 3.347826086956522; 3.348
+ org.owasp.dependencycheck 1 3.25; 3.25
org.owasp.dependencycheck.agent 1 1.8571428571428572; 1.857
- org.owasp.dependencycheck.analyzer 25 5.021621621621621; 5.022
+ org.owasp.dependencycheck.analyzer 25 4.978609625668449; 4.979
org.owasp.dependencycheck.analyzer.exception 2 1.0; 1
org.owasp.dependencycheck.data.central 1 7.5; 7.5
- org.owasp.dependencycheck.data.cpe 4 2.4516129032258065; 2.452
+ org.owasp.dependencycheck.data.cpe 4 2.4516129032258065; 2.452
org.owasp.dependencycheck.data.cwe 2 2.8; 2.8
org.owasp.dependencycheck.data.lucene 11 2.5; 2.5
org.owasp.dependencycheck.data.nexus 2 2.2666666666666666; 2.267
org.owasp.dependencycheck.data.nuget 4 2.238095238095238; 2.238
org.owasp.dependencycheck.data.nvdcve 8 3.025; 3.025
- org.owasp.dependencycheck.data.update 7 2.925; 2.925
+ org.owasp.dependencycheck.data.update 7 2.925; 2.925
org.owasp.dependencycheck.data.update.exception 2 1.0; 1
org.owasp.dependencycheck.data.update.task 1 3.5; 3.5
org.owasp.dependencycheck.data.update.xml 4 2.914285714285714; 2.914
- org.owasp.dependencycheck.dependency 14 2.49438202247191; 2.494
+ org.owasp.dependencycheck.dependency 14 2.5; 2.5
org.owasp.dependencycheck.exception 2 1.0; 1
org.owasp.dependencycheck.jaxb.pom 1 1.25; 1.25
org.owasp.dependencycheck.jaxb.pom.generated 87 1.0907407407407408; 1.091
- org.owasp.dependencycheck.reporting 4 4.1875; 4.188
+ org.owasp.dependencycheck.reporting 4 4.25; 4.25
org.owasp.dependencycheck.suppression 6 3.0727272727272728; 3.073
org.owasp.dependencycheck.utils 11 3.5555555555555554; 3.556
@@ -49,7 +49,7 @@ packageTable.sort(0);
@@ -58,6 +58,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html
index 901331ce5..38eb3abdd 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.generated.html
@@ -160,6 +160,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.html
index 94819e396..833338fb5 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.jaxb.pom.html
@@ -38,6 +38,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.reporting.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.reporting.html
index 72640cfce..d6900ce92 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.reporting.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.reporting.html
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.suppression.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.suppression.html
index 823720104..7428f0030 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.suppression.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.suppression.html
@@ -47,6 +47,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html
index 0eaa4f7f3..b6ec2ea40 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.utils.html
@@ -55,6 +55,6 @@ var classTable = new SortableTable(document.getElementById("classResults"),
["String", "Percentage", "Percentage", "FormattedNumber"]);
classTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/frame-summary.html b/dependency-check-core/cobertura/frame-summary.html
index adff91a71..e9ac2a814 100644
--- a/dependency-check-core/cobertura/frame-summary.html
+++ b/dependency-check-core/cobertura/frame-summary.html
@@ -16,27 +16,27 @@
Package # Classes Line Coverage Branch Coverage Complexity
- All Packages 200 2.3580337490829053; 2.358
- org.owasp.dependencycheck 1 3.347826086956522; 3.348
+ All Packages 200 2.356515373352855; 2.357
+ org.owasp.dependencycheck 1 3.25; 3.25
org.owasp.dependencycheck.agent 1 1.8571428571428572; 1.857
- org.owasp.dependencycheck.analyzer 25 5.021621621621621; 5.022
+ org.owasp.dependencycheck.analyzer 25 4.978609625668449; 4.979
org.owasp.dependencycheck.analyzer.exception 2 1.0; 1
org.owasp.dependencycheck.data.central 1 7.5; 7.5
- org.owasp.dependencycheck.data.cpe 4 2.4516129032258065; 2.452
+ org.owasp.dependencycheck.data.cpe 4 2.4516129032258065; 2.452
org.owasp.dependencycheck.data.cwe 2 2.8; 2.8
org.owasp.dependencycheck.data.lucene 11 2.5; 2.5
org.owasp.dependencycheck.data.nexus 2 2.2666666666666666; 2.267
org.owasp.dependencycheck.data.nuget 4 2.238095238095238; 2.238
org.owasp.dependencycheck.data.nvdcve 8 3.025; 3.025
- org.owasp.dependencycheck.data.update 7 2.925; 2.925
+ org.owasp.dependencycheck.data.update 7 2.925; 2.925
org.owasp.dependencycheck.data.update.exception 2 1.0; 1
org.owasp.dependencycheck.data.update.task 1 3.5; 3.5
org.owasp.dependencycheck.data.update.xml 4 2.914285714285714; 2.914
- org.owasp.dependencycheck.dependency 14 2.49438202247191; 2.494
+ org.owasp.dependencycheck.dependency 14 2.5; 2.5
org.owasp.dependencycheck.exception 2 1.0; 1
org.owasp.dependencycheck.jaxb.pom 1 1.25; 1.25
org.owasp.dependencycheck.jaxb.pom.generated 87 1.0907407407407408; 1.091
- org.owasp.dependencycheck.reporting 4 4.1875; 4.188
+ org.owasp.dependencycheck.reporting 4 4.25; 4.25
org.owasp.dependencycheck.suppression 6 3.0727272727272728; 3.073
org.owasp.dependencycheck.utils 11 3.5555555555555554; 3.556
@@ -46,6 +46,6 @@ var packageTable = new SortableTable(document.getElementById("packageResults"),
["String", "Number", "Percentage", "Percentage", "FormattedNumber"]);
packageTable.sort(0);
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
index bc69af31f..da2660528 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
@@ -12,7 +12,7 @@
@@ -297,590 +297,618 @@
155
156
- public void setDependencies(List<Dependency> dependencies) {
+
157
- this .dependencies = dependencies;
+
158
- }
+
159
-
+
160
-
+
161
-
+ public void setDependencies(List<Dependency> dependencies) {
162
-
+ this .dependencies = dependencies;
163
-
+ }
164
-
+
165
-
+
166
-
- 167
-
- 168
-
- 169
- public List<Dependency> scan(String[] paths) {
- 170 0 final List<Dependency> deps = new ArrayList<Dependency>();
- 171 0 for (String path : paths) {
- 172 0 final File file = new File(path);
- 173 0 final List<Dependency> d = scan(file);
- 174 0 if (d != null ) {
- 175 0 deps.addAll(d);
- 176
- }
- 177
- }
- 178 0 return deps;
- 179
- }
- 180
-
- 181
-
- 182
-
- 183
-
- 184
-
- 185
-
- 186
-
- 187
-
- 188
- public List<Dependency> scan(String path) {
- 189 0 final File file = new File(path);
- 190 0 return scan(file);
- 191
- }
- 192
-
- 193
-
- 194
- 195
+ 167
- 196
+ 168
- 197
-
- 198
-
- 199
+ 169
+
+ 170
+
+ 171
- 200
+ 172
- 201
+ 173
- 202
- public List<Dependency> scan(File[] files) {
- 203 0 final List<Dependency> deps = new ArrayList<Dependency>();
- 204 0 for (File file : files) {
- 205 0 final List<Dependency> d = scan(file);
- 206 0 if (d != null ) {
- 207 0 deps.addAll(d);
- 208
+ 174
+ public List<Dependency> scan(String[] paths) {
+ 175 0 final List<Dependency> deps = new ArrayList<Dependency>();
+ 176 0 for (String path : paths) {
+ 177 0 final File file = new File(path);
+ 178 0 final List<Dependency> d = scan(file);
+ 179 0 if (d != null ) {
+ 180 0 deps.addAll(d);
+ 181
}
- 209
+ 182
}
- 210 0 return deps;
- 211
+ 183 0 return deps;
+ 184
}
- 212
+ 185
- 213
+ 186
- 214
-
- 215
-
- 216
-
- 217
-
- 218
-
- 219
-
- 220
-
- 221
-
- 222
- public List<Dependency> scan(Set<File> files) {
- 223 0 final List<Dependency> deps = new ArrayList<Dependency>();
- 224 0 for (File file : files) {
- 225 0 final List<Dependency> d = scan(file);
- 226 0 if (d != null ) {
- 227 0 deps.addAll(d);
- 228
- }
- 229 0 }
- 230 0 return deps;
- 231
- }
- 232
-
- 233
-
- 234
-
- 235
-
- 236
-
- 237
-
- 238
-
- 239
-
- 240
-
- 241
-
- 242
- public List<Dependency> scan(List<File> files) {
- 243 0 final List<Dependency> deps = new ArrayList<Dependency>();
- 244 0 for (File file : files) {
- 245 0 final List<Dependency> d = scan(file);
- 246 0 if (d != null ) {
- 247 0 deps.addAll(d);
- 248
- }
- 249 0 }
- 250 0 return deps;
- 251
- }
- 252
-
- 253
-
- 254
+ 187
- 255
+ 188
- 256
+ 189
- 257
-
- 258
+ 190
+
+ 191
- 259
+ 192
+
+ 193
+ public List<Dependency> scan(String path) {
+ 194 0 final File file = new File(path);
+ 195 0 return scan(file);
+ 196
+ }
+ 197
+
+ 198
+
+ 199
+
+ 200
+
+ 201
+ 202
+
+ 203
+
+ 204
+
+ 205
+
+ 206
+
+ 207
+ public List<Dependency> scan(File[] files) {
+ 208 0 final List<Dependency> deps = new ArrayList<Dependency>();
+ 209 0 for (File file : files) {
+ 210 0 final List<Dependency> d = scan(file);
+ 211 0 if (d != null ) {
+ 212 0 deps.addAll(d);
+ 213
+ }
+ 214
+ }
+ 215 0 return deps;
+ 216
+ }
+ 217
+
+ 218
+
+ 219
+
+ 220
+
+ 221
+
+ 222
+
+ 223
+
+ 224
+
+ 225
+
+ 226
+
+ 227
+ public List<Dependency> scan(Set<File> files) {
+ 228 0 final List<Dependency> deps = new ArrayList<Dependency>();
+ 229 0 for (File file : files) {
+ 230 0 final List<Dependency> d = scan(file);
+ 231 0 if (d != null ) {
+ 232 0 deps.addAll(d);
+ 233
+ }
+ 234 0 }
+ 235 0 return deps;
+ 236
+ }
+ 237
+
+ 238
+
+ 239
+
+ 240
+
+ 241
+
+ 242
+
+ 243
+
+ 244
+
+ 245
+
+ 246
+
+ 247
+ public List<Dependency> scan(List<File> files) {
+ 248 0 final List<Dependency> deps = new ArrayList<Dependency>();
+ 249 0 for (File file : files) {
+ 250 0 final List<Dependency> d = scan(file);
+ 251 0 if (d != null ) {
+ 252 0 deps.addAll(d);
+ 253
+ }
+ 254 0 }
+ 255 0 return deps;
+ 256
+ }
+ 257
+
+ 258
+
+ 259
+
260
-
+
261
262
-
+
263
- public List<Dependency> scan(File file) {
- 264 4 if (file.exists()) {
- 265 4 if (file.isDirectory()) {
- 266 2 return scanDirectory(file);
+
+ 264
+
+ 265
+
+ 266
+
267
+
+ 268
+ public List<Dependency> scan(File file) {
+ 269 4 if (file.exists()) {
+ 270 4 if (file.isDirectory()) {
+ 271 2 return scanDirectory(file);
+ 272
} else {
- 268 2 final Dependency d = scanFile(file);
- 269 2 if (d != null ) {
- 270 2 final List<Dependency> deps = new ArrayList<Dependency>();
- 271 2 deps.add(d);
- 272 2 return deps;
- 273
- }
- 274
- }
- 275
- }
- 276 0 return null ;
- 277
- }
+ 273 2 final Dependency d = scanFile(file);
+ 274 2 if (d != null ) {
+ 275 2 final List<Dependency> deps = new ArrayList<Dependency>();
+ 276 2 deps.add(d);
+ 277 2 return deps;
278
-
- 279
-
- 280
-
- 281
-
- 282
-
- 283
-
- 284
-
- 285
- protected List<Dependency> scanDirectory(File dir) {
- 286 38 final File[] files = dir.listFiles();
- 287 38 final List<Dependency> deps = new ArrayList<Dependency>();
- 288 38 if (files != null ) {
- 289 74 for (File f : files) {
- 290 36 if (f.isDirectory()) {
- 291 36 final List<Dependency> d = scanDirectory(f);
- 292 36 if (d != null ) {
- 293 36 deps.addAll(d);
- 294
- }
- 295 36 } else {
- 296 0 final Dependency d = scanFile(f);
- 297 0 deps.add(d);
- 298
}
- 299
+ 279
}
- 300
+ 280
}
- 301 38 return deps;
- 302
+ 281 0 return null ;
+ 282
}
- 303
+ 283
- 304
+ 284
- 305
-
- 306
+ 285
+
+ 286
- 307
-
- 308
-
- 309
+ 287
+
+ 288
+
+ 289
- 310
- protected Dependency scanFile(File file) {
- 311 2 if (!file.isFile()) {
- 312 0 final String msg = String.format("Path passed to scanFile(File) is not a file: %s. Skipping the file." , file.toString());
- 313 0 LOGGER.log(Level.FINE, msg);
- 314 0 return null ;
- 315
- }
- 316 2 final String fileName = file.getName();
- 317 2 final String extension = FileUtils.getFileExtension(fileName);
- 318 2 Dependency dependency = null ;
- 319 2 if (extension != null ) {
- 320 2 if (supportsExtension(extension)) {
- 321 2 dependency = new Dependency(file);
- 322 2 dependencies.add(dependency);
- 323
+ 290
+ protected List<Dependency> scanDirectory(File dir) {
+ 291 38 final File[] files = dir.listFiles();
+ 292 38 final List<Dependency> deps = new ArrayList<Dependency>();
+ 293 38 if (files != null ) {
+ 294 74 for (File f : files) {
+ 295 36 if (f.isDirectory()) {
+ 296 36 final List<Dependency> d = scanDirectory(f);
+ 297 36 if (d != null ) {
+ 298 36 deps.addAll(d);
+ 299
+ }
+ 300 36 } else {
+ 301 0 final Dependency d = scanFile(f);
+ 302 0 deps.add(d);
+ 303
+ }
+ 304
}
- 324
- } else {
- 325 0 final String msg = String.format("No file extension found on file '%s'. The file was not analyzed." , file.toString());
- 326 0 LOGGER.log(Level.FINEST, msg);
- 327
+ 305
}
- 328 2 return dependency;
- 329
+ 306 38 return deps;
+ 307
}
- 330
+ 308
- 331
+ 309
- 332
-
- 333
+ 310
+
+ 311
+
+ 312
+
+ 313
+
+ 314
- 334
- public void analyzeDependencies() {
- 335 1 boolean autoUpdate = true ;
- 336
- try {
- 337 1 autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
- 338 0 } catch (InvalidSettingException ex) {
- 339 0 LOGGER.log(Level.FINE, "Invalid setting for auto-update; using true." );
- 340 1 }
- 341 1 if (autoUpdate) {
- 342 0 doUpdates();
- 343
+ 315
+ protected Dependency scanFile(File file) {
+ 316 2 if (!file.isFile()) {
+ 317 0 final String msg = String.format("Path passed to scanFile(File) is not a file: %s. Skipping the file." , file.toString());
+ 318 0 LOGGER.log(Level.FINE, msg);
+ 319 0 return null ;
+ 320
}
- 344
+ 321 2 final String fileName = file.getName();
+ 322 2 final String extension = FileUtils.getFileExtension(fileName);
+ 323 2 Dependency dependency = null ;
+ 324 2 if (extension != null ) {
+ 325 2 if (supportsExtension(extension)) {
+ 326 2 dependency = new Dependency(file);
+ 327 2 dependencies.add(dependency);
+ 328
+ }
+ 329
+ } else {
+ 330 0 final String msg = String.format("No file extension found on file '%s'. The file was not analyzed." , file.toString());
+ 331 0 LOGGER.log(Level.FINE, msg);
+ 332
+ }
+ 333 2 return dependency;
+ 334
+ }
+ 335
- 345
-
- 346
+ 336
+
+ 337
+
+ 338
+
+ 339
+ public void analyzeDependencies() {
+ 340 1 boolean autoUpdate = true ;
+ 341
try {
- 347 1 ensureDataExists();
- 348 0 } catch (NoDataException ex) {
- 349 0 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis." , ex.getMessage());
- 350 0 LOGGER.log(Level.SEVERE, msg);
- 351 0 LOGGER.log(Level.FINE, null , ex);
- 352 0 return ;
- 353 0 } catch (DatabaseException ex) {
+ 342 1 autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE);
+ 343 0 } catch (InvalidSettingException ex) {
+ 344 0 LOGGER.log(Level.FINE, "Invalid setting for auto-update; using true." );
+ 345 1 }
+ 346 1 if (autoUpdate) {
+ 347 0 doUpdates();
+ 348
+ }
+ 349
+
+ 350
+
+ 351
+ try {
+ 352 1 ensureDataExists();
+ 353 0 } catch (NoDataException ex) {
354 0 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis." , ex.getMessage());
355 0 LOGGER.log(Level.SEVERE, msg);
356 0 LOGGER.log(Level.FINE, null , ex);
357 0 return ;
- 358
-
- 359 1 }
- 360
-
- 361 1 final String logHeader = String.format("%n"
- 362
- + "----------------------------------------------------%n"
+ 358 0 } catch (DatabaseException ex) {
+ 359 0 final String msg = String.format("%s%n%nUnable to continue dependency-check analysis." , ex.getMessage());
+ 360 0 LOGGER.log(Level.SEVERE, msg);
+ 361 0 LOGGER.log(Level.FINE, null , ex);
+ 362 0 return ;
363
- + "BEGIN ANALYSIS%n"
- 364
- + "----------------------------------------------------" );
- 365 1 LOGGER.log(Level.FINE, logHeader);
- 366 1 LOGGER.log(Level.INFO, "Analysis Starting" );
+
+ 364 1 }
+ 365
+
+ 366 1 final String logHeader = String.format("%n"
367
-
+ + "----------------------------------------------------%n"
368
+ + "BEGIN ANALYSIS%n"
+ 369
+ + "----------------------------------------------------" );
+ 370 1 LOGGER.log(Level.FINE, logHeader);
+ 371 1 LOGGER.log(Level.INFO, "Analysis Starting" );
+ 372
+
+ 373
- 369 10 for (AnalysisPhase phase : AnalysisPhase.values()) {
- 370 9 final List<Analyzer> analyzerList = analyzers.get(phase);
- 371
-
- 372 9 for (Analyzer a : analyzerList) {
- 373 14 a = initializeAnalyzer(a);
- 374
-
- 375
-
+ 374 10 for (AnalysisPhase phase : AnalysisPhase.values()) {
+ 375 9 final List<Analyzer> analyzerList = analyzers.get(phase);
376
-
- 377
-
- 378
-
- 379 14 final String msg = String.format("Begin Analyzer '%s'" , a.getName());
- 380 14 LOGGER.log(Level.FINE, msg);
- 381 14 final Set<Dependency> dependencySet = new HashSet<Dependency>();
- 382 14 dependencySet.addAll(dependencies);
- 383 14 for (Dependency d : dependencySet) {
- 384 28 boolean shouldAnalyze = true ;
- 385 28 if (a instanceof FileTypeAnalyzer) {
- 386 12 final FileTypeAnalyzer fAnalyzer = (FileTypeAnalyzer) a;
- 387 12 shouldAnalyze = fAnalyzer.supportsExtension(d.getFileExtension());
- 388
- }
- 389 28 if (shouldAnalyze) {
- 390 22 final String msgFile = String.format("Begin Analysis of '%s'" , d.getActualFilePath());
- 391 22 LOGGER.log(Level.FINE, msgFile);
- 392
- try {
- 393 22 a.analyze(d, this );
- 394 0 } catch (AnalysisException ex) {
- 395 0 final String exMsg = String.format("An error occurred while analyzing '%s'." , d.getActualFilePath());
- 396 0 LOGGER.log(Level.WARNING, exMsg);
- 397 0 LOGGER.log(Level.FINE, "" , ex);
- 398 0 } catch (Throwable ex) {
- 399 0 final String axMsg = String.format("An unexpected error occurred during analysis of '%s'" , d.getActualFilePath());
- 400
-
- 401 0 LOGGER.log(Level.WARNING, axMsg);
- 402 0 LOGGER.log(Level.FINE, "" , ex);
- 403 22 }
- 404
- }
- 405 28 }
- 406 14 }
- 407
- }
- 408 10 for (AnalysisPhase phase : AnalysisPhase.values()) {
- 409 9 final List<Analyzer> analyzerList = analyzers.get(phase);
- 410
- 411 9 for (Analyzer a : analyzerList) {
- 412 14 closeAnalyzer(a);
- 413 14 }
- 414
+ 377 9 for (Analyzer a : analyzerList) {
+ 378 14 a = initializeAnalyzer(a);
+ 379
+
+ 380
+
+ 381
+
+ 382
+
+ 383
+
+ 384 14 final String msg = String.format("Begin Analyzer '%s'" , a.getName());
+ 385 14 LOGGER.log(Level.FINE, msg);
+ 386 14 final Set<Dependency> dependencySet = new HashSet<Dependency>();
+ 387 14 dependencySet.addAll(dependencies);
+ 388 14 for (Dependency d : dependencySet) {
+ 389 28 boolean shouldAnalyze = true ;
+ 390 28 if (a instanceof FileTypeAnalyzer) {
+ 391 12 final FileTypeAnalyzer fAnalyzer = (FileTypeAnalyzer) a;
+ 392 12 shouldAnalyze = fAnalyzer.supportsExtension(d.getFileExtension());
+ 393
+ }
+ 394 28 if (shouldAnalyze) {
+ 395 22 final String msgFile = String.format("Begin Analysis of '%s'" , d.getActualFilePath());
+ 396 22 LOGGER.log(Level.FINE, msgFile);
+ 397
+ try {
+ 398 22 a.analyze(d, this );
+ 399 0 } catch (AnalysisException ex) {
+ 400 0 final String exMsg = String.format("An error occurred while analyzing '%s'." , d.getActualFilePath());
+ 401 0 LOGGER.log(Level.WARNING, exMsg);
+ 402 0 LOGGER.log(Level.FINE, "" , ex);
+ 403 0 } catch (Throwable ex) {
+ 404 0 final String axMsg = String.format("An unexpected error occurred during analysis of '%s'" , d.getActualFilePath());
+ 405
+
+ 406 0 LOGGER.log(Level.WARNING, axMsg);
+ 407 0 LOGGER.log(Level.FINE, "" , ex);
+ 408 22 }
+ 409
+ }
+ 410 28 }
+ 411 14 }
+ 412
}
+ 413 10 for (AnalysisPhase phase : AnalysisPhase.values()) {
+ 414 9 final List<Analyzer> analyzerList = analyzers.get(phase);
415
- 416 1 final String logFooter = String.format("%n"
- 417
- + "----------------------------------------------------%n"
- 418
- + "END ANALYSIS%n"
+ 416 9 for (Analyzer a : analyzerList) {
+ 417 14 closeAnalyzer(a);
+ 418 14 }
419
- + "----------------------------------------------------" );
- 420 1 LOGGER.log(Level.FINE, logFooter);
- 421 1 LOGGER.log(Level.INFO, "Analysis Complete" );
- 422 1 }
+ }
+ 420
+
+ 421 1 final String logFooter = String.format("%n"
+ 422
+ + "----------------------------------------------------%n"
423
-
+ + "END ANALYSIS%n"
424
-
- 425
-
- 426
-
- 427
-
+ + "----------------------------------------------------" );
+ 425 1 LOGGER.log(Level.FINE, logFooter);
+ 426 1 LOGGER.log(Level.INFO, "Analysis Complete" );
+ 427 1 }
428
-
+
429
-
+
430
- protected Analyzer initializeAnalyzer(Analyzer analyzer) {
+
431
- try {
- 432 14 final String msg = String.format("Initializing %s" , analyzer.getName());
- 433 14 LOGGER.log(Level.FINE, msg);
- 434 14 analyzer.initialize();
- 435 0 } catch (Throwable ex) {
- 436 0 final String msg = String.format("Exception occurred initializing %s." , analyzer.getName());
- 437 0 LOGGER.log(Level.SEVERE, msg);
- 438 0 LOGGER.log(Level.FINE, null , ex);
- 439
- try {
- 440 0 analyzer.close();
- 441 0 } catch (Throwable ex1) {
- 442 0 LOGGER.log(Level.FINEST, null , ex1);
- 443 0 }
- 444 14 }
- 445 14 return analyzer;
- 446
- }
- 447
-
- 448
-
- 449
-
- 450
+ 432
+
+ 433
+
+ 434
+
+ 435
+ protected Analyzer initializeAnalyzer(Analyzer analyzer) {
+ 436
+ try {
+ 437 14 final String msg = String.format("Initializing %s" , analyzer.getName());
+ 438 14 LOGGER.log(Level.FINE, msg);
+ 439 14 analyzer.initialize();
+ 440 0 } catch (Throwable ex) {
+ 441 0 final String msg = String.format("Exception occurred initializing %s." , analyzer.getName());
+ 442 0 LOGGER.log(Level.SEVERE, msg);
+ 443 0 LOGGER.log(Level.FINE, null , ex);
+ 444
+ try {
+ 445 0 analyzer.close();
+ 446 0 } catch (Throwable ex1) {
+ 447 0 LOGGER.log(Level.FINEST, null , ex1);
+ 448 0 }
+ 449 14 }
+ 450 14 return analyzer;
451
-
+ }
452
-
+
453
- protected void closeAnalyzer(Analyzer analyzer) {
- 454 14 final String msg = String.format("Closing Analyzer '%s'" , analyzer.getName());
- 455 14 LOGGER.log(Level.FINE, msg);
+
+ 454
+
+ 455
+
456
+
+ 457
+
+ 458
+ protected void closeAnalyzer(Analyzer analyzer) {
+ 459 14 final String msg = String.format("Closing Analyzer '%s'" , analyzer.getName());
+ 460 14 LOGGER.log(Level.FINE, msg);
+ 461
try {
- 457 14 analyzer.close();
- 458 0 } catch (Throwable ex) {
- 459 0 LOGGER.log(Level.FINEST, null , ex);
- 460 14 }
- 461 14 }
- 462
+ 462 14 analyzer.close();
+ 463 0 } catch (Throwable ex) {
+ 464 0 LOGGER.log(Level.FINEST, null , ex);
+ 465 14 }
+ 466 14 }
+ 467
- 463
+ 468
- 464
+ 469
- 465
+ 470
- 466
+ 471
private void doUpdates() {
- 467 0 LOGGER.info("Checking for updates" );
- 468 0 final UpdateService service = new UpdateService(serviceClassLoader);
- 469 0 final Iterator<CachedWebDataSource> iterator = service.getDataSources();
- 470 0 while (iterator.hasNext()) {
- 471 0 final CachedWebDataSource source = iterator.next();
- 472
+ 472 0 LOGGER.info("Checking for updates" );
+ 473 0 final UpdateService service = new UpdateService(serviceClassLoader);
+ 474 0 final Iterator<CachedWebDataSource> iterator = service.getDataSources();
+ 475 0 while (iterator.hasNext()) {
+ 476 0 final CachedWebDataSource source = iterator.next();
+ 477
try {
- 473 0 source.update();
- 474 0 } catch (UpdateException ex) {
- 475 0 LOGGER.log(Level.WARNING,
- 476
+ 478 0 source.update();
+ 479 0 } catch (UpdateException ex) {
+ 480 0 LOGGER.log(Level.WARNING,
+ 481
"Unable to update Cached Web DataSource, using local data instead. Results may not include recent vulnerabilities." );
- 477 0 LOGGER.log(Level.FINE, String.format("Unable to update details for %s" , source.getClass().getName()), ex);
- 478 0 }
- 479 0 }
- 480 0 LOGGER.info("Check for updates complete" );
- 481 0 }
- 482
-
- 483
-
- 484
-
- 485
-
- 486
-
+ 482 0 LOGGER.log(Level.FINE, String.format("Unable to update details for %s" , source.getClass().getName()), ex);
+ 483 0 }
+ 484 0 }
+ 485 0 LOGGER.info("Check for updates complete" );
+ 486 0 }
487
-
+
488
- public List<Analyzer> getAnalyzers() {
- 489 0 final List<Analyzer> ret = new ArrayList<Analyzer>();
- 490 0 for (AnalysisPhase phase : AnalysisPhase.values()) {
- 491 0 final List<Analyzer> analyzerList = analyzers.get(phase);
- 492 0 ret.addAll(analyzerList);
+
+ 489
+
+ 490
+
+ 491
+
+ 492
+
493
- }
- 494 0 return ret;
- 495
- }
- 496
-
- 497
-
+ public List<Analyzer> getAnalyzers() {
+ 494 0 final List<Analyzer> ret = new ArrayList<Analyzer>();
+ 495 0 for (AnalysisPhase phase : AnalysisPhase.values()) {
+ 496 0 final List<Analyzer> analyzerList = analyzers.get(phase);
+ 497 0 ret.addAll(analyzerList);
498
-
- 499
-
- 500
-
- 501
-
- 502
-
- 503
- public boolean supportsExtension(String ext) {
- 504 851 if (ext == null ) {
- 505 3 return false ;
- 506
}
- 507 848 boolean scan = false ;
- 508 848 for (FileTypeAnalyzer a : this .fileTypeAnalyzers) {
- 509
-
- 510
-
- 511 5088 scan |= a.supportsExtension(ext);
- 512 5088 }
- 513 848 return scan;
- 514
+ 499 0 return ret;
+ 500
}
- 515
+ 501
- 516
+ 502
- 517
-
- 518
+ 503
+
+ 504
- 519
-
- 520
-
- 521
+ 505
+
+ 506
+
+ 507
+ 508
+ public boolean supportsExtension(String ext) {
+ 509 851 if (ext == null ) {
+ 510 3 return false ;
+ 511
+ }
+ 512 848 boolean scan = false ;
+ 513 848 for (FileTypeAnalyzer a : this .fileTypeAnalyzers) {
+ 514
+
+ 515
+
+ 516 5088 scan |= a.supportsExtension(ext);
+ 517 5088 }
+ 518 848 return scan;
+ 519
+ }
+ 520
+
+ 521
+
522
- private void ensureDataExists() throws NoDataException, DatabaseException {
- 523 1 final CveDB cve = new CveDB();
+
+ 523
+
524
- try {
- 525 1 cve.open();
- 526 1 if (!cve.dataExists()) {
- 527 0 throw new NoDataException("No documents exist" );
+
+ 525
+
+ 526
+ public Set<FileTypeAnalyzer> getFileTypeAnalyzers() {
+ 527
+ return this .fileTypeAnalyzers;
528
- }
- 529 0 } catch (DatabaseException ex) {
- 530 0 throw new NoDataException(ex.getMessage(), ex);
+ }
+ 529
+
+ 530
+
531
- } finally {
- 532 1 cve.close();
- 533 1 }
- 534 1 }
+
+ 532
+
+ 533
+
+ 534
+
535
+
+ 536
+ private void ensureDataExists() throws NoDataException, DatabaseException {
+ 537 1 final CveDB cve = new CveDB();
+ 538
+ try {
+ 539 1 cve.open();
+ 540 1 if (!cve.dataExists()) {
+ 541 0 throw new NoDataException("No documents exist" );
+ 542
+ }
+ 543 0 } catch (DatabaseException ex) {
+ 544 0 throw new NoDataException(ex.getMessage(), ex);
+ 545
+ } finally {
+ 546 1 cve.close();
+ 547 1 }
+ 548 1 }
+ 549
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html
index 14a1e2962..17b6e6bd7 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.agent.DependencyCheckScanAgent.html
@@ -1963,6 +1963,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
index 24544f395..2d1a0d930 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
@@ -107,6 +107,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html
index 10310a5ae..d7fe013a4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractFileTypeAnalyzer.html
@@ -12,7 +12,7 @@
@@ -102,54 +102,62 @@
42
43 31 public AbstractFileTypeAnalyzer() {
- 44 31 final String key = getAnalyzerEnabledSettingKey();
- 45
- try {
- 46 31 enabled = Settings.getBoolean(key, true );
- 47 0 } catch (InvalidSettingException ex) {
- 48 0 String msg = String.format("Invalid setting for property '%s'" , key);
- 49 0 LOGGER.log(Level.WARNING, msg);
- 50 0 LOGGER.log(Level.FINE, "" , ex);
- 51 0 msg = String.format("%s has been disabled" , getName());
- 52 0 LOGGER.log(Level.WARNING, msg);
- 53 31 }
- 54 31 }
- 55
+ 44 31 reset();
+ 45 31 }
+ 46
- 56
+ 47
- 57
+ 48
+ 49
+
+ 50
+
+ 51
+
+ 52 1 private static final Logger LOGGER = Logger.getLogger(AbstractFileTypeAnalyzer.class .getName());
+ 53
+
+ 54
+
+ 55
+
+ 56 31 private boolean filesMatched = false ;
+ 57
+
58
59
-
+
60
-
- 61 1 private static final Logger LOGGER = Logger.getLogger(AbstractFileTypeAnalyzer.class .getName());
+
+ 61
+
62
-
- 63
-
- 64
- 65 31 private boolean filesMatched = false ;
+ 63
+ protected boolean isFilesMatched() {
+ 64
+ return filesMatched;
+ 65
+ }
66
67
68
-
+
69
70
-
+
71
72
- protected boolean isFilesMatched() {
+ protected void setFilesMatched(boolean filesMatched) {
73
- return filesMatched;
+ this .filesMatched = filesMatched;
74
}
75
@@ -157,291 +165,297 @@
76
77
-
- 78
-
- 79
-
- 80
-
- 81
- protected void setFilesMatched(boolean filesMatched) {
- 82
- this .filesMatched = filesMatched;
- 83
- }
- 84
-
- 85
-
- 86
- 87
+ 78
- 88 31 private boolean enabled = true ;
+ 79 31 private boolean enabled = true ;
+ 80
+
+ 81
+
+ 82
+
+ 83
+
+ 84
+
+ 85
+
+ 86
+ public boolean isEnabled() {
+ 87
+ return enabled;
+ 88
+ }
89
90
91
-
+
92
93
-
+
94
95
- public boolean isEnabled() {
+ public void setEnabled(boolean enabled) {
96
- return enabled;
+ this .enabled = enabled;
97
}
98
-
- 99
-
- 100
-
- 101
-
- 102
-
- 103
-
- 104
- public void setEnabled(boolean enabled) {
- 105
- this .enabled = enabled;
- 106
- }
- 107
- 108
+ 99
- 109
+ 100
- 110
+ 101
+ 102
+
+ 103
+
+ 104
+
+ 105
+
+ 106
+
+ 107
+
+ 108
+
+ 109
+
+ 110
+
111
112
-
+
113
-
+
114
-
+
115
-
+ protected abstract Set<String> getSupportedExtensions();
116
-
+
117
-
+
118
-
+
119
120
-
- 121
-
- 122
-
- 123
-
- 124
- protected abstract Set<String> getSupportedExtensions();
- 125
-
- 126
-
- 127
-
- 128
-
- 129
- 130
+ 121
- 131
+ 122
protected abstract void initializeFileTypeAnalyzer() throws Exception;
- 132
+ 123
- 133
+ 124
- 134
+ 125
- 135
+ 126
- 136
+ 127
- 137
+ 128
- 138
+ 129
- 139
+ 130
- 140
+ 131
- 141
+ 132
protected abstract void analyzeFileType(Dependency dependency, Engine engine) throws AnalysisException;
- 142
+ 133
- 143
+ 134
- 144
+ 135
- 145
+ 136
+ 137
+
+ 138
+
+ 139
+
+ 140
+ protected abstract String getAnalyzerEnabledSettingKey();
+ 141
+
+ 142
+
+ 143
+
+ 144
+
+ 145
+
146
147
-
+
148
149
- protected abstract String getAnalyzerEnabledSettingKey();
+ @Override
150
-
- 151
-
- 152
-
- 153
-
- 154
-
- 155
-
- 156
-
- 157
-
- 158
- @Override
- 159
public final void initialize() throws Exception {
- 160 11 if (filesMatched) {
- 161 8 initializeFileTypeAnalyzer();
+ 151 11 if (filesMatched) {
+ 152 8 initializeFileTypeAnalyzer();
+ 153
+ } else {
+ 154 3 enabled = false ;
+ 155
+ }
+ 156 11 }
+ 157
+
+ 158
+
+ 159
+
+ 160
+
+ 161
+ @Override
162
- } else {
- 163 3 enabled = false ;
+ public final void reset() {
+ 163 31 final String key = getAnalyzerEnabledSettingKey();
164
- }
- 165 11 }
- 166
-
- 167
-
- 168
-
- 169
-
- 170
-
- 171
-
- 172
-
- 173
-
+ try {
+ 165 31 enabled = Settings.getBoolean(key, true );
+ 166 0 } catch (InvalidSettingException ex) {
+ 167 0 String msg = String.format("Invalid setting for property '%s'" , key);
+ 168 0 LOGGER.log(Level.WARNING, msg);
+ 169 0 LOGGER.log(Level.FINE, "" , ex);
+ 170 0 msg = String.format("%s has been disabled" , getName());
+ 171 0 LOGGER.log(Level.WARNING, msg);
+ 172 31 }
+ 173 31 }
174
-
+
175
- @Override
+
176
- public final void analyze(Dependency dependency, Engine engine) throws AnalysisException {
- 177 12 if (enabled) {
- 178 12 analyzeFileType(dependency, engine);
+
+ 177
+
+ 178
+
179
- }
- 180 11 }
+
+ 180
+
181
-
+
182
-
+
183
-
- 184
-
- 185
-
- 186
-
- 187
-
- 188
@Override
+ 184
+ public final void analyze(Dependency dependency, Engine engine) throws AnalysisException {
+ 185 12 if (enabled) {
+ 186 12 analyzeFileType(dependency, engine);
+ 187
+ }
+ 188 11 }
189
- public final boolean supportsExtension(String extension) {
- 190 5109 if (!enabled) {
- 191 854 return false ;
- 192
- }
- 193 4255 final Set<String> ext = getSupportedExtensions();
- 194 4255 if (ext == null ) {
- 195 0 final String msg = String.format("The '%s' analyzer is misconfigured and does not have any file extensions;"
- 196
- + " it will be disabled" , getName());
- 197 0 LOGGER.log(Level.SEVERE, msg);
- 198 0 return false ;
- 199
- } else {
- 200 4255 final boolean match = ext.contains(extension);
- 201 4255 if (match) {
- 202 20 filesMatched = match;
- 203
- }
- 204 4255 return match;
- 205
- }
- 206
- }
- 207
-
- 208
- 209
-
- 210
+ 190
- 211
-
- 212
-
- 213
-
- 214
+ 191
+
+ 192
- 215
-
- 216
-
- 217
-
- 218
-
- 219
-
- 220
-
- 221
+ 193
+
+ 194
+
+ 195
- 222
- protected static Set<String> newHashSet(String... strings) {
- 223 12 final Set<String> set = new HashSet<String>();
- 224
-
- 225 12 Collections.addAll(set, strings);
- 226 12 return set;
- 227
+ 196
+ @Override
+ 197
+ public final boolean supportsExtension(String extension) {
+ 198 5109 if (!enabled) {
+ 199 854 return false ;
+ 200
+ }
+ 201 4255 final Set<String> ext = getSupportedExtensions();
+ 202 4255 if (ext == null ) {
+ 203 0 final String msg = String.format("The '%s' analyzer is misconfigured and does not have any file extensions;"
+ 204
+ + " it will be disabled" , getName());
+ 205 0 LOGGER.log(Level.SEVERE, msg);
+ 206 0 return false ;
+ 207
+ } else {
+ 208 4255 final boolean match = ext.contains(extension);
+ 209 4255 if (match) {
+ 210 20 filesMatched = match;
+ 211
+ }
+ 212 4255 return match;
+ 213
+ }
+ 214
}
- 228
+ 215
+ 216
+
+ 217
+
+ 218
+
+ 219
+
+ 220
+
+ 221
+
+ 222
+
+ 223
+
+ 224
+
+ 225
+
+ 226
+
+ 227
+
+ 228
+
229
+
+ 230
+ protected static Set<String> newHashSet(String... strings) {
+ 231 12 final Set<String> set = new HashSet<String>();
+ 232
+
+ 233 12 Collections.addAll(set, strings);
+ 234 12 return set;
+ 235
+ }
+ 236
+
+ 237
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html
index ce1cf31f5..d328e8981 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html
@@ -319,6 +319,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html
index c87892b99..21305880b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html
@@ -135,6 +135,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html
index 70d0ffc0a..94ffd29d6 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html
@@ -161,6 +161,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html
index b11aec2f0..504d12efd 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html
@@ -121,6 +121,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
index ff9c555be..650fafd32 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
@@ -806,6 +806,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html
index 3ca0a9f04..5bc097804 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AssemblyAnalyzer.html
@@ -546,6 +546,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
index 7bd2cf944..4164e35c4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
@@ -375,13 +375,13 @@
}
194 6 boolean identifierAdded = false ;
195 6 for (IndexEntry e : entries) {
-
196 27 if (verifyEntry(e, dependency)) {
+
196 23 if (verifyEntry(e, dependency)) {
197 2 final String vendor = e.getVendor();
198 2 final String product = e.getProduct();
199 2 identifierAdded |= determineIdentifiers(dependency, vendor, product, confidence);
200
}
-
201 27 }
+
201 23 }
202 6 if (identifierAdded) {
203 1 break ;
204
@@ -493,10 +493,10 @@
266 6 final TopDocs docs = cpe.search(searchString, MAX_QUERY_RESULTS);
267 156 for (ScoreDoc d : docs.scoreDocs) {
268 150 if (d.score >= 0.08) {
-
269 27 final Document doc = cpe.getDocument(d.doc);
-
270 27 final IndexEntry entry = new IndexEntry();
-
271 27 entry.setVendor(doc.get(Fields.VENDOR));
-
272 27 entry.setProduct(doc.get(Fields.PRODUCT));
+
269 23 final Document doc = cpe.getDocument(d.doc);
+
270 23 final IndexEntry entry = new IndexEntry();
+
271 23 entry.setVendor(doc.get(Fields.VENDOR));
+
272 23 entry.setProduct(doc.get(Fields.PRODUCT));
273
274
@@ -511,9 +511,9 @@
279
-
280 27 entry.setSearchScore(d.score);
-
281 27 if (!ret.contains(entry)) {
-
282 27 ret.add(entry);
+
280 23 entry.setSearchScore(d.score);
+
281 23 if (!ret.contains(entry)) {
+
282 23 ret.add(entry);
283
}
284
@@ -723,10 +723,10 @@
411
private boolean verifyEntry(final IndexEntry entry, final Dependency dependency) {
-
412 27 boolean isValid = false ;
+
412 23 boolean isValid = false ;
413
-
414 27 if (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())
+
414 23 if (collectionContainsString(dependency.getProductEvidence(), entry.getProduct())
415
&& collectionContainsString(dependency.getVendorEvidence(), entry.getVendor())) {
416
@@ -734,7 +734,7 @@
417 2 isValid = true ;
418
}
-
419 27 return isValid;
+
419 23 return isValid;
420
}
421
@@ -779,14 +779,14 @@
441
-
442 29 if (text == null ) {
+
442 25 if (text == null ) {
443 0 return false ;
444
}
-
445 29 final String[] words = text.split("[\\s_-]" );
-
446 29 final List<String> list = new ArrayList<String>();
-
447 29 String tempWord = null ;
-
448 99 for (String word : words) {
+
445 25 final String[] words = text.split("[\\s_-]" );
+
446 25 final List<String> list = new ArrayList<String>();
+
447 25 String tempWord = null ;
+
448 83 for (String word : words) {
449
450
@@ -795,28 +795,28 @@
452
-
453 70 if (tempWord != null ) {
+
453 58 if (tempWord != null ) {
454 2 list.add(tempWord + word);
455 2 tempWord = null ;
-
456 68 } else if (word.length() <= 2) {
+
456 56 } else if (word.length() <= 2) {
457 2 tempWord = word;
458
} else {
-
459 66 list.add(word);
+
459 54 list.add(word);
460
}
461
}
-
462 29 if (tempWord != null && !list.isEmpty()) {
+
462 25 if (tempWord != null && !list.isEmpty()) {
463 0 final String tmp = list.get(list.size() - 1) + tempWord;
464 0 list.add(tmp);
465
}
-
466 29 boolean contains = true ;
-
467 29 for (String word : list) {
-
468 68 contains &= ec.containsUsedString(word);
-
469 68 }
-
470 29 return contains;
+
466 25 boolean contains = true ;
+
467 25 for (String word : list) {
+
468 56 contains &= ec.containsUsedString(word);
+
469 56 }
+
470 25 return contains;
471
}
472
@@ -1320,6 +1320,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html
index c2d71b687..c6d006a8a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CentralAnalyzer.html
@@ -376,6 +376,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html
index 4ec3d05ae..9972c966c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html
@@ -160,6 +160,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
index 403b62560..379c651f4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
@@ -750,6 +750,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
index 35c458c47..2ca1d0786 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
@@ -780,6 +780,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
index 28de5a418..404e80dcb 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
@@ -229,6 +229,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html
index 3582cafe5..471cf3384 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileTypeAnalyzer.html
@@ -84,9 +84,19 @@
33
boolean supportsExtension(String extension);
34
+
+
35
+
+
36
+
+
37
+
+
38
+ void reset();
+
39
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
index a0d7b8ab8..90c03b5fb 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
@@ -229,6 +229,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
index ad079b39f..5a75e6016 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
@@ -2202,6 +2202,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
index a67bcb4f4..81815f20a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
@@ -275,6 +275,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html
index 83118ae88..beccd5edd 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NexusAnalyzer.html
@@ -408,6 +408,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html
index 7610736d7..8ac684d36 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NuspecAnalyzer.html
@@ -297,6 +297,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
index 5a28acc0f..536f1f3cb 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
@@ -293,6 +293,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html
index 765d43462..f25a02fe8 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html
@@ -160,6 +160,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.AnalysisException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.AnalysisException.html
index 85a68bcc5..fbd9aedd9 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.AnalysisException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.AnalysisException.html
@@ -151,6 +151,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException.html
index c056d3e3b..836350fb4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.exception.ArchiveExtractionException.html
@@ -151,6 +151,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.central.CentralSearch.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.central.CentralSearch.html
index bf279c48a..0d63d701e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.central.CentralSearch.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.central.CentralSearch.html
@@ -275,6 +275,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html
index 8f11c8536..be03b8c7f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.CpeMemoryIndex.html
@@ -12,7 +12,7 @@
@@ -144,7 +144,7 @@
64
-
65 1 private static CpeMemoryIndex instance = new CpeMemoryIndex();
+
65 1 private static final CpeMemoryIndex INSTANCE = new CpeMemoryIndex();
66
67
@@ -171,7 +171,7 @@
78
public static CpeMemoryIndex getInstance() {
-
79 1 return instance;
+
79 1 return INSTANCE;
80
}
81
@@ -246,343 +246,345 @@
116
public void open(CveDB cve) throws IndexException {
-
117 1 if (!openState) {
-
118 1 index = new RAMDirectory();
-
119 1 buildIndex(cve);
-
120
- try {
-
121 1 indexReader = DirectoryReader.open(index);
-
122 0 } catch (IOException ex) {
-
123 0 throw new IndexException(ex);
-
124 1 }
-
125 1 indexSearcher = new IndexSearcher(indexReader);
-
126 1 searchingAnalyzer = createSearchingAnalyzer();
-
127 1 queryParser = new QueryParser(LuceneUtils.CURRENT_VERSION, Fields.DOCUMENT_KEY, searchingAnalyzer);
-
128 1 openState = true ;
-
129
- }
-
130 1 }
-
131
-
-
132
-
-
133
-
-
134
- private boolean openState = false ;
-
135
-
-
136
-
-
137
-
-
138
-
-
139
-
-
140
-
-
141
- public boolean isOpen() {
-
142
- return openState;
-
143
- }
-
144
-
-
145
-
-
146
-
-
147
-
-
148
-
-
149
-
-
150
- @SuppressWarnings("unchecked" )
-
151
- private Analyzer createIndexingAnalyzer() {
-
152 1 final Map fieldAnalyzers = new HashMap();
-
153 1 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
-
154 1 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(LuceneUtils.CURRENT_VERSION), fieldAnalyzers);
-
155
- }
-
156
-
-
157
-
-
158
-
-
159
-
-
160
-
-
161
-
-
162
- @SuppressWarnings("unchecked" )
-
163
- private Analyzer createSearchingAnalyzer() {
-
164 1 final Map<String, Analyzer> fieldAnalyzers = new HashMap<String, Analyzer>();
-
165 1 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
-
166 1 productSearchFieldAnalyzer = new SearchFieldAnalyzer(LuceneUtils.CURRENT_VERSION);
-
167 1 vendorSearchFieldAnalyzer = new SearchFieldAnalyzer(LuceneUtils.CURRENT_VERSION);
-
168 1 fieldAnalyzers.put(Fields.PRODUCT, productSearchFieldAnalyzer);
-
169 1 fieldAnalyzers.put(Fields.VENDOR, vendorSearchFieldAnalyzer);
-
170
-
-
171 1 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(LuceneUtils.CURRENT_VERSION), fieldAnalyzers);
-
172
- }
-
173
-
-
174
-
-
175
-
-
176
-
-
177
-
-
178
-
-
179
-
-
180
-
-
181
-
-
182
-
-
183
- public void saveEntry(String vendor, String product, IndexWriter indexWriter) throws CorruptIndexException, IOException {
-
184 22198 final Document doc = new Document();
-
185 22198 final Field v = new TextField(Fields.VENDOR, vendor, Field.Store.YES);
-
186 22198 final Field p = new TextField(Fields.PRODUCT, product, Field.Store.YES);
-
187 22198 doc.add(v);
-
188 22198 doc.add(p);
-
189 22198 indexWriter.addDocument(doc);
-
190 22198 }
-
191
-
-
192
-
-
193
-
-
194
-
-
195
- public void close() {
-
196 1 if (searchingAnalyzer != null ) {
-
197 1 searchingAnalyzer.close();
-
198 1 searchingAnalyzer = null ;
-
199
- }
-
200 1 if (indexReader != null ) {
-
201
- try {
-
202 1 indexReader.close();
-
203 0 } catch (IOException ex) {
-
204 0 LOGGER.log(Level.FINEST, null , ex);
-
205 1 }
-
206 1 indexReader = null ;
-
207
- }
-
208 1 queryParser = null ;
-
209 1 indexSearcher = null ;
-
210 1 if (index != null ) {
-
211 1 index.close();
-
212 1 index = null ;
-
213
- }
-
214 1 openState = false ;
-
215 1 }
-
216
-
-
217
-
-
218
-
-
219
-
-
220
-
-
221
-
-
222
-
-
223
- private void buildIndex(CveDB cve) throws IndexException {
-
224 1 Analyzer analyzer = null ;
-
225 1 IndexWriter indexWriter = null ;
-
226
- try {
-
227 1 analyzer = createIndexingAnalyzer();
-
228 1 final IndexWriterConfig conf = new IndexWriterConfig(LuceneUtils.CURRENT_VERSION, analyzer);
-
229 1 indexWriter = new IndexWriter(index, conf);
-
230
- try {
-
231 1 final Set<Pair<String, String>> data = cve.getVendorProductList();
-
232 1 for (Pair<String, String> pair : data) {
-
233 22198 saveEntry(pair.getLeft(), pair.getRight(), indexWriter);
-
234 22198 }
-
235 0 } catch (DatabaseException ex) {
-
236 0 LOGGER.log(Level.FINE, null , ex);
-
237 0 throw new IndexException("Error reading CPE data" , ex);
-
238 1 }
-
239 0 } catch (CorruptIndexException ex) {
-
240 0 throw new IndexException("Unable to close an in-memory index" , ex);
-
241 0 } catch (IOException ex) {
-
242 0 throw new IndexException("Unable to close an in-memory index" , ex);
-
243
- } finally {
-
244 1 if (indexWriter != null ) {
-
245
+ 117 1 synchronized (INSTANCE) {
+
118 1 if (!openState) {
+
119 1 index = new RAMDirectory();
+
120 1 buildIndex(cve);
+
121
try {
-
246
- try {
-
247 1 indexWriter.commit();
-
248
- } finally {
-
249 1 indexWriter.close(true );
-
250 1 }
-
251 0 } catch (CorruptIndexException ex) {
-
252 0 throw new IndexException("Unable to close an in-memory index" , ex);
-
253 0 } catch (IOException ex) {
-
254 0 throw new IndexException("Unable to close an in-memory index" , ex);
-
255 1 }
-
256 1 if (analyzer != null ) {
-
257 1 analyzer.close();
-
258
- }
-
259
+ 122 1 indexReader = DirectoryReader.open(index);
+
123 0 } catch (IOException ex) {
+
124 0 throw new IndexException(ex);
+
125 1 }
+
126 1 indexSearcher = new IndexSearcher(indexReader);
+
127 1 searchingAnalyzer = createSearchingAnalyzer();
+
128 1 queryParser = new QueryParser(LuceneUtils.CURRENT_VERSION, Fields.DOCUMENT_KEY, searchingAnalyzer);
+
129 1 openState = true ;
+
130
}
+
131 1 }
+
132 1 }
+
133
+
+
134
+
+
135
+
+
136
+ private boolean openState = false ;
+
137
+
+
138
+
+
139
+
+
140
+
+
141
+
+
142
+
+
143
+ public boolean isOpen() {
+
144
+ return openState;
+
145
+ }
+
146
+
+
147
+
+
148
+
+
149
+
+
150
+
+
151
+
+
152
+ @SuppressWarnings("unchecked" )
+
153
+ private Analyzer createIndexingAnalyzer() {
+
154 1 final Map fieldAnalyzers = new HashMap();
+
155 1 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
+
156 1 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(LuceneUtils.CURRENT_VERSION), fieldAnalyzers);
+
157
+ }
+
158
+
+
159
+
+
160
+
+
161
+
+
162
+
+
163
+
+
164
+ @SuppressWarnings("unchecked" )
+
165
+ private Analyzer createSearchingAnalyzer() {
+
166 1 final Map<String, Analyzer> fieldAnalyzers = new HashMap<String, Analyzer>();
+
167 1 fieldAnalyzers.put(Fields.DOCUMENT_KEY, new KeywordAnalyzer());
+
168 1 productSearchFieldAnalyzer = new SearchFieldAnalyzer(LuceneUtils.CURRENT_VERSION);
+
169 1 vendorSearchFieldAnalyzer = new SearchFieldAnalyzer(LuceneUtils.CURRENT_VERSION);
+
170 1 fieldAnalyzers.put(Fields.PRODUCT, productSearchFieldAnalyzer);
+
171 1 fieldAnalyzers.put(Fields.VENDOR, vendorSearchFieldAnalyzer);
+
172
+
+
173 1 return new PerFieldAnalyzerWrapper(new FieldAnalyzer(LuceneUtils.CURRENT_VERSION), fieldAnalyzers);
+
174
+ }
+
175
+
+
176
+
+
177
+
+
178
+
+
179
+
+
180
+
+
181
+
+
182
+
+
183
+
+
184
+
+
185
+ public void saveEntry(String vendor, String product, IndexWriter indexWriter) throws CorruptIndexException, IOException {
+
186 22163 final Document doc = new Document();
+
187 22163 final Field v = new TextField(Fields.VENDOR, vendor, Field.Store.YES);
+
188 22163 final Field p = new TextField(Fields.PRODUCT, product, Field.Store.YES);
+
189 22163 doc.add(v);
+
190 22163 doc.add(p);
+
191 22163 indexWriter.addDocument(doc);
+
192 22163 }
+
193
+
+
194
+
+
195
+
+
196
+
+
197
+ public void close() {
+
198 1 if (searchingAnalyzer != null ) {
+
199 1 searchingAnalyzer.close();
+
200 1 searchingAnalyzer = null ;
+
201
+ }
+
202 1 if (indexReader != null ) {
+
203
+ try {
+
204 1 indexReader.close();
+
205 0 } catch (IOException ex) {
+
206 0 LOGGER.log(Level.FINEST, null , ex);
+
207 1 }
+
208 1 indexReader = null ;
+
209
+ }
+
210 1 queryParser = null ;
+
211 1 indexSearcher = null ;
+
212 1 if (index != null ) {
+
213 1 index.close();
+
214 1 index = null ;
+
215
+ }
+
216 1 openState = false ;
+
217 1 }
+
218
+
+
219
+
+
220
+
+
221
+
+
222
+
+
223
+
+
224
+
+
225
+ private void buildIndex(CveDB cve) throws IndexException {
+
226 1 Analyzer analyzer = null ;
+
227 1 IndexWriter indexWriter = null ;
+
228
+ try {
+
229 1 analyzer = createIndexingAnalyzer();
+
230 1 final IndexWriterConfig conf = new IndexWriterConfig(LuceneUtils.CURRENT_VERSION, analyzer);
+
231 1 indexWriter = new IndexWriter(index, conf);
+
232
+ try {
+
233 1 final Set<Pair<String, String>> data = cve.getVendorProductList();
+
234 1 for (Pair<String, String> pair : data) {
+
235 22163 saveEntry(pair.getLeft(), pair.getRight(), indexWriter);
+
236 22163 }
+
237 0 } catch (DatabaseException ex) {
+
238 0 LOGGER.log(Level.FINE, null , ex);
+
239 0 throw new IndexException("Error reading CPE data" , ex);
+
240 1 }
+
241 0 } catch (CorruptIndexException ex) {
+
242 0 throw new IndexException("Unable to close an in-memory index" , ex);
+
243 0 } catch (IOException ex) {
+
244 0 throw new IndexException("Unable to close an in-memory index" , ex);
+
245
+ } finally {
+
246 1 if (indexWriter != null ) {
+
247
+ try {
+
248
+ try {
+
249 1 indexWriter.commit();
+
250
+ } finally {
+
251 1 indexWriter.close(true );
+
252 1 }
+
253 0 } catch (CorruptIndexException ex) {
+
254 0 throw new IndexException("Unable to close an in-memory index" , ex);
+
255 0 } catch (IOException ex) {
+
256 0 throw new IndexException("Unable to close an in-memory index" , ex);
+
257 1 }
+
258 1 if (analyzer != null ) {
+
259 1 analyzer.close();
260
- }
-
261 1 }
+
}
+
261
+ }
262
-
-
263
-
+
}
+
263 1 }
264
-
+
265
-
+
266
+
+
267
+
+
268
private void resetSearchingAnalyzer() {
-
267 0 if (productSearchFieldAnalyzer != null ) {
-
268 0 productSearchFieldAnalyzer.clear();
-
269
+ 269 0 if (productSearchFieldAnalyzer != null ) {
+
270 0 productSearchFieldAnalyzer.clear();
+
271
}
-
270 0 if (vendorSearchFieldAnalyzer != null ) {
-
271 0 vendorSearchFieldAnalyzer.clear();
-
272
- }
-
273 0 }
+
272 0 if (vendorSearchFieldAnalyzer != null ) {
+
273 0 vendorSearchFieldAnalyzer.clear();
274
-
-
275
-
+
}
+
275 0 }
276
-
+
277
-
+
278
-
+
279
-
+
280
-
+
281
-
+
282
-
+
283
-
+
284
+
+
285
+
+
286
public TopDocs search(String searchString, int maxQueryResults) throws ParseException, IOException {
-
285 6 if (searchString == null || searchString.trim().isEmpty()) {
-
286 0 throw new ParseException("Query is null or empty" );
-
287
+ 287 6 if (searchString == null || searchString.trim().isEmpty()) {
+
288 0 throw new ParseException("Query is null or empty" );
+
289
}
-
288 6 final Query query = queryParser.parse(searchString);
-
289 6 return indexSearcher.search(query, maxQueryResults);
-
290
- }
-
291
-
+
290 6 final Query query = queryParser.parse(searchString);
+
291 6 return indexSearcher.search(query, maxQueryResults);
292
-
+
}
293
-
+
294
-
+
295
-
+
296
-
+
297
-
+
298
-
+
299
-
+
300
-
+
301
- public TopDocs search(Query query, int maxQueryResults) throws CorruptIndexException, IOException {
-
302 0 resetSearchingAnalyzer();
-
303 0 return indexSearcher.search(query, maxQueryResults);
-
304
- }
-
305
-
-
306
-
-
307
-
-
308
-
-
309
-
-
310
-
-
311
-
312
+ 302
-
313
- public Document getDocument(int documentId) throws IOException {
-
314 27 return indexSearcher.doc(documentId);
-
315
+ 303
+ public TopDocs search(Query query, int maxQueryResults) throws CorruptIndexException, IOException {
+
304 0 resetSearchingAnalyzer();
+
305 0 return indexSearcher.search(query, maxQueryResults);
+
306
}
-
316
+ 307
-
317
+ 308
-
318
-
-
319
+ 309
+
+
310
-
320
-
-
321
+ 311
+
+
312
+
+
313
+
+
314
-
322
- public int numDocs() {
-
323 0 if (indexReader == null ) {
-
324 0 return -1;
-
325
- }
-
326 0 return indexReader.numDocs();
-
327
+ 315
+ public Document getDocument(int documentId) throws IOException {
+
316 23 return indexSearcher.doc(documentId);
+
317
}
-
328
+ 318
+
+
319
+
+
320
+
+
321
+
+
322
+
+
323
+
+
324
+ public int numDocs() {
+
325 0 if (indexReader == null ) {
+
326 0 return -1;
+
327
+ }
+
328 0 return indexReader.numDocs();
+
329
+ }
+
330
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html
index 283c38b9a..ef89076a4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.Fields.html
@@ -109,6 +109,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html
index 33159b0e0..22b35ddb4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexEntry.html
@@ -332,17 +332,17 @@
@Override
164
public boolean equals(Object obj) {
-
165 51 if (obj == null ) {
+
165 39 if (obj == null ) {
166 0 return false ;
167
}
-
168 51 if (getClass() != obj.getClass()) {
+
168 39 if (getClass() != obj.getClass()) {
169 0 return false ;
170
}
-
171 51 final IndexEntry other = (IndexEntry) obj;
-
172 51 if ((this .vendor == null ) ? (other.vendor != null ) : !this .vendor.equals(other.vendor)) {
-
173 46 return false ;
+
171 39 final IndexEntry other = (IndexEntry) obj;
+
172 39 if ((this .vendor == null ) ? (other.vendor != null ) : !this .vendor.equals(other.vendor)) {
+
173 34 return false ;
174
}
175 5 if ((this .product == null ) ? (other.product != null ) : !this .product.equals(other.product)) {
@@ -375,6 +375,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexException.html
index d07612a59..9cae08c45 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cpe.IndexException.html
@@ -151,6 +151,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html
index eafe2e5d0..b73725e65 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweDB.html
@@ -184,6 +184,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html
index 4cc13033c..7487a022e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.cwe.CweHandler.html
@@ -122,6 +122,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html
index 87177fc9e..b23faa47b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AbstractTokenizingFilter.html
@@ -161,20 +161,20 @@
74
protected boolean addTerm() {
-
75 19724 final boolean termAdded = tokens.size() > 0;
-
76 19720 if (termAdded) {
-
77 13235 final String term = tokens.pop();
-
78 13233 clearAttributes();
-
79 13237 termAtt.append(term);
+
75 19527 final boolean termAdded = tokens.size() > 0;
+
76 19530 if (termAdded) {
+
77 13053 final String term = tokens.pop();
+
78 13052 clearAttributes();
+
79 13052 termAtt.append(term);
80
}
-
81 19705 return termAdded;
+
81 19528 return termAdded;
82
}
83
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html
index 6d68bad3f..8eecf6fbd 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.AlphaNumericTokenizer.html
@@ -135,13 +135,13 @@
@Override
59
protected boolean isTokenChar(int c) {
-
60 518827 return Character.isLetter(c) || Character.isDigit(c);
+
60 517958 return Character.isLetter(c) || Character.isDigit(c);
61
}
62
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html
index d5f6902dc..4bebee302 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.DependencySimilarity.html
@@ -112,6 +112,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html
index e51a42df5..2e0fb214f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.FieldAnalyzer.html
@@ -173,6 +173,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html
index 5a6a7f122..23fb18820 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.LuceneUtils.html
@@ -219,6 +219,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html
index be0e4d50b..daf4697eb 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchFieldAnalyzer.html
@@ -203,6 +203,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html
index 7efd017e0..31f2f1382 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.SearchVersionAnalyzer.html
@@ -158,6 +158,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html
index 989e15a72..75bb50f42 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.TokenPairConcatenatingFilter.html
@@ -243,6 +243,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html
index c1ac8c322..e61e7d48a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.UrlTokenizingFilter.html
@@ -136,11 +136,11 @@
@Override
60
public boolean incrementToken() throws IOException {
-
61 19793 final LinkedList<String> tokens = getTokens();
-
62 19787 final CharTermAttribute termAtt = getTermAtt();
-
63 19793 if (tokens.size() == 0 && input.incrementToken()) {
-
64 13253 final String text = new String(termAtt.buffer(), 0, termAtt.length());
-
65 13253 if (UrlStringUtils.containsUrl(text)) {
+
61 19587 final LinkedList<String> tokens = getTokens();
+
62 19590 final CharTermAttribute termAtt = getTermAtt();
+
63 19591 if (tokens.size() == 0 && input.incrementToken()) {
+
64 13046 final String text = new String(termAtt.buffer(), 0, termAtt.length());
+
65 13049 if (UrlStringUtils.containsUrl(text)) {
66 2 final String[] parts = text.split("\\s" );
67 4 for (String part : parts) {
68 2 if (UrlStringUtils.isUrl(part)) {
@@ -160,18 +160,18 @@
79
}
80 2 } else {
-
81 13248 tokens.add(text);
+
81 13047 tokens.add(text);
82
}
83
}
-
84 19725 return addTerm();
+
84 19519 return addTerm();
85
}
86
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html
index 6afa40739..ca5f5d47b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionAnalyzer.html
@@ -157,6 +157,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.html
index bf2655d26..5485dcf16 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.lucene.VersionTokenizingFilter.html
@@ -195,6 +195,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nexus.MavenArtifact.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nexus.MavenArtifact.html
index 994104664..c9b11a299 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nexus.MavenArtifact.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nexus.MavenArtifact.html
@@ -335,6 +335,6 @@
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nexus.NexusSearch.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nexus.NexusSearch.html
index 4939fbf63..99e34a454 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nexus.NexusSearch.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nexus.NexusSearch.html
@@ -324,6 +324,6 @@
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NugetPackage.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NugetPackage.html
index 0e6fe2095..3affd7f91 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NugetPackage.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NugetPackage.html
@@ -377,6 +377,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParseException.html
index f7bb529a0..24d4c6814 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParseException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParseException.html
@@ -153,6 +153,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParser.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParser.html
index bdcbf497a..e66842029 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParser.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.NuspecParser.html
@@ -93,6 +93,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html
index 80797e4dd..7482a5aa2 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nuget.XPathNuspecParser.html
@@ -164,6 +164,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html
index 9ae75bd9c..c7960481a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.ConnectionFactory.html
@@ -501,6 +501,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html
index f787caed7..48cc43644 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CorruptDatabaseException.html
@@ -121,6 +121,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html
index 710954504..f11f75caa 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseException.html
@@ -137,6 +137,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html
index 7d6ec7779..a6c239c32 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DatabaseProperties.html
@@ -343,6 +343,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoadException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoadException.html
index 7eaf3d949..aedf1d017 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoadException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoadException.html
@@ -137,6 +137,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoader.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoader.html
index 4d9a1bdd3..410474fec 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoader.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverLoader.html
@@ -274,6 +274,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverShim.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverShim.html
index 19df96425..4b4aeaed2 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverShim.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.DriverShim.html
@@ -395,6 +395,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CachedWebDataSource.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CachedWebDataSource.html
index 9770405de..ba92eab61 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CachedWebDataSource.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CachedWebDataSource.html
@@ -93,6 +93,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.EngineVersionCheck.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.EngineVersionCheck.html
index a4897b59b..e1dac6963 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.EngineVersionCheck.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.EngineVersionCheck.html
@@ -12,7 +12,7 @@
@@ -189,183 +189,191 @@
86
try {
87 0 openDatabase();
-
88 0 final DatabaseProperties properties = cveDB.getDatabaseProperties();
-
89 0 final long lastChecked = Long.parseLong(properties.getProperty(ENGINE_VERSION_CHECKED_ON, "0" ));
-
90 0 final long now = (new Date()).getTime();
-
91 0 updateToVersion = properties.getProperty(CURRENT_ENGINE_RELEASE, "" );
-
92 0 final String currentVersion = Settings.getString(Settings.KEYS.APPLICATION_VERSION, "0.0.0" );
-
93 0 final boolean updateNeeded = shouldUpdate(lastChecked, now, properties, currentVersion);
-
94 0 if (updateNeeded) {
-
95 0 final String msg = String.format("A new version of dependency-check is available. Consider updating to version %s." ,
-
96
+ 88 0 LOGGER.fine("Begin Engine Version Check" );
+
89 0 final DatabaseProperties properties = cveDB.getDatabaseProperties();
+
90 0 final long lastChecked = Long.parseLong(properties.getProperty(ENGINE_VERSION_CHECKED_ON, "0" ));
+
91 0 final long now = (new Date()).getTime();
+
92 0 updateToVersion = properties.getProperty(CURRENT_ENGINE_RELEASE, "" );
+
93 0 final String currentVersion = Settings.getString(Settings.KEYS.APPLICATION_VERSION, "0.0.0" );
+
94 0 LOGGER.fine("Last checked: " + lastChecked);
+
95 0 LOGGER.fine("Now: " + now);
+
96 0 LOGGER.fine("Current version: " + currentVersion);
+
97 0 final boolean updateNeeded = shouldUpdate(lastChecked, now, properties, currentVersion);
+
98 0 if (updateNeeded) {
+
99 0 final String msg = String.format("A new version of dependency-check is available. Consider updating to version %s." ,
+
100
updateToVersion);
-
97 0 LOGGER.warning(msg);
-
98
- }
-
99 0 } catch (DatabaseException ex) {
-
100 0 LOGGER.log(Level.FINE, "Database Exception opening databases to retrieve properties" , ex);
-
101 0 throw new UpdateException("Error occured updating database properties." );
+
101 0 LOGGER.warning(msg);
102
- } finally {
-
103 0 closeDatabase();
-
104 0 }
-
105 0 }
+
}
+
103 0 } catch (DatabaseException ex) {
+
104 0 LOGGER.log(Level.FINE, "Database Exception opening databases to retrieve properties" , ex);
+
105 0 throw new UpdateException("Error occured updating database properties." );
106
-
-
107
-
-
108
-
-
109
-
-
110
-
-
111
-
-
112
-
-
113
-
-
114
-
-
115
-
-
116
-
-
117
-
-
118
- protected boolean shouldUpdate(final long lastChecked, final long now, final DatabaseProperties properties,
-
119
- String currentVersion) throws UpdateException {
-
120
-
-
121 7 int checkRange = 30;
-
122 7 if (updateToVersion.isEmpty()) {
-
123 2 checkRange = 7;
-
124
- }
-
125 7 if (!DateUtil.withinDateRange(lastChecked, now, checkRange)) {
-
126 2 final String currentRelease = getCurrentReleaseVersion();
-
127 2 if (currentRelease != null ) {
-
128 2 final DependencyVersion v = new DependencyVersion(currentRelease);
-
129 2 if (v.getVersionParts() != null && v.getVersionParts().size() >= 3) {
-
130 2 if (!currentRelease.equals(updateToVersion)) {
-
131 2 properties.save(CURRENT_ENGINE_RELEASE, v.toString());
-
132
- } else {
-
133 0 properties.save(CURRENT_ENGINE_RELEASE, "" );
-
134
- }
-
135 2 properties.save(ENGINE_VERSION_CHECKED_ON, Long.toString(now));
-
136 2 updateToVersion = v.toString();
-
137
- }
-
138
- }
-
139
- }
-
140 7 final DependencyVersion running = new DependencyVersion(currentVersion);
-
141 7 final DependencyVersion released = new DependencyVersion(updateToVersion);
-
142 7 if (running.compareTo(released) < 0) {
-
143 3 return true ;
-
144
- }
-
145 4 return false ;
-
146
- }
-
147
-
-
148
-
-
149
-
-
150
-
-
151
-
-
152
-
-
153
- protected final void openDatabase() throws DatabaseException {
-
154 0 if (cveDB != null ) {
-
155 0 return ;
-
156
- }
-
157 0 cveDB = new CveDB();
-
158 0 cveDB.open();
-
159 0 }
-
160
-
-
161
-
-
162
-
-
163
-
-
164
- protected void closeDatabase() {
-
165 0 if (cveDB != null ) {
-
166
- try {
-
167 0 cveDB.close();
-
168 0 } catch (Throwable ignore) {
-
169 0 LOGGER.log(Level.FINEST, "Error closing the cveDB" , ignore);
-
170 0 }
-
171
- }
-
172 0 }
-
173
-
-
174
-
-
175
-
-
176
-
-
177
-
-
178
-
-
179
- protected String getCurrentReleaseVersion() {
-
180 3 HttpURLConnection conn = null ;
-
181
- try {
-
182 3 final String str = Settings.getString(Settings.KEYS.ENGINE_VERSION_CHECK_URL, "http://jeremylong.github.io/DependencyCheck/current.txt" );
-
183 3 final URL url = new URL(str);
-
184 3 conn = URLConnectionFactory.createHttpURLConnection(url);
-
185 3 conn.connect();
-
186 3 if (conn.getResponseCode() != 200) {
-
187 0 return null ;
-
188
- }
-
189 3 final String releaseVersion = IOUtils.toString(conn.getInputStream(), "UTF-8" );
-
190 3 if (releaseVersion != null ) {
-
191 3 return releaseVersion.trim();
-
192
- }
-
193 0 } catch (MalformedURLException ex) {
-
194 0 LOGGER.log(Level.FINE, "unable to retrieve current release version of dependency-check" , ex);
-
195 0 } catch (URLConnectionFailureException ex) {
-
196 0 LOGGER.log(Level.FINE, "unable to retrieve current release version of dependency-check" , ex);
-
197 0 } catch (IOException ex) {
-
198 0 LOGGER.log(Level.FINE, "unable to retrieve current release version of dependency-check" , ex);
-
199
} finally {
-
200 3 if (conn != null ) {
-
201 3 conn.disconnect();
-
202
- }
-
203
+ 107 0 closeDatabase();
+
108 0 }
+
109 0 }
+
110
+
+
111
+
+
112
+
+
113
+
+
114
+
+
115
+
+
116
+
+
117
+
+
118
+
+
119
+
+
120
+
+
121
+
+
122
+ protected boolean shouldUpdate(final long lastChecked, final long now, final DatabaseProperties properties,
+
123
+ String currentVersion) throws UpdateException {
+
124
+
+
125 7 int checkRange = 30;
+
126 7 if (updateToVersion.isEmpty()) {
+
127 2 checkRange = 7;
+
128
}
-
204 0 return null ;
-
205
+ 129 7 if (!DateUtil.withinDateRange(lastChecked, now, checkRange)) {
+
130 2 LOGGER.fine("Checking web for new version." );
+
131 2 final String currentRelease = getCurrentReleaseVersion();
+
132 2 if (currentRelease != null ) {
+
133 2 final DependencyVersion v = new DependencyVersion(currentRelease);
+
134 2 if (v.getVersionParts() != null && v.getVersionParts().size() >= 3) {
+
135 2 updateToVersion = v.toString();
+
136 2 if (!currentRelease.equals(updateToVersion)) {
+
137 0 properties.save(CURRENT_ENGINE_RELEASE, updateToVersion);
+
138
+ } else {
+
139 2 properties.save(CURRENT_ENGINE_RELEASE, "" );
+
140
+ }
+
141 2 properties.save(ENGINE_VERSION_CHECKED_ON, Long.toString(now));
+
142
+ }
+
143
+ }
+
144 2 LOGGER.log(Level.FINE, "Current Release: {0}" , updateToVersion);
+
145
+ }
+
146 7 final DependencyVersion running = new DependencyVersion(currentVersion);
+
147 7 final DependencyVersion released = new DependencyVersion(updateToVersion);
+
148 7 if (running.compareTo(released) < 0) {
+
149 3 LOGGER.fine("Upgrade recommended" );
+
150 3 return true ;
+
151
+ }
+
152 4 LOGGER.fine("Upgrade not needed" );
+
153 4 return false ;
+
154
}
-
206
+ 155
+
+
156
+
+
157
+
+
158
+
+
159
+
+
160
+
+
161
+ protected final void openDatabase() throws DatabaseException {
+
162 0 if (cveDB != null ) {
+
163 0 return ;
+
164
+ }
+
165 0 cveDB = new CveDB();
+
166 0 cveDB.open();
+
167 0 }
+
168
+
+
169
+
+
170
+
+
171
+
+
172
+ protected void closeDatabase() {
+
173 0 if (cveDB != null ) {
+
174
+ try {
+
175 0 cveDB.close();
+
176 0 } catch (Throwable ignore) {
+
177 0 LOGGER.log(Level.FINEST, "Error closing the cveDB" , ignore);
+
178 0 }
+
179
+ }
+
180 0 }
+
181
+
+
182
+
+
183
+
+
184
+
+
185
+
+
186
+
+
187
+ protected String getCurrentReleaseVersion() {
+
188 3 HttpURLConnection conn = null ;
+
189
+ try {
+
190 3 final String str = Settings.getString(Settings.KEYS.ENGINE_VERSION_CHECK_URL, "http://jeremylong.github.io/DependencyCheck/current.txt" );
+
191 3 final URL url = new URL(str);
+
192 3 conn = URLConnectionFactory.createHttpURLConnection(url);
+
193 3 conn.connect();
+
194 3 if (conn.getResponseCode() != 200) {
+
195 0 return null ;
+
196
+ }
+
197 3 final String releaseVersion = IOUtils.toString(conn.getInputStream(), "UTF-8" );
+
198 3 if (releaseVersion != null ) {
+
199 3 return releaseVersion.trim();
+
200
+ }
+
201 0 } catch (MalformedURLException ex) {
+
202 0 LOGGER.log(Level.FINE, "unable to retrieve current release version of dependency-check" , ex);
+
203 0 } catch (URLConnectionFailureException ex) {
+
204 0 LOGGER.log(Level.FINE, "unable to retrieve current release version of dependency-check" , ex);
+
205 0 } catch (IOException ex) {
+
206 0 LOGGER.log(Level.FINE, "unable to retrieve current release version of dependency-check" , ex);
+
207
+ } finally {
+
208 3 if (conn != null ) {
+
209 3 conn.disconnect();
+
210
+ }
+
211
+ }
+
212 0 return null ;
+
213
+ }
+
214
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html
index b37c5d09b..f0b1f2353 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveInfo.html
@@ -293,6 +293,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveUpdater.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveUpdater.html
index e63c38287..c3b8746a3 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveUpdater.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.NvdCveUpdater.html
@@ -137,6 +137,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.StandardUpdate.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.StandardUpdate.html
index b00e51135..36305e17c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.StandardUpdate.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.StandardUpdate.html
@@ -520,6 +520,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateService.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateService.html
index 5cae78b7e..6b2748619 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateService.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateService.html
@@ -121,6 +121,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateableNvdCve.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateableNvdCve.html
index 870b60f0b..fb520c8f6 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateableNvdCve.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.UpdateableNvdCve.html
@@ -362,6 +362,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.InvalidDataException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.InvalidDataException.html
index 0013fa893..d17da6594 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.InvalidDataException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.InvalidDataException.html
@@ -119,6 +119,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.UpdateException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.UpdateException.html
index 52604e580..0506c25de 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.UpdateException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.exception.UpdateException.html
@@ -155,6 +155,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.ProcessTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.ProcessTask.html
index caa4a60f5..77a8143cf 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.ProcessTask.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.task.ProcessTask.html
@@ -343,6 +343,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html
index a8b56c04c..a3a04c092 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve12Handler.html
@@ -453,6 +453,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html
index 0c9714c18..d2d69e4a5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.xml.NvdCve20Handler.html
@@ -876,6 +876,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html
index eb9b52e05..d4830656a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Confidence.html
@@ -100,6 +100,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html
index 306461e36..13ce74d11 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html
@@ -12,7 +12,7 @@
@@ -1157,172 +1157,182 @@
612
public void addRelatedDependency(Dependency dependency) {
-
613 0 relatedDependencies.add(dependency);
-
614 0 }
+
613 0 if (this == dependency) {
+
614 0 LOGGER.warning("Attempted to add a circular reference - please post the log file to issue #172 here "
615
-
-
616
-
-
617
-
+
+ "https://github.com/jeremylong/DependencyCheck/issues/172 " );
+
616 0 LOGGER.log(Level.FINE, "this: {0}" , this .toString());
+
617 0 LOGGER.log(Level.FINE, "dependency: {0}" , dependency.toString());
618
-
-
619
-
+
} else {
+
619 0 relatedDependencies.add(dependency);
620
-
-
621
-
+
}
+
621 0 }
622
- public int compareTo(Dependency o) {
-
623 2 return this .getFilePath().compareToIgnoreCase(o.getFilePath());
-
624
- }
-
625
-
626
+ 623
-
627
-
-
628
+ 624
+
+
625
-
629
-
-
630
-
-
631
+ 626
+
+
627
+
+
628
+
629
+ public int compareTo(Dependency o) {
+
630 2 return this .getFilePath().compareToIgnoreCase(o.getFilePath());
+
631
+ }
632
- @Override
+
633
- public boolean equals(Object obj) {
-
634 0 if (obj == null ) {
-
635 0 return false ;
+
+
634
+
+
635
+
636
- }
-
637 0 if (getClass() != obj.getClass()) {
-
638 0 return false ;
+
+
637
+
+
638
+
639
- }
-
640 0 final Dependency other = (Dependency) obj;
-
641 0 if ((this .actualFilePath == null ) ? (other.actualFilePath != null ) : !this .actualFilePath.equals(other.actualFilePath)) {
+
@Override
+
640
+ public boolean equals(Object obj) {
+
641 0 if (obj == null ) {
642 0 return false ;
643
}
-
644 0 if ((this .filePath == null ) ? (other.filePath != null ) : !this .filePath.equals(other.filePath)) {
+
644 0 if (getClass() != obj.getClass()) {
645 0 return false ;
646
}
-
647 0 if ((this .fileName == null ) ? (other.fileName != null ) : !this .fileName.equals(other.fileName)) {
-
648 0 return false ;
-
649
+ 647 0 final Dependency other = (Dependency) obj;
+
648 0 if ((this .actualFilePath == null ) ? (other.actualFilePath != null ) : !this .actualFilePath.equals(other.actualFilePath)) {
+
649 0 return false ;
+
650
}
-
650 0 if ((this .fileExtension == null ) ? (other.fileExtension != null ) : !this .fileExtension.equals(other.fileExtension)) {
-
651 0 return false ;
-
652
+ 651 0 if ((this .filePath == null ) ? (other.filePath != null ) : !this .filePath.equals(other.filePath)) {
+
652 0 return false ;
+
653
}
-
653 0 if ((this .md5sum == null ) ? (other.md5sum != null ) : !this .md5sum.equals(other.md5sum)) {
-
654 0 return false ;
-
655
+ 654 0 if ((this .fileName == null ) ? (other.fileName != null ) : !this .fileName.equals(other.fileName)) {
+
655 0 return false ;
+
656
}
-
656 0 if ((this .sha1sum == null ) ? (other.sha1sum != null ) : !this .sha1sum.equals(other.sha1sum)) {
-
657 0 return false ;
-
658
+ 657 0 if ((this .fileExtension == null ) ? (other.fileExtension != null ) : !this .fileExtension.equals(other.fileExtension)) {
+
658 0 return false ;
+
659
}
-
659 0 if (this .identifiers != other.identifiers && (this .identifiers == null || !this .identifiers.equals(other.identifiers))) {
-
660 0 return false ;
-
661
+ 660 0 if ((this .md5sum == null ) ? (other.md5sum != null ) : !this .md5sum.equals(other.md5sum)) {
+
661 0 return false ;
+
662
}
-
662 0 if (this .vendorEvidence != other.vendorEvidence && (this .vendorEvidence == null || !this .vendorEvidence.equals(other.vendorEvidence))) {
-
663 0 return false ;
-
664
+ 663 0 if ((this .sha1sum == null ) ? (other.sha1sum != null ) : !this .sha1sum.equals(other.sha1sum)) {
+
664 0 return false ;
+
665
}
-
665 0 if (this .productEvidence != other.productEvidence && (this .productEvidence == null || !this .productEvidence.equals(other.productEvidence))) {
-
666 0 return false ;
-
667
+ 666 0 if (this .identifiers != other.identifiers && (this .identifiers == null || !this .identifiers.equals(other.identifiers))) {
+
667 0 return false ;
+
668
}
-
668 0 if (this .versionEvidence != other.versionEvidence && (this .versionEvidence == null || !this .versionEvidence.equals(other.versionEvidence))) {
-
669 0 return false ;
-
670
+ 669 0 if (this .vendorEvidence != other.vendorEvidence && (this .vendorEvidence == null || !this .vendorEvidence.equals(other.vendorEvidence))) {
+
670 0 return false ;
+
671
}
-
671 0 if ((this .description == null ) ? (other.description != null ) : !this .description.equals(other.description)) {
-
672 0 return false ;
-
673
+ 672 0 if (this .productEvidence != other.productEvidence && (this .productEvidence == null || !this .productEvidence.equals(other.productEvidence))) {
+
673 0 return false ;
+
674
}
-
674 0 if ((this .license == null ) ? (other.license != null ) : !this .license.equals(other.license)) {
-
675 0 return false ;
-
676
+ 675 0 if (this .versionEvidence != other.versionEvidence && (this .versionEvidence == null || !this .versionEvidence.equals(other.versionEvidence))) {
+
676 0 return false ;
+
677
}
-
677 0 if (this .vulnerabilities != other.vulnerabilities && (this .vulnerabilities == null || !this .vulnerabilities.equals(other.vulnerabilities))) {
-
678 0 return false ;
-
679
+ 678 0 if ((this .description == null ) ? (other.description != null ) : !this .description.equals(other.description)) {
+
679 0 return false ;
+
680
}
-
680 0 if (this .relatedDependencies != other.relatedDependencies
-
681
- && (this .relatedDependencies == null || !this .relatedDependencies.equals(other.relatedDependencies))) {
+
681 0 if ((this .license == null ) ? (other.license != null ) : !this .license.equals(other.license)) {
682 0 return false ;
683
}
-
684 0 return true ;
-
685
- }
+
684 0 if (this .vulnerabilities != other.vulnerabilities && (this .vulnerabilities == null || !this .vulnerabilities.equals(other.vulnerabilities))) {
+
685 0 return false ;
686
-
-
687
-
+
}
+
687 0 if (this .relatedDependencies != other.relatedDependencies
688
-
-
689
-
+
&& (this .relatedDependencies == null || !this .relatedDependencies.equals(other.relatedDependencies))) {
+
689 0 return false ;
690
-
-
691
-
+
}
+
691 0 return true ;
692
- @Override
+
}
693
- public int hashCode() {
-
694 28 int hash = 3;
-
695 28 hash = 47 * hash + (this .actualFilePath != null ? this .actualFilePath.hashCode() : 0);
-
696 28 hash = 47 * hash + (this .filePath != null ? this .filePath.hashCode() : 0);
-
697 28 hash = 47 * hash + (this .fileName != null ? this .fileName.hashCode() : 0);
-
698 28 hash = 47 * hash + (this .fileExtension != null ? this .fileExtension.hashCode() : 0);
-
699 28 hash = 47 * hash + (this .md5sum != null ? this .md5sum.hashCode() : 0);
-
700 28 hash = 47 * hash + (this .sha1sum != null ? this .sha1sum.hashCode() : 0);
-
701 28 hash = 47 * hash + (this .identifiers != null ? this .identifiers.hashCode() : 0);
-
702 28 hash = 47 * hash + (this .vendorEvidence != null ? this .vendorEvidence.hashCode() : 0);
-
703 28 hash = 47 * hash + (this .productEvidence != null ? this .productEvidence.hashCode() : 0);
-
704 28 hash = 47 * hash + (this .versionEvidence != null ? this .versionEvidence.hashCode() : 0);
-
705 28 hash = 47 * hash + (this .description != null ? this .description.hashCode() : 0);
-
706 28 hash = 47 * hash + (this .license != null ? this .license.hashCode() : 0);
-
707 28 hash = 47 * hash + (this .vulnerabilities != null ? this .vulnerabilities.hashCode() : 0);
-
708 28 hash = 47 * hash + (this .relatedDependencies != null ? this .relatedDependencies.hashCode() : 0);
-
709 28 return hash;
-
710
- }
-
711
-
712
+ 694
-
713
-
-
714
+ 695
+
+
696
-
715
-
-
716
+ 697
+
+
698
-
717
+ 699
@Override
-
718
- public String toString() {
-
719 0 return "Dependency{ fileName='" + fileName + "', actualFilePath='" + actualFilePath + "', filePath='" + filePath + "'}" ;
-
720
+ 700
+ public int hashCode() {
+
701 28 int hash = 3;
+
702 28 hash = 47 * hash + (this .actualFilePath != null ? this .actualFilePath.hashCode() : 0);
+
703 28 hash = 47 * hash + (this .filePath != null ? this .filePath.hashCode() : 0);
+
704 28 hash = 47 * hash + (this .fileName != null ? this .fileName.hashCode() : 0);
+
705 28 hash = 47 * hash + (this .fileExtension != null ? this .fileExtension.hashCode() : 0);
+
706 28 hash = 47 * hash + (this .md5sum != null ? this .md5sum.hashCode() : 0);
+
707 28 hash = 47 * hash + (this .sha1sum != null ? this .sha1sum.hashCode() : 0);
+
708 28 hash = 47 * hash + (this .identifiers != null ? this .identifiers.hashCode() : 0);
+
709 28 hash = 47 * hash + (this .vendorEvidence != null ? this .vendorEvidence.hashCode() : 0);
+
710 28 hash = 47 * hash + (this .productEvidence != null ? this .productEvidence.hashCode() : 0);
+
711 28 hash = 47 * hash + (this .versionEvidence != null ? this .versionEvidence.hashCode() : 0);
+
712 28 hash = 47 * hash + (this .description != null ? this .description.hashCode() : 0);
+
713 28 hash = 47 * hash + (this .license != null ? this .license.hashCode() : 0);
+
714 28 hash = 47 * hash + (this .vulnerabilities != null ? this .vulnerabilities.hashCode() : 0);
+
715 28 hash = 47 * hash + (this .relatedDependencies != null ? this .relatedDependencies.hashCode() : 0);
+
716 28 return hash;
+
717
}
+
718
+
+
719
+
+
720
+
721
+
+
722
+
+
723
+
+
724
+ @Override
+
725
+ public String toString() {
+
726 0 return "Dependency{ fileName='" + fileName + "', actualFilePath='" + actualFilePath + "', filePath='" + filePath + "'}" ;
+
727
+ }
+
728
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
index cbbef7ef1..e560871b6 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
@@ -222,8 +222,8 @@
103
public String getValue() {
-
104 459 used = true ;
-
105 459 return value;
+
104 377 used = true ;
+
105 377 return value;
106
}
107
@@ -598,6 +598,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
index 20879e25c..f2c5961cf 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
@@ -176,7 +176,7 @@
81 1 private static final Filter<Evidence> EVIDENCE_USED = new Filter<Evidence>() {
82
public boolean passes(Evidence evidence) {
-
83 605 return evidence.isUsed();
+
83 481 return evidence.isUsed();
84
}
85
@@ -419,7 +419,7 @@
221
public Iterator<Evidence> iterator() {
-
222 74 return list.iterator();
+
222 62 return list.iterator();
223
}
224
@@ -438,23 +438,23 @@
231
public boolean containsUsedString(String text) {
-
232 69 if (text == null ) {
+
232 57 if (text == null ) {
233 0 return false ;
234
}
-
235 69 final String textToTest = text.toLowerCase();
+
235 57 final String textToTest = text.toLowerCase();
236
-
237 69 for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this )) {
+
237 57 for (Evidence e : EvidenceCollection.EVIDENCE_USED.filter(this )) {
238
-
239 388 final String value = urlCorrection(e.getValue().toLowerCase()).replaceAll("[\\s_-]" , "" );
-
240 388 if (value.contains(textToTest)) {
-
241 32 return true ;
+
239 306 final String value = urlCorrection(e.getValue().toLowerCase()).replaceAll("[\\s_-]" , "" );
+
240 306 if (value.contains(textToTest)) {
+
241 28 return true ;
242
}
-
243 356 }
-
244 37 return false ;
+
243 278 }
+
244 29 return false ;
245
}
246
@@ -679,22 +679,22 @@
376
private String urlCorrection(String value) {
-
377 388 if (value == null || !UrlStringUtils.containsUrl(value)) {
-
378 381 return value;
+
377 306 if (value == null || !UrlStringUtils.containsUrl(value)) {
+
378 301 return value;
379
}
-
380 7 final StringBuilder sb = new StringBuilder(value.length());
-
381 7 final String[] parts = value.split("\\s" );
-
382 14 for (String part : parts) {
-
383 7 if (UrlStringUtils.isUrl(part)) {
+
380 5 final StringBuilder sb = new StringBuilder(value.length());
+
381 5 final String[] parts = value.split("\\s" );
+
382 10 for (String part : parts) {
+
383 5 if (UrlStringUtils.isUrl(part)) {
384
try {
-
385 7 final List<String> data = UrlStringUtils.extractImportantUrlData(part);
-
386 7 sb.append(' ' ).append(StringUtils.join(data, ' ' ));
+
385 5 final List<String> data = UrlStringUtils.extractImportantUrlData(part);
+
386 5 sb.append(' ' ).append(StringUtils.join(data, ' ' ));
387 0 } catch (MalformedURLException ex) {
388 0 LOGGER.log(Level.FINE, "error parsing " + part, ex);
389 0 sb.append(' ' ).append(part);
-
390 7 }
+
390 5 }
391
} else {
392 0 sb.append(' ' ).append(part);
@@ -702,13 +702,13 @@
}
394
}
-
395 7 return sb.toString().trim();
+
395 5 return sb.toString().trim();
396
}
397
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
index 85686c7a6..8a71d8d1f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
@@ -447,6 +447,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
index 4339f3a77..482a81e1f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
@@ -296,6 +296,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
index b33504e2c..a2bcc4473 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
@@ -871,6 +871,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
index 883e67a8a..6695327ce 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
@@ -107,6 +107,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
index c33a93afe..e958db63e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
@@ -665,6 +665,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html
index 6bd73e115..d5b965a83 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.NoDataException.html
@@ -155,6 +155,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.ScanAgentException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.ScanAgentException.html
index 7b8be8cad..46e28c18b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.ScanAgentException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.exception.ScanAgentException.html
@@ -155,6 +155,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter.html
index b85531e42..b619669c8 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.MavenNamespaceFilter.html
@@ -198,6 +198,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Activation.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Activation.html
index 7258ee55b..472c53d04 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Activation.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Activation.html
@@ -409,6 +409,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.html
index 5fac3883b..d29387775 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationFile.html
@@ -233,6 +233,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS.html
index 0866e17dc..377b4169f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationOS.html
@@ -347,6 +347,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty.html
index 7b121514c..b74cfd063 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ActivationProperty.html
@@ -233,6 +233,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Build.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Build.html
index 9e4152635..34b1dd733 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Build.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Build.html
@@ -1635,6 +1635,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.html
index 22b5d4eba..b9933e395 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.BuildBase.html
@@ -1145,6 +1145,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.html
index 7070f0979..c28d85d27 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.CiManagement.html
@@ -429,6 +429,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Contributor.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Contributor.html
index 203ef33fc..3a0d14fc2 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Contributor.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Contributor.html
@@ -875,6 +875,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Dependency.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Dependency.html
index 444415c84..9e165a8dc 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Dependency.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Dependency.html
@@ -783,6 +783,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.html
index 41d2af8a8..6296261e2 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DependencyManagement.html
@@ -317,6 +317,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository.html
index f44d27fe2..4ec68a2e0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DeploymentRepository.html
@@ -409,6 +409,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Developer.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Developer.html
index 03c20a994..570e150ee 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Developer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Developer.html
@@ -929,6 +929,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.html
index 300d49b52..6e152fea0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.DistributionManagement.html
@@ -465,6 +465,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.html
index 270bb2e6a..5729620a9 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Exclusion.html
@@ -225,6 +225,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Extension.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Extension.html
index a39f73cd2..d319be27f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Extension.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Extension.html
@@ -283,6 +283,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.html
index 2acafa246..30ce8d325 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.IssueManagement.html
@@ -229,6 +229,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.License.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.License.html
index 413b932be..61bacb315 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.License.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.License.html
@@ -349,6 +349,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.MailingList.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.MailingList.html
index 393b7cfb8..0d55dd6c0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.MailingList.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.MailingList.html
@@ -609,6 +609,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Model.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Model.html
index be73d6dcd..a123e9696 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Model.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Model.html
@@ -3169,6 +3169,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Notifier.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Notifier.html
index aad84ef61..c2abad3a4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Notifier.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Notifier.html
@@ -683,6 +683,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory.html
index 342171a27..064dc2a45 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ObjectFactory.html
@@ -1396,6 +1396,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Organization.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Organization.html
index 66fce4030..e0b5f0ac4 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Organization.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Organization.html
@@ -225,6 +225,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Parent.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Parent.html
index 76bf6d507..bddf2242d 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Parent.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Parent.html
@@ -345,6 +345,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Plugin.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Plugin.html
index 52fbc8ffb..d24cc248f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Plugin.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Plugin.html
@@ -1217,6 +1217,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.html
index 3b7fe44d3..6b02107ab 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginExecution.html
@@ -697,6 +697,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.html
index abaf18eb2..a31671973 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.PluginManagement.html
@@ -317,6 +317,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.html
index 8dacd7a1f..e1b23b5b0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Prerequisites.html
@@ -171,6 +171,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Profile.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Profile.html
index 85284299c..47a6c513b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Profile.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Profile.html
@@ -1673,6 +1673,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Relocation.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Relocation.html
index 7312ae21f..11d0144e0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Relocation.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Relocation.html
@@ -343,6 +343,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.html
index a1ecd91fc..f9ced6de3 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportPlugin.html
@@ -755,6 +755,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.html
index f785edaf6..da2b1b985 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.ReportSet.html
@@ -639,6 +639,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Reporting.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Reporting.html
index d65c4b5fc..bfe34568b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Reporting.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Reporting.html
@@ -433,6 +433,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Repository.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Repository.html
index cfe216101..048642808 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Repository.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Repository.html
@@ -465,6 +465,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.html
index 4d12b583b..2812929b0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.RepositoryPolicy.html
@@ -287,6 +287,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Resource.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Resource.html
index 526089b58..82864c05a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Resource.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Resource.html
@@ -697,6 +697,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Scm.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Scm.html
index e70e284b8..8488bd2e5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Scm.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Scm.html
@@ -345,6 +345,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Site.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Site.html
index aba01988b..e7fea5928 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Site.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.Site.html
@@ -287,6 +287,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.package-info.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.package-info.html
index 3e177c080..e7098d862 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.package-info.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.jaxb.pom.generated.package-info.html
@@ -37,6 +37,6 @@
package org.owasp.dependencycheck.jaxb.pom.generated;
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html
index 40be95de9..7a3518172 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.EscapeTool.html
@@ -159,6 +159,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
index e62505e82..9355c763d 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
@@ -12,8 +12,8 @@
@@ -506,40 +506,44 @@
293
protected void generateReport(String templateName, String outFileName) throws Exception {
-
294 0 final File outDir = new File(outFileName).getParentFile();
-
295 0 if (!outDir.exists()) {
-
296 0 final boolean created = outDir.mkdirs();
-
297 0 if (!created) {
-
298 0 throw new Exception("Unable to create directory '" + outDir.getAbsolutePath() + "'." );
-
299
- }
-
300
+ 294 0 File outFile = new File(outFileName);
+
295 0 if (outFile.getParentFile() == null ) {
+
296 0 outFile = new File("." , outFileName);
+
297
}
-
301
-
-
302 0 OutputStream outputSteam = null ;
+
298 0 if (!outFile.getParentFile().exists()) {
+
299 0 final boolean created = outFile.getParentFile().mkdirs();
+
300 0 if (!created) {
+
301 0 throw new Exception("Unable to create directory '" + outFile.getParentFile().getAbsolutePath() + "'." );
+
302
+ }
303
- try {
-
304 0 outputSteam = new FileOutputStream(outFileName);
-
305 0 generateReport(templateName, outputSteam);
-
306
- } finally {
-
307 0 if (outputSteam != null ) {
-
308
- try {
-
309 0 outputSteam.close();
-
310 0 } catch (IOException ex) {
-
311 0 LOGGER.log(Level.FINEST, "ignore" , ex);
-
312 0 }
-
313
- }
-
314
}
-
315 0 }
+
304
+
+
305 0 OutputStream outputSteam = null ;
+
306
+ try {
+
307 0 outputSteam = new FileOutputStream(outFile);
+
308 0 generateReport(templateName, outputSteam);
+
309
+ } finally {
+
310 0 if (outputSteam != null ) {
+
311
+ try {
+
312 0 outputSteam.close();
+
313 0 } catch (IOException ex) {
+
314 0 LOGGER.log(Level.FINEST, "ignore" , ex);
+
315 0 }
316
+ }
+
317
+ }
+
318 0 }
+
319
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html
index f547f1d6a..ccdcd4a98 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.VelocityLoggerRedirect.html
@@ -221,6 +221,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html
index 2ba026f28..c3ac80a5a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html
@@ -357,6 +357,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html
index 77b8e6f87..12c624449 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html
@@ -197,6 +197,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html
index 375c5377c..fe58dc554 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html
@@ -340,6 +340,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html
index 06162e78c..238efe00b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html
@@ -145,6 +145,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html
index d6014da1b..788b9680c 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html
@@ -238,6 +238,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html
index de66c35de..e8298e0ad 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html
@@ -855,6 +855,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html
index f211ec26a..d1d489b13 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DBUtils.html
@@ -191,6 +191,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html
index 9e1716d00..6b5e07059 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DateUtil.html
@@ -109,6 +109,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
index 5151292b3..f8ed3c71b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
@@ -235,7 +235,7 @@
@Override
116
public String toString() {
-
117 89 return StringUtils.join(versionParts.toArray(), "." );
+
117 87 return StringUtils.join(versionParts.toArray(), "." );
118
}
119
@@ -256,30 +256,30 @@
@Override
127
public boolean equals(Object obj) {
-
128 432 if (obj == null ) {
+
128 431 if (obj == null ) {
129 0 return false ;
130
}
-
131 432 if (getClass() != obj.getClass()) {
+
131 431 if (getClass() != obj.getClass()) {
132 0 return false ;
133
}
-
134 432 final DependencyVersion other = (DependencyVersion) obj;
-
135 432 final int max = (this .versionParts.size() < other.versionParts.size())
+
134 431 final DependencyVersion other = (DependencyVersion) obj;
+
135 431 final int max = (this .versionParts.size() < other.versionParts.size())
136
? this .versionParts.size() : other.versionParts.size();
137
-
138 940 for (int i = 0; i < max; i++) {
-
139 832 final String thisPart = this .versionParts.get(i);
-
140 832 final String otherPart = other.versionParts.get(i);
-
141 832 if (!thisPart.equals(otherPart)) {
+
138 936 for (int i = 0; i < max; i++) {
+
139 829 final String thisPart = this .versionParts.get(i);
+
140 829 final String otherPart = other.versionParts.get(i);
+
141 829 if (!thisPart.equals(otherPart)) {
142 324 return false ;
143
}
144
}
-
145 108 if (this .versionParts.size() > max) {
+
145 107 if (this .versionParts.size() > max) {
146 0 for (int i = max; i < this .versionParts.size(); i++) {
147 0 if (!"0" .equals(this .versionParts.get(i))) {
148 0 return false ;
@@ -291,7 +291,7 @@
}
152
-
153 108 if (other.versionParts.size() > max) {
+
153 107 if (other.versionParts.size() > max) {
154 81 for (int i = max; i < other.versionParts.size(); i++) {
155 81 if (!"0" .equals(other.versionParts.get(i))) {
156 81 return false ;
@@ -313,7 +313,7 @@
165
-
166 27 return true ;
+
166 26 return true ;
167
}
168
@@ -398,28 +398,28 @@
@Override
218
public int compareTo(DependencyVersion version) {
-
219 29 if (version == null ) {
+
219 30 if (version == null ) {
220 0 return 1;
221
}
-
222 29 final List<String> left = this .getVersionParts();
-
223 29 final List<String> right = version.getVersionParts();
-
224 29 final int max = left.size() < right.size() ? left.size() : right.size();
+
222 30 final List<String> left = this .getVersionParts();
+
223 30 final List<String> right = version.getVersionParts();
+
224 30 final int max = left.size() < right.size() ? left.size() : right.size();
225
-
226 76 for (int i = 0; i < max; i++) {
-
227 66 final String lStr = left.get(i);
-
228 66 final String rStr = right.get(i);
-
229 66 if (lStr.equals(rStr)) {
-
230 47 continue ;
+
226 79 for (int i = 0; i < max; i++) {
+
227 69 final String lStr = left.get(i);
+
228 69 final String rStr = right.get(i);
+
229 69 if (lStr.equals(rStr)) {
+
230 49 continue ;
231
}
232
try {
-
233 19 final int l = Integer.parseInt(lStr);
-
234 12 final int r = Integer.parseInt(rStr);
-
235 11 if (l < r) {
-
236 8 return -1;
+
233 20 final int l = Integer.parseInt(lStr);
+
234 13 final int r = Integer.parseInt(rStr);
+
235 12 if (l < r) {
+
236 9 return -1;
237 3 } else if (l > r) {
238 3 return 1;
239
@@ -450,6 +450,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
index 7bced1ff4..fd6794445 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
@@ -181,6 +181,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html
index cc5bdd409..0207d1329 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionUtil.html
@@ -258,6 +258,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
index 4633c9a22..fb534dc6b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
@@ -57,19 +57,19 @@
19
public Iterator<T> filter(Iterator<T> iterator) {
-
20 90 return new FilterIterator(iterator);
+
20 78 return new FilterIterator(iterator);
21
}
22
23
public Iterable<T> filter(final Iterable<T> iterable) {
-
24 90 return new Iterable<T>() {
+
24 78 return new Iterable<T>() {
25
26
public Iterator<T> iterator() {
-
27 90 return filter(iterable.iterator());
+
27 78 return filter(iterable.iterator());
28
}
29
@@ -78,7 +78,7 @@
}
31
-
32 90 private class FilterIterator implements Iterator<T> {
+
32 78 private class FilterIterator implements Iterator<T> {
33
34
@@ -87,28 +87,28 @@
private T next;
36
-
37 90 private FilterIterator(Iterator<T> iterator) {
-
38 90 this .iterator = iterator;
-
39 90 toNext();
-
40 90 }
+
37 78 private FilterIterator(Iterator<T> iterator) {
+
38 78 this .iterator = iterator;
+
39 78 toNext();
+
40 78 }
41
42
public boolean hasNext() {
-
43 502 return next != null ;
+
43 412 return next != null ;
44
}
45
46
public T next() {
-
47 444 if (next == null ) {
+
47 362 if (next == null ) {
48 0 throw new NoSuchElementException();
49
}
-
50 444 T returnValue = next;
-
51 444 toNext();
-
52 444 return returnValue;
+
50 362 T returnValue = next;
+
51 362 toNext();
+
52 362 return returnValue;
53
}
54
@@ -122,22 +122,22 @@
59
private void toNext() {
-
60 534 next = null ;
-
61 854 while (iterator.hasNext()) {
-
62 795 T item = iterator.next();
-
63 795 if (item != null && passes(item)) {
-
64 475 next = item;
-
65 475 break ;
+
60 440 next = null ;
+
61 722 while (iterator.hasNext()) {
+
62 671 T item = iterator.next();
+
63 671 if (item != null && passes(item)) {
+
64 389 next = item;
+
65 389 break ;
66
}
-
67 320 }
-
68 534 }
+
67 282 }
+
68 440 }
69
}
70
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
index eb354b09b..a48430109 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
@@ -112,6 +112,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html
index 0ff51485a..8443444e0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Pair.html
@@ -211,10 +211,10 @@
@Override
97
public int hashCode() {
-
98 22209 int hash = 3;
-
99 22209 hash = 53 * hash + (this .left != null ? this .left.hashCode() : 0);
-
100 22209 hash = 53 * hash + (this .right != null ? this .right.hashCode() : 0);
-
101 22209 return hash;
+
98 22174 int hash = 3;
+
99 22174 hash = 53 * hash + (this .left != null ? this .left.hashCode() : 0);
+
100 22174 hash = 53 * hash + (this .right != null ? this .right.hashCode() : 0);
+
101 22174 return hash;
102
}
103
@@ -259,6 +259,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html
index 1f1abc08f..e83606bbd 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.UrlStringUtils.html
@@ -125,7 +125,7 @@
55
public static boolean containsUrl(String text) {
-
56 13641 return CONTAINS_URL_TEST.matcher(text).matches();
+
56 13355 return CONTAINS_URL_TEST.matcher(text).matches();
57
}
58
@@ -144,7 +144,7 @@
65
public static boolean isUrl(String text) {
-
66 9 return IS_URL_TEST.matcher(text).matches();
+
66 7 return IS_URL_TEST.matcher(text).matches();
67
}
68
@@ -188,40 +188,40 @@
88
public static List<String> extractImportantUrlData(String text) throws MalformedURLException {
-
89 9 final ArrayList<String> importantParts = new ArrayList<String>();
-
90 9 final URL url = new URL(text);
-
91 9 final String[] domain = url.getHost().split("\\." );
+
89 7 final ArrayList<String> importantParts = new ArrayList<String>();
+
90 7 final URL url = new URL(text);
+
91 7 final String[] domain = url.getHost().split("\\." );
92
-
93 26 for (int i = 0; i < domain.length - 1; i++) {
-
94 17 final String sub = domain[i];
-
95 17 if (!IGNORE_LIST.contains(sub.toLowerCase())) {
-
96 16 importantParts.add(sub);
+
93 20 for (int i = 0; i < domain.length - 1; i++) {
+
94 13 final String sub = domain[i];
+
95 13 if (!IGNORE_LIST.contains(sub.toLowerCase())) {
+
96 12 importantParts.add(sub);
97
}
98
}
-
99 9 final String document = url.getPath();
-
100 9 final String[] pathParts = document.split("[\\//]" );
-
101 16 for (int i = 0; i < pathParts.length - 2; i++) {
-
102 7 if (!pathParts[i].isEmpty()) {
+
99 7 final String document = url.getPath();
+
100 7 final String[] pathParts = document.split("[\\//]" );
+
101 12 for (int i = 0; i < pathParts.length - 2; i++) {
+
102 5 if (!pathParts[i].isEmpty()) {
103 0 importantParts.add(pathParts[i]);
104
}
105
}
-
106 9 if (pathParts.length > 0 && !pathParts[pathParts.length - 1].isEmpty()) {
-
107 8 final String fileNameNoExt = pathParts[pathParts.length - 1].replaceAll("\\..*{0,5}$" , "" );
-
108 8 importantParts.add(fileNameNoExt);
+
106 7 if (pathParts.length > 0 && !pathParts[pathParts.length - 1].isEmpty()) {
+
107 6 final String fileNameNoExt = pathParts[pathParts.length - 1].replaceAll("\\..*{0,5}$" , "" );
+
108 6 importantParts.add(fileNameNoExt);
109
}
-
110 9 return importantParts;
+
110 7 return importantParts;
111
}
112
}
-
+
diff --git a/dependency-check-core/cpd.html b/dependency-check-core/cpd.html
index ac0659a5b..3858b72a8 100644
--- a/dependency-check-core/cpd.html
+++ b/dependency-check-core/cpd.html
@@ -1,13 +1,13 @@
-
+
dependency-check-core - CPD Results
@@ -54,7 +54,7 @@
-
+
/
@@ -67,9 +67,9 @@
-
| Last Published: 2014-12-07
+
| Last Published: 2014-12-28
- Version: 1.2.7
+ Version: 1.2.8
diff --git a/dependency-check-core/dependency-updates-report.html b/dependency-check-core/dependency-updates-report.html
index f135b446b..135bb6088 100644
--- a/dependency-check-core/dependency-updates-report.html
+++ b/dependency-check-core/dependency-updates-report.html
@@ -1,13 +1,13 @@
-
+
dependency-check-core - Dependency Updates Report
@@ -54,7 +54,7 @@
-
+
/
@@ -67,9 +67,9 @@
-
| Last Published: 2014-12-07
+
| Last Published: 2014-12-28
- Version: 1.2.7
+ Version: 1.2.8
@@ -595,7 +595,7 @@
org.owasp
dependency-check-utils
-
1.2.7
+
1.2.8
compile
jar
@@ -734,7 +734,7 @@
jar
Newer versions
-1.3.173 Next Incremental 1.3.174 1.3.1751.3.176 Latest Incremental 1.4.177 Next Minor 1.4.178 1.4.179 1.4.180 1.4.1811.4.182 Latest Minor
+