diff --git a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html
index 62ad5c74d..a99b55aa1 100644
--- a/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html
+++ b/dependency-check-core/apidocs/org/owasp/dependencycheck/dependency/Dependency.html
@@ -2,13 +2,13 @@
-
+
Files
@@ -240,6 +240,16 @@
W
E
+org/owasp/dependencycheck/data/update/ProcessTask.java
+0
+0
+5
+
+org/owasp/dependencycheck/data/update/StandardUpdate.java
+0
+0
+2
+
org/owasp/dependencycheck/dependency/VulnerableSoftware.java
0
0
@@ -247,7 +257,7 @@
Details
+
+
org/owasp/dependencycheck/data/update/StandardUpdate.java
+
+
+Violation
+Message
+Line
+
+
+Variable 'waitForFuture' should be declared final.
+163
+
+
+Missing a Javadoc comment.
+547
+
+
org/owasp/dependencycheck/dependency/VulnerableSoftware.java
+
+
+Violation
+Message
+Line
+
+
Nested if-else depth is 5 (max allowed is 4).
82
diff --git a/dependency-check-core/checkstyle.rss b/dependency-check-core/checkstyle.rss
index b807685f4..f3a29a04e 100644
--- a/dependency-check-core/checkstyle.rss
+++ b/dependency-check-core/checkstyle.rss
@@ -8,8 +8,8 @@
en-us
©2012 - 2013 OWASP
-
-
File: 162,
- Errors: 1,
+ File: 159,
+ Errors: 8,
Warnings: 0,
Infos: 0
@@ -54,6 +54,20 @@
0
+
+
+
+ org/owasp/dependencycheck/data/update/StandardUpdate.java
+
+
+ 0
+
+
+ 0
+
+
+ 2
+
@@ -264,20 +278,6 @@
0
-
-
-
- org/owasp/dependencycheck/data/update/AbstractUpdateTask.java
-
-
- 0
-
-
- 0
-
-
- 0
-
@@ -1188,20 +1188,6 @@
0
-
-
-
- org/owasp/dependencycheck/data/update/UpdateTask.java
-
-
- 0
-
-
- 0
-
-
- 0
-
@@ -1580,20 +1566,6 @@
0
-
-
-
- org/owasp/dependencycheck/data/update/UpdateTaskFactory.java
-
-
- 0
-
-
- 0
-
-
- 0
-
@@ -1720,20 +1692,6 @@
0
-
-
-
- org/owasp/dependencycheck/data/update/StandardUpdateTask.java
-
-
- 0
-
-
- 0
-
-
- 0
-
@@ -1804,20 +1762,6 @@
0
-
-
-
- org/owasp/dependencycheck/jaxb/pom/generated/Organization.java
-
-
- 0
-
-
- 0
-
-
- 0
-
@@ -1835,7 +1779,7 @@
- org/owasp/dependencycheck/data/update/BatchUpdateTask.java
+ org/owasp/dependencycheck/jaxb/pom/generated/Organization.java
0
@@ -1930,6 +1874,20 @@
0
+
+
+
+ org/owasp/dependencycheck/data/update/ProcessTask.java
+
+
+ 0
+
+
+ 0
+
+
+ 5
+
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.html
index 1c7662d3b..688274c1a 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.data.html
@@ -15,7 +15,7 @@ org.owasp.dependencycheck.data
-BaseDB (45%)
+BaseDB (44%)
CachedWebDataSource (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 099e287ce..5c631041f 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
@@ -15,12 +15,6 @@ org.owasp.dependencycheck.data.update
-AbstractUpdateTask (47%)
-
-
-BatchUpdateTask (28%)
-
-
CallableDownloadTask (0%)
@@ -33,13 +27,10 @@ org.owasp.dependencycheck.data.update
NvdCveInfo (100%)
-StandardUpdateTask (0%)
+ProcessTask (0%)
-UpdateTask (N/A)
-
-
-UpdateTaskFactory (0%)
+StandardUpdate (0%)
Updateable (93%)
diff --git a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.utils.html b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.utils.html
index 1560b2c64..eb1ee8360 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.utils.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles-org.owasp.dependencycheck.utils.html
@@ -33,7 +33,7 @@ org.owasp.dependencycheck.utils
ExtractionException (0%)
-FileUtils (52%)
+FileUtils (10%)
Filter (92%)
diff --git a/dependency-check-core/cobertura/frame-sourcefiles.html b/dependency-check-core/cobertura/frame-sourcefiles.html
index d0a979fa4..982c0d33b 100644
--- a/dependency-check-core/cobertura/frame-sourcefiles.html
+++ b/dependency-check-core/cobertura/frame-sourcefiles.html
@@ -24,9 +24,6 @@ All Packages
AbstractTokenizingFilter (100%)
-AbstractUpdateTask (47%)
-
-
Activation (6%)
@@ -60,10 +57,7 @@ All Packages
ArchiveExtractionException (0%)
-BaseDB (45%)
-
-
-BatchUpdateTask (28%)
+BaseDB (44%)
Build (9%)
@@ -189,7 +183,7 @@ All Packages
FileNameAnalyzer (100%)
-FileUtils (52%)
+FileUtils (10%)
Filter (92%)
@@ -288,6 +282,9 @@ All Packages
Prerequisites (0%)
+ProcessTask (0%)
+
+
Profile (4%)
@@ -336,7 +333,7 @@ All Packages
Site (10%)
-StandardUpdateTask (0%)
+StandardUpdate (0%)
SuppressionErrorHandler (6%)
@@ -363,12 +360,6 @@ All Packages
UpdateService (0%)
-UpdateTask (N/A)
-
-
-UpdateTaskFactory (0%)
-
-
Updateable (93%)
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 05aa7b609..c0cc9f3a3 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
@@ -74,6 +74,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.concurrency.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.concurrency.html
index 3ec059df7..6eb0361d8 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.concurrency.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.concurrency.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.data.cpe.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cpe.html
index f6ec7093c..fc8896719 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
@@ -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.cwe.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.cwe.html
index ddec495dd..5a80b7bac 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.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.html
index 28f65edb4..b882f3188 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.html
@@ -16,12 +16,12 @@
-
+
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 3c2b980cc..f66452ad5 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.nvdcve.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.data.nvdcve.html
index 71b5b843d..048741f18 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
@@ -49,6 +49,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 f06c91c21..0c349b206 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 @@
-
+
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 bd0f116a6..2c9bfc2ce 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
@@ -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.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
index bcbd588d9..f1db75561 100644
--- a/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
+++ b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.html
@@ -19,18 +19,18 @@
org.owasp.dependencycheck 1 4.055555555555555; 4.056
org.owasp.dependencycheck.analyzer 21 4.006622516556291; 4.007
org.owasp.dependencycheck.concurrency 3 2.611111111111111; 2.611
- org.owasp.dependencycheck.data 5 1.8636363636363635; 1.864
+ org.owasp.dependencycheck.data 5 1.8636363636363635; 1.864
org.owasp.dependencycheck.data.cpe 4 2.566666666666667; 2.567
org.owasp.dependencycheck.data.cwe 2 2.8; 2.8
org.owasp.dependencycheck.data.lucene 11 2.5; 2.5
org.owasp.dependencycheck.data.nvdcve 8 3.3333333333333335; 3.333
- org.owasp.dependencycheck.data.update 10 2.9452054794520546; 2.945
+ org.owasp.dependencycheck.data.update 7 2.967741935483871; 2.968
org.owasp.dependencycheck.dependency 14 2.4387096774193546; 2.439
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 3 4.2727272727272725; 4.273
- org.owasp.dependencycheck.suppression 6 2.8125; 2.812
- org.owasp.dependencycheck.utils 18 3.128205128205128; 3.128
+ org.owasp.dependencycheck.suppression 6 2.7916666666666665; 2.792
+ org.owasp.dependencycheck.utils 18 3.128205128205128; 3.128
-
+
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 278d19939..fb3a3c512 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 38f01d5b6..f4df61547 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 d674b2add..962844557 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
@@ -40,6 +40,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.suppression.html b/dependency-check-core/cobertura/frame-summary-org.owasp.dependencycheck.suppression.html
index e94be51b5..8dba3fdad 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
@@ -16,7 +16,7 @@
-
+
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 565ca953c..479d011d2 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
@@ -16,7 +16,7 @@
-
+
diff --git a/dependency-check-core/cobertura/frame-summary.html b/dependency-check-core/cobertura/frame-summary.html
index 75b4eacb1..7b2900211 100644
--- a/dependency-check-core/cobertura/frame-summary.html
+++ b/dependency-check-core/cobertura/frame-summary.html
@@ -16,22 +16,22 @@
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
index 5f8627c2e..f92e9e0c1 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.Engine.html
@@ -748,6 +748,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 d2e798a30..1436e4247 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractAnalyzer.html
@@ -149,6 +149,6 @@
}
-
+
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 36876ffca..c7b563b89 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AbstractSuppressionAnalyzer.html
@@ -228,6 +228,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisException.html
index d590a1165..5aa8e4a99 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisException.html
@@ -145,6 +145,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 6a8fab6f0..fc508d6b8 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalysisPhase.html
@@ -137,6 +137,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 c0a3f03e9..de2595516 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.Analyzer.html
@@ -223,6 +223,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 995e716ad..c655c0391 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.AnalyzerService.html
@@ -144,6 +144,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 30e36d56b..0220d66a3 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveAnalyzer.html
@@ -661,6 +661,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveExtractionException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveExtractionException.html
index 480bdae0a..d44ec6198 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveExtractionException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.ArchiveExtractionException.html
@@ -145,6 +145,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 e89da7f3a..27c0cb0a0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CPEAnalyzer.html
@@ -1359,6 +1359,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 b0d7f33fd..ab4fcbdbc 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.CpeSuppressionAnalyzer.html
@@ -162,6 +162,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 de0aed19b..e69ad5aea 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.DependencyBundlingAnalyzer.html
@@ -593,6 +593,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 1095a1097..dde0dac33 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FalsePositiveAnalyzer.html
@@ -646,6 +646,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 ad75025cc..7b5dcfb38 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.FileNameAnalyzer.html
@@ -263,6 +263,6 @@
}
-
+
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 ecc7e5bef..6efcd514f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.HintAnalyzer.html
@@ -274,6 +274,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 e3e1d166a..5d87d1c9f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JarAnalyzer.html
@@ -1838,6 +1838,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 11949dc45..2b6534117 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.JavaScriptAnalyzer.html
@@ -252,6 +252,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 ee866cbe1..9b17fc7f0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.NvdCveAnalyzer.html
@@ -436,6 +436,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 714425600..9ef122360 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.analyzer.VulnerabilitySuppressionAnalyzer.html
@@ -162,6 +162,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectoryLockException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectoryLockException.html
index 1378ddedb..dfb21de33 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectoryLockException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectoryLockException.html
@@ -145,6 +145,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectorySpinLock.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectorySpinLock.html
index ccb2e4a2f..e9d23b919 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectorySpinLock.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.DirectorySpinLock.html
@@ -475,6 +475,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.InvalidDirectoryException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.InvalidDirectoryException.html
index 6407e0b40..8efed1a94 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.InvalidDirectoryException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.concurrency.InvalidDirectoryException.html
@@ -145,6 +145,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.BaseDB.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.BaseDB.html
index 1f999c121..839307ffc 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.BaseDB.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.BaseDB.html
@@ -12,7 +12,7 @@
@@ -101,7 +101,7 @@
42
-
43 21 public class BaseDB {
+
43 20 public class BaseDB {
44
45
@@ -177,18 +177,18 @@
justification = "Yes, I know... Blank password." )
81
public void open() throws IOException, SQLException, DatabaseException, ClassNotFoundException {
-
82 21 final String fileName = CveDB.getDataDirectory().getCanonicalPath();
-
83 21 final File f = new File(fileName, "cve." + DB_SCHEMA_VERSION);
-
84 21 final File check = new File(f.getAbsolutePath() + ".h2.db" );
-
85 21 final boolean createTables = !check.exists();
-
86 21 final String connStr = String.format("jdbc:h2:file:%s;AUTO_SERVER=TRUE" , f.getAbsolutePath());
-
87 21 Class.forName("org.h2.Driver" );
-
88 21 conn = DriverManager.getConnection(connStr, "sa" , "" );
-
89 21 if (createTables) {
+
82 20 final String fileName = CveDB.getDataDirectory().getCanonicalPath();
+
83 20 final File f = new File(fileName, "cve." + DB_SCHEMA_VERSION);
+
84 20 final File check = new File(f.getAbsolutePath() + ".h2.db" );
+
85 20 final boolean createTables = !check.exists();
+
86 20 final String connStr = String.format("jdbc:h2:file:%s;AUTO_SERVER=TRUE" , f.getAbsolutePath());
+
87 20 Class.forName("org.h2.Driver" );
+
88 20 conn = DriverManager.getConnection(connStr, "sa" , "" );
+
89 20 if (createTables) {
90 0 createTables();
91
}
-
92 21 }
+
92 20 }
93
94
@@ -204,13 +204,13 @@
99 37 if (conn != null ) {
100
try {
-
101 21 conn.close();
+
101 20 conn.close();
102 0 } catch (SQLException ex) {
103 0 final String msg = "There was an error attempting to close the CveDB, see the log for more details." ;
104 0 Logger.getLogger(BaseDB.class .getName()).log(Level.SEVERE, msg, ex);
105 0 Logger.getLogger(BaseDB.class .getName()).log(Level.FINE, null , ex);
-
106 21 }
-
107 21 conn = null ;
+
106 20 }
+
107 20 conn = null ;
108
}
109 37 }
@@ -249,9 +249,9 @@
@Override
128
protected void finalize() throws Throwable {
-
129 16 close();
-
130 16 super .finalize();
-
131 16 }
+
129 17 close();
+
130 17 super .finalize();
+
131 17 }
132
133
@@ -330,15 +330,15 @@
180
public static File getDataDirectory() throws IOException {
-
181 22 final File path = Settings.getDataFile(Settings.KEYS.CVE_DATA_DIRECTORY);
-
182 22 if (!path.exists()) {
-
183 1 if (!path.mkdirs()) {
+
181 20 final File path = Settings.getDataFile(Settings.KEYS.CVE_DATA_DIRECTORY);
+
182 20 if (!path.exists()) {
+
183 0 if (!path.mkdirs()) {
184 0 throw new IOException("Unable to create NVD CVE Data directory" );
185
}
186
}
-
187 22 return path;
+
187 20 return path;
188
}
189
@@ -435,6 +435,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.CachedWebDataSource.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.CachedWebDataSource.html
index e51f2a848..270c51912 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.CachedWebDataSource.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.CachedWebDataSource.html
@@ -95,6 +95,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.NoDataException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.NoDataException.html
index 3e35ef938..520c36f03 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.NoDataException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.NoDataException.html
@@ -149,6 +149,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateException.html
index 9b4131aef..95e6ebd8a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateException.html
@@ -149,6 +149,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateService.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateService.html
index 353e031d2..5b233bf32 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateService.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.UpdateService.html
@@ -146,6 +146,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 59b0e8a8d..50813bc6c 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
@@ -579,6 +579,6 @@
}
-
+
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 f9494d62f..f2733e73d 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
@@ -106,6 +106,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 72c1826ba..d7ae21e7f 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
@@ -361,6 +361,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 9e64eb47d..6c14ff336 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
@@ -145,6 +145,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 09e94cb70..25a9137bd 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
@@ -170,6 +170,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 7c10ef2e7..a50758753 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
@@ -123,6 +123,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 1e3fc0e74..5699d175f 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
@@ -104,7 +104,7 @@
44
protected CharTermAttribute getTermAtt() {
-
45 26500 return termAtt;
+
45 26749 return termAtt;
46
}
47
@@ -129,7 +129,7 @@
57
protected LinkedList<String> getTokens() {
-
58 26500 return tokens;
+
58 26749 return tokens;
59
}
60
@@ -163,20 +163,20 @@
76
protected boolean addTerm() {
-
77 26452 final boolean termAdded = tokens.size() > 0;
-
78 26452 if (termAdded) {
-
79 15013 final String term = tokens.pop();
-
80 15013 clearAttributes();
-
81 15013 termAtt.append(term);
+
77 26707 final boolean termAdded = tokens.size() > 0;
+
78 26707 if (termAdded) {
+
79 15268 final String term = tokens.pop();
+
80 15268 clearAttributes();
+
81 15268 termAtt.append(term);
82
}
-
83 26452 return termAdded;
+
83 26707 return termAdded;
84
}
85
}
-
+
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 897839dfb..9a7aeb500 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
@@ -142,6 +142,6 @@
}
-
+
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 d8004d95b..3b5adf394 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
@@ -117,6 +117,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 29049de9f..844e67313 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
@@ -172,6 +172,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 20b3876fe..9d9b1a2b9 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
@@ -223,6 +223,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 b9c36151f..022c2bc6d 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
@@ -200,6 +200,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 5e4af8a01..e9f09b14a 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
@@ -159,6 +159,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 cfa8b1124..4fd5abfb1 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 a8eeba4a6..580748eac 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
@@ -133,11 +133,11 @@
@Override
59
public boolean incrementToken() throws IOException {
-
60 26500 final LinkedList<String> tokens = getTokens();
-
61 26500 final CharTermAttribute termAtt = getTermAtt();
-
62 26500 if (tokens.size() == 0 && input.incrementToken()) {
-
63 15012 final String text = new String(termAtt.buffer(), 0, termAtt.length());
-
64 15012 if (UrlStringUtils.containsUrl(text)) {
+
60 26749 final LinkedList<String> tokens = getTokens();
+
61 26749 final CharTermAttribute termAtt = getTermAtt();
+
62 26749 if (tokens.size() == 0 && input.incrementToken()) {
+
63 15267 final String text = new String(termAtt.buffer(), 0, termAtt.length());
+
64 15267 if (UrlStringUtils.containsUrl(text)) {
65 2 final String[] parts = text.split("\\s" );
66 4 for (String part : parts) {
67 2 if (UrlStringUtils.isUrl(part)) {
@@ -157,18 +157,18 @@
78
}
79 2 } else {
-
80 15010 tokens.add(text);
+
80 15265 tokens.add(text);
81
}
82
}
-
83 26452 return addTerm();
+
83 26707 return addTerm();
84
}
85
}
-
+
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 eb51b067e..14bd009eb 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
@@ -156,6 +156,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 0427c0b71..1e3bb1f97 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
@@ -197,6 +197,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 4db2946eb..08f9dad57 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
@@ -119,6 +119,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html
index e75b2efed..89e5cd664 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.CveDB.html
@@ -105,7 +105,7 @@
44
-
45 21 public class CveDB extends BaseDB {
+
45 20 public class CveDB extends BaseDB {
46
47
@@ -859,6 +859,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 425c8b08e..9ec9595b4 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
@@ -133,6 +133,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.InvalidDataException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.InvalidDataException.html
index e5cc7327b..589cb2e76 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.InvalidDataException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.InvalidDataException.html
@@ -119,6 +119,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.html
index 198360298..00059a4ca 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve12Handler.html
@@ -457,6 +457,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.html
index 369171d52..c7c583c95 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.nvdcve.NvdCve20Handler.html
@@ -867,6 +867,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CallableDownloadTask.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CallableDownloadTask.html
index 85faad900..a41e43714 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CallableDownloadTask.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.CallableDownloadTask.html
@@ -336,6 +336,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DataStoreMetaInfo.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DataStoreMetaInfo.html
index de06bda52..fe7e3bc66 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DataStoreMetaInfo.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DataStoreMetaInfo.html
@@ -12,7 +12,7 @@
@@ -155,7 +155,7 @@
69
-
70 11 private Properties properties = new Properties();
+
70 5 private Properties properties = new Properties();
71
72
@@ -180,7 +180,7 @@
82
protected boolean isBatchUpdateMode() {
-
83 2 return batchUpdateMode;
+
83 1 return batchUpdateMode;
84
}
85
@@ -207,10 +207,10 @@
97
-
98 11 public DataStoreMetaInfo() {
-
99 11 batchUpdateMode = !Settings.getString(Settings.KEYS.BATCH_UPDATE_URL, "" ).isEmpty();
-
100 11 loadProperties();
-
101 11 }
+
98 5 public DataStoreMetaInfo() {
+
99 5 batchUpdateMode = !Settings.getString(Settings.KEYS.BATCH_UPDATE_URL, "" ).isEmpty();
+
100 5 loadProperties();
+
101 5 }
102
103
@@ -221,42 +221,42 @@
106
private void loadProperties() {
-
107 11 final File file = getPropertiesFile();
-
108 11 if (file.exists()) {
-
109 9 InputStream is = null ;
+
107 5 final File file = getPropertiesFile();
+
108 5 if (file.exists()) {
+
109 5 InputStream is = null ;
110
try {
-
111 9 is = new FileInputStream(file);
+
111 5 is = new FileInputStream(file);
112 0 } catch (FileNotFoundException ignore) {
113
114 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINEST, null , ignore);
-
115 9 }
+
115 5 }
116
try {
-
117 9 properties.load(is);
+
117 5 properties.load(is);
118 0 } catch (IOException ex) {
119 0 final String msg = String.format("Unable to load properties file '%s'" , file.getPath());
120 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.WARNING, msg);
121 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINE, null , ex);
122
} finally {
-
123 9 if (is != null ) {
+
123 5 if (is != null ) {
124
try {
-
125 9 is.close();
+
125 5 is.close();
126 0 } catch (IOException ex) {
127 0 final String msg = String.format("Unable to close properties file '%s'" , file.getPath());
128 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.WARNING, msg);
129 0 Logger.getLogger(DataStoreMetaInfo.class .getName()).log(Level.FINE, null , ex);
-
130 9 }
+
130 5 }
131
}
132
}
133
}
-
134 11 }
+
134 5 }
135
136
@@ -271,7 +271,7 @@
141
public boolean isEmpty() {
-
142 3 return properties.isEmpty();
+
142 1 return properties.isEmpty();
143
}
144
@@ -419,15 +419,15 @@
236
public static File getPropertiesFile() {
-
237 16 final File dataDirectory = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY);
-
238 16 final File file = new File(dataDirectory, UPDATE_PROPERTIES_FILE);
-
239 16 return file;
+
237 7 final File dataDirectory = Settings.getDataFile(Settings.KEYS.DATA_DIRECTORY);
+
238 7 final File file = new File(dataDirectory, UPDATE_PROPERTIES_FILE);
+
239 7 return file;
240
}
241
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DatabaseUpdater.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DatabaseUpdater.html
index 14be3bff8..4eec2fa53 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DatabaseUpdater.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.DatabaseUpdater.html
@@ -112,7 +112,7 @@
public void update() throws UpdateException {
48
try {
-
49 0 final UpdateTask task = UpdateTaskFactory.getUpdateTask();
+
49 0 final StandardUpdate task = new StandardUpdate();
50 0 if (task.isUpdateNeeded()) {
51 0 if (task.shouldDeleteAndRecreate()) {
52
@@ -168,6 +168,6 @@
}
-
+
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 e6a9df5d0..61be8b85b 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
@@ -67,7 +67,7 @@
25
-
26 19 public class NvdCveInfo {
+
26 15 public class NvdCveInfo {
27
28
@@ -109,8 +109,8 @@
47
public void setId(String id) {
-
48 15 this .id = id;
-
49 15 }
+
48 11 this .id = id;
+
49 11 }
50
51
@@ -150,8 +150,8 @@
69
public void setUrl(String url) {
-
70 14 this .url = url;
-
71 14 }
+
70 10 this .url = url;
+
71 10 }
72
73
@@ -191,8 +191,8 @@
91
public void setOldSchemaVersionUrl(String oldSchemaVersionUrl) {
-
92 14 this .oldSchemaVersionUrl = oldSchemaVersionUrl;
-
93 14 }
+
92 10 this .oldSchemaVersionUrl = oldSchemaVersionUrl;
+
93 10 }
94
95
@@ -232,15 +232,15 @@
113
public void setTimestamp(long timestamp) {
-
114 15 this .timestamp = timestamp;
-
115 15 }
+
114 11 this .timestamp = timestamp;
+
115 11 }
116
117
118
-
119 19 private boolean needsUpdate = true ;
+
119 15 private boolean needsUpdate = true ;
120
121
@@ -272,12 +272,12 @@
135
public void setNeedsUpdate(boolean needsUpdate) {
-
136 14 this .needsUpdate = needsUpdate;
-
137 14 }
+
136 10 this .needsUpdate = needsUpdate;
+
137 10 }
138
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.Updateable.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.Updateable.html
index 9b3bf5243..3cd92815f 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.Updateable.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.data.update.Updateable.html
@@ -87,7 +87,7 @@
35
-
36 14 public class Updateable implements java.lang.Iterable<NvdCveInfo>, Iterator<NvdCveInfo> {
+
36 12 public class Updateable implements java.lang.Iterable<NvdCveInfo>, Iterator<NvdCveInfo> {
37
38
@@ -96,7 +96,7 @@
40
-
41 7 private Map<String, NvdCveInfo> collection = new TreeMap<String, NvdCveInfo>();
+
41 5 private Map<String, NvdCveInfo> collection = new TreeMap<String, NvdCveInfo>();
42
43
@@ -192,14 +192,14 @@
92
public void add(String id, String url, String oldUrl, boolean needsUpdate) throws MalformedURLException, DownloadFailedException {
-
93 13 final NvdCveInfo item = new NvdCveInfo();
-
94 13 item.setNeedsUpdate(needsUpdate);
-
95 13 item.setId(id);
-
96 13 item.setUrl(url);
-
97 13 item.setOldSchemaVersionUrl(oldUrl);
-
98 13 item.setTimestamp(Downloader.getLastModified(new URL(url)));
-
99 13 collection.put(id, item);
-
100 13 }
+
93 9 final NvdCveInfo item = new NvdCveInfo();
+
94 9 item.setNeedsUpdate(needsUpdate);
+
95 9 item.setId(id);
+
96 9 item.setUrl(url);
+
97 9 item.setOldSchemaVersionUrl(oldUrl);
+
98 9 item.setTimestamp(Downloader.getLastModified(new URL(url)));
+
99 9 collection.put(id, item);
+
100 9 }
101
102
@@ -237,7 +237,7 @@
120
-
121 7 private Iterator<Entry<String, NvdCveInfo>> iterableContent = null ;
+
121 5 private Iterator<Entry<String, NvdCveInfo>> iterableContent = null ;
122
123
@@ -352,6 +352,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 ad7ea8dd9..8d4b6bd27 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Dependency.html
@@ -1037,6 +1037,6 @@
}
-
+
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 a6f06ded4..e94031a55 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Evidence.html
@@ -502,6 +502,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 47a5c1b6f..925340613 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.EvidenceCollection.html
@@ -696,6 +696,6 @@
}
-
+
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 5000de366..c80edb62a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Identifier.html
@@ -360,6 +360,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 47c632f62..d5fbe0ef2 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Reference.html
@@ -291,6 +291,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 81c7f3bbf..9bf5ae7dd 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.Vulnerability.html
@@ -747,6 +747,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 8b6599a1f..8710c7eda 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerabilityComparator.html
@@ -109,6 +109,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 1a2bcbe49..4aef628c5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.dependency.VulnerableSoftware.html
@@ -594,6 +594,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 39690b519..93aa3b6fc 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 329a2c10d..bca2cf430 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
@@ -393,6 +393,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 5afae884c..44b8fddcb 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
@@ -226,6 +226,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 6f9853584..802eff971 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
@@ -334,6 +334,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 c5c120348..ec436f7e7 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
@@ -226,6 +226,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 88c6f8380..7813dcd04 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
@@ -1586,6 +1586,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 46142d3e9..0e7e37171 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
@@ -1115,6 +1115,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 b4940d33d..54adbed14 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
@@ -417,6 +417,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 824e5aad2..1e1c1c9e5 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
@@ -847,6 +847,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 acd46c500..00b6b0843 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
@@ -753,6 +753,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 e1cafd049..4257d507b 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
@@ -311,6 +311,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 ef768f0fe..a350c1aa4 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
@@ -393,6 +393,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 dc0ab9229..c3304ba2e 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
@@ -898,6 +898,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 a0b1c919e..5dc4411e6 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
@@ -446,6 +446,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 8075edf5c..65cc5e489 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
@@ -218,6 +218,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 7b30054be..83498ae85 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
@@ -273,6 +273,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 4d52bead9..891747fe8 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
@@ -222,6 +222,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 36c5fad0a..cecb7b73f 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
@@ -336,6 +336,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 f741f27fd..39e356ee4 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
@@ -588,6 +588,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 2359dc3c7..5b471a490 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
@@ -3330,6 +3330,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 5cc885f09..a3bdc8efe 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
@@ -659,6 +659,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 60e6308cc..934430848 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
@@ -1394,6 +1394,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 aa0d909e7..4becda59d 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
@@ -218,6 +218,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 42b81a712..b40c32fc5 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
@@ -332,6 +332,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 969c57262..f7faf083a 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
@@ -1184,6 +1184,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 9c4cc9b69..350b3fffa 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
@@ -678,6 +678,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 5548e27ac..1f6db2c3e 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
@@ -311,6 +311,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 951cd50e7..7e33f9fe3 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
@@ -167,6 +167,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 0795d5d6a..dc2b4474b 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
@@ -1629,6 +1629,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 797209bcc..b74106565 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
@@ -330,6 +330,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 475c46a25..e28f75b78 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
@@ -733,6 +733,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 456e96c49..cad9e5ae9 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
@@ -623,6 +623,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 e549deace..ccf5a8af8 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
@@ -421,6 +421,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 edbb7fcd0..2f51f071e 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
@@ -446,6 +446,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 9e3fa2f6a..d3244202e 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
@@ -277,6 +277,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 8ff6ca60c..60ec5e992 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
@@ -678,6 +678,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 14f7aed48..0249d83f3 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
@@ -332,6 +332,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 8e5f64632..9e8b0b114 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
@@ -277,6 +277,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 077c36ac2..3a443fed3 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.ReportGenerator.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
index 8db78ef53..fcd911108 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.reporting.ReportGenerator.html
@@ -437,6 +437,6 @@
}
-
+
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 b300f2914..d00382da6 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 1501b2be6..5582ba903 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.PropertyType.html
@@ -351,6 +351,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 3c8edbf8a..f43c5ea2e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionErrorHandler.html
@@ -189,6 +189,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 38cc485e1..560c8590b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionHandler.html
@@ -326,6 +326,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 096cd8bc9..fec4eb881 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParseException.html
@@ -149,6 +149,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 1163128a6..7ffe03edd 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionParser.html
@@ -204,6 +204,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 eb0137e0a..5811e2b3e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.suppression.SuppressionRule.html
@@ -12,7 +12,7 @@
@@ -499,8 +499,8 @@
}
265 8 if (hasCve() || hasCwe() || hasCvssBelow()) {
266 5 final Iterator<Vulnerability> itr = dependency.getVulnerabilities().iterator();
-
267 5 boolean remove = false ;
-
268 10 while (!remove && itr.hasNext()) {
+
267 10 while (itr.hasNext()) {
+
268 5 boolean remove = false ;
269 5 final Vulnerability v = itr.next();
270 5 for (String entry : this .cve) {
271 3 if (entry.equalsIgnoreCase(v.getName())) {
@@ -652,6 +652,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html
index db64fc027..5096e04e0 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Checksum.html
@@ -208,6 +208,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 e556840c3..e5b9ae5eb 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersion.html
@@ -447,6 +447,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 97c1692c3..d5aee7426 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DependencyVersionUtil.html
@@ -183,6 +183,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html
index c693c0d5f..ad41b8a92 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.DownloadFailedException.html
@@ -149,6 +149,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html
index c9f4fcff4..ff452102a 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Downloader.html
@@ -240,10 +240,10 @@
132
public static long getLastModified(URL url) throws DownloadFailedException {
-
133 14 long timestamp = 0;
+
133 10 long timestamp = 0;
134
-
135 14 if ("file" .equalsIgnoreCase(url.getProtocol())) {
+
135 10 if ("file" .equalsIgnoreCase(url.getProtocol())) {
136
File lastModifiedFile;
137
@@ -264,15 +264,15 @@
145
-
146 14 lastModifiedFile = new File(url.toURI());
+
146 10 lastModifiedFile = new File(url.toURI());
147
148 0 } catch (URISyntaxException ex) {
149 0 final String msg = String.format("Unable to locate '%s'; is the cve.url-2.0.modified property set correctly?" , url.toString());
150 0 throw new DownloadFailedException(msg);
-
151 14 }
-
152 14 timestamp = lastModifiedFile.lastModified();
-
153 14 } else {
+
151 10 }
+
152 10 timestamp = lastModifiedFile.lastModified();
+
153 10 } else {
154 0 HttpURLConnection conn = null ;
155
try {
@@ -298,7 +298,7 @@
}
171
}
-
172 14 return timestamp;
+
172 10 return timestamp;
173
}
174
@@ -383,6 +383,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html
index fa4564afb..ad7aa27b5 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.ExtractionException.html
@@ -149,6 +149,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileUtils.html
index f2a4ae015..1b6c4a709 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.FileUtils.html
@@ -12,7 +12,7 @@
@@ -135,13 +135,13 @@
60
public static String getFileExtension(String fileName) {
-
61 207 String ret = null ;
-
62 207 final int pos = fileName.lastIndexOf("." );
-
63 207 if (pos >= 0) {
-
64 199 ret = fileName.substring(pos + 1, fileName.length()).toLowerCase();
+
61 204 String ret = null ;
+
62 204 final int pos = fileName.lastIndexOf("." );
+
63 204 if (pos >= 0) {
+
64 196 ret = fileName.substring(pos + 1, fileName.length()).toLowerCase();
65
}
-
66 207 return ret;
+
66 204 return ret;
67
}
68
@@ -162,14 +162,14 @@
76
public static void delete(File file) throws IOException {
-
77 5 if (file.isDirectory()) {
-
78 3 for (File c : file.listFiles()) {
-
79 2 delete(c);
+
77 1 if (file.isDirectory()) {
+
78 0 for (File c : file.listFiles()) {
+
79 0 delete(c);
80
}
81
}
-
82 5 if (!org.apache.commons.io.FileUtils.deleteQuietly(file)) {
+
82 1 if (!org.apache.commons.io.FileUtils.deleteQuietly(file)) {
83 0 throw new FileNotFoundException("Failed to delete file: " + file);
84
}
@@ -185,7 +185,7 @@
90
-
91 5 }
+
91 1 }
92
93
@@ -287,8 +287,8 @@
146
public static void extractFiles(File archive, File extractTo) throws ExtractionException {
-
147 1 extractFiles(archive, extractTo, null );
-
148 1 }
+
147 0 extractFiles(archive, extractTo, null );
+
148 0 }
149
150
@@ -317,55 +317,55 @@
162
public static void extractFiles(File archive, File extractTo, Engine engine) throws ExtractionException {
-
163 1 if (archive == null || extractTo == null ) {
+
163 0 if (archive == null || extractTo == null ) {
164 0 return ;
165
}
166
-
167 1 FileInputStream fis = null ;
-
168 1 ZipInputStream zis = null ;
+
167 0 FileInputStream fis = null ;
+
168 0 ZipInputStream zis = null ;
169
170
try {
-
171 1 fis = new FileInputStream(archive);
+
171 0 fis = new FileInputStream(archive);
172 0 } catch (FileNotFoundException ex) {
173 0 Logger.getLogger(FileUtils.class .getName()).log(Level.INFO, null , ex);
174 0 throw new ExtractionException("Archive file was not found." , ex);
-
175 1 }
-
176 1 zis = new ZipInputStream(new BufferedInputStream(fis));
+
175 0 }
+
176 0 zis = new ZipInputStream(new BufferedInputStream(fis));
177
ZipEntry entry;
178
try {
-
179 5 while ((entry = zis.getNextEntry()) != null ) {
-
180 4 if (entry.isDirectory()) {
-
181 1 final File d = new File(extractTo, entry.getName());
-
182 1 if (!d.exists() && !d.mkdirs()) {
+
179 0 while ((entry = zis.getNextEntry()) != null ) {
+
180 0 if (entry.isDirectory()) {
+
181 0 final File d = new File(extractTo, entry.getName());
+
182 0 if (!d.exists() && !d.mkdirs()) {
183 0 final String msg = String.format("Unable to create '%s'." , d.getAbsolutePath());
184 0 throw new ExtractionException(msg);
185
}
-
186 1 } else {
-
187 3 final File file = new File(extractTo, entry.getName());
-
188 3 final String ext = getFileExtension(file.getName());
-
189 3 if (engine == null || engine.supportsExtension(ext)) {
-
190 3 BufferedOutputStream bos = null ;
+
186 0 } else {
+
187 0 final File file = new File(extractTo, entry.getName());
+
188 0 final String ext = getFileExtension(file.getName());
+
189 0 if (engine == null || engine.supportsExtension(ext)) {
+
190 0 BufferedOutputStream bos = null ;
191
FileOutputStream fos;
192
try {
-
193 3 fos = new FileOutputStream(file);
-
194 3 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
+
193 0 fos = new FileOutputStream(file);
+
194 0 bos = new BufferedOutputStream(fos, BUFFER_SIZE);
195
int count;
-
196 3 final byte data[] = new byte [BUFFER_SIZE];
-
197 90235 while ((count = zis.read(data, 0, BUFFER_SIZE)) != -1) {
-
198 90232 bos.write(data, 0, count);
+
196 0 final byte data[] = new byte [BUFFER_SIZE];
+
197 0 while ((count = zis.read(data, 0, BUFFER_SIZE)) != -1) {
+
198 0 bos.write(data, 0, count);
199
}
-
200 3 bos.flush();
+
200 0 bos.flush();
201 0 } catch (FileNotFoundException ex) {
202 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINE, null , ex);
203 0 final String msg = String.format("Unable to find file '%s'." , file.getName());
@@ -376,20 +376,20 @@
208 0 throw new ExtractionException(msg, ex);
209
} finally {
-
210 3 if (bos != null ) {
+
210 0 if (bos != null ) {
211
try {
-
212 3 bos.close();
+
212 0 bos.close();
213 0 } catch (IOException ex) {
214 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINEST, null , ex);
-
215 3 }
+
215 0 }
216
}
217
}
218
}
-
219 3 }
+
219 0 }
220
}
221 0 } catch (IOException ex) {
@@ -399,16 +399,16 @@
225
} finally {
226 0 try {
-
227 1 zis.close();
+
227 0 zis.close();
228 0 } catch (IOException ex) {
229 0 Logger.getLogger(FileUtils.class .getName()).log(Level.FINEST, null , ex);
-
230 1 }
+
230 0 }
231 0 }
-
232 1 }
+
232 0 }
233
}
-
+
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 15ffa0314..200f7d35e 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Filter.html
@@ -137,6 +137,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html
index 37bb8a26f..d05c86211 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.InvalidSettingException.html
@@ -149,6 +149,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogFilter.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogFilter.html
index bb737bae5..a6a2c4c43 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogFilter.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogFilter.html
@@ -104,6 +104,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogUtils.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogUtils.html
index 8a96d7ee7..f55bd15c2 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogUtils.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.LogUtils.html
@@ -172,6 +172,6 @@
}
-
+
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 db63f83a1..68cde2c3b 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.NonClosingStream.html
@@ -114,6 +114,6 @@
}
-
+
diff --git a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html
index 549d95bd7..4ab9a5930 100644
--- a/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html
+++ b/dependency-check-core/cobertura/org.owasp.dependencycheck.utils.Settings.html
@@ -382,8 +382,8 @@
191
public static void setString(String key, String value) {
-
192 17 INSTANCE.props.setProperty(key, value);
-
193 17 }
+
192 5 INSTANCE.props.setProperty(key, value);
+
193 5 }
194
195
@@ -558,10 +558,10 @@
288
public static File getDataFile(String key) {
-
289 60 final String file = getString(key);
-
290 60 final String baseDir = getString(Settings.KEYS.DATA_DIRECTORY);
-
291 60 if (baseDir != null ) {
-
292 60 if (baseDir.startsWith("[JAR]/" )) {
+
289 46 final String file = getString(key);
+
290 46 final String baseDir = getString(Settings.KEYS.DATA_DIRECTORY);
+
291 46 if (baseDir != null ) {
+
292 46 if (baseDir.startsWith("[JAR]/" )) {
293 0 final File jarPath = getJarPath();
294 0 final File newBase = new File(jarPath, baseDir.substring(6));
295 0 if (Settings.KEYS.DATA_DIRECTORY.equals(key)) {
@@ -571,11 +571,11 @@
298 0 return new File(newBase, file);
299
}
-
300 60 if (Settings.KEYS.DATA_DIRECTORY.equals(key)) {
-
301 34 return new File(baseDir);
+
300 46 if (Settings.KEYS.DATA_DIRECTORY.equals(key)) {
+
301 25 return new File(baseDir);
302
}
-
303 26 return new File(baseDir, file);
+
303 21 return new File(baseDir, file);
304
}
305 0 return new File(file);
@@ -641,8 +641,8 @@
341
public static String getString(String key, String defaultValue) {
-
342 26 final String str = System.getProperty(key, INSTANCE.props.getProperty(key, defaultValue));
-
343 26 return str;
+
342 16 final String str = System.getProperty(key, INSTANCE.props.getProperty(key, defaultValue));
+
343 16 return str;
344
}
345
@@ -659,7 +659,7 @@
351
public static File getTempDirectory() {
-
352 11 return new File(Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty("java.io.tmpdir" )));
+
352 9 return new File(Settings.getString(Settings.KEYS.TEMP_DIRECTORY, System.getProperty("java.io.tmpdir" )));
353
}
354
@@ -684,7 +684,7 @@
364
public static String getString(String key) {
-
365 152 return System.getProperty(key, INSTANCE.props.getProperty(key));
+
365 115 return System.getProperty(key, INSTANCE.props.getProperty(key));
366
}
367
@@ -861,6 +861,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 7a9161525..fb83333d7 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 @@
56
public static boolean containsUrl(String text) {
-
57 21169 return CONTAINS_URL_TEST.matcher(text).matches();
+
57 21424 return CONTAINS_URL_TEST.matcher(text).matches();
58
}
59
@@ -220,6 +220,6 @@
}
-
+
diff --git a/dependency-check-core/cpd.html b/dependency-check-core/cpd.html
index 7036f40b6..b8d2ae506 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,8 +67,8 @@
-
Last Published: 2013-12-01 |
-
Version: 1.0.6
+
Last Published: 2013-12-02 |
+
Version: 1.0.7
diff --git a/dependency-check-core/dependency-updates-report.html b/dependency-check-core/dependency-updates-report.html
index edb9b07db..ba4f0a1c8 100644
--- a/dependency-check-core/dependency-updates-report.html
+++ b/dependency-check-core/dependency-updates-report.html
@@ -1,13 +1,13 @@
Note: failures are anticipated and checked for with assertions while errors are unanticipated.